From 01bec2b15639212108b7f1cd7a922f32c432e30d Mon Sep 17 00:00:00 2001 From: Andrea Lin Date: Thu, 6 Sep 2018 11:21:42 -0700 Subject: [PATCH] Refresh all clients (#3647) --- .../cloud/asset/v1beta1/AssetServiceGrpc.java | 8 +- .../com/google/cloud/asset/v1beta1/Asset.java | 44 +- .../cloud/asset/v1beta1/AssetProto.java | 4 +- .../asset/v1beta1/AssetServiceProto.java | 76 +- .../v1beta1/BatchGetAssetsHistoryRequest.java | 185 ++- ...BatchGetAssetsHistoryRequestOrBuilder.java | 38 +- .../BatchGetAssetsHistoryResponse.java | 44 +- .../asset/v1beta1/ExportAssetsRequest.java | 540 +++----- .../v1beta1/ExportAssetsRequestOrBuilder.java | 91 +- .../asset/v1beta1/ExportAssetsResponse.java | 92 +- .../ExportAssetsResponseOrBuilder.java | 12 +- .../cloud/asset/v1beta1/GcsDestination.java | 42 +- .../cloud/asset/v1beta1/OutputConfig.java | 44 +- .../google/cloud/asset/v1beta1/Resource.java | 44 +- .../cloud/asset/v1beta1/TemporalAsset.java | 44 +- .../cloud/asset/v1beta1/TimeWindow.java | 80 +- .../asset/v1beta1/TimeWindowOrBuilder.java | 9 +- .../cloud/asset/v1beta1/asset_service.proto | 45 +- .../google/cloud/asset/v1beta1/assets.proto | 6 +- .../automl/v1beta1/AnnotationPayload.java | 44 +- .../v1beta1/AnnotationPayloadOuterClass.java | 2 +- .../cloud/automl/v1beta1/AutoMlProto.java | 20 +- .../automl/v1beta1/ClassificationProto.java | 220 +-- .../automl/v1beta1/CreateDatasetRequest.java | 44 +- .../v1beta1/CreateModelOperationMetadata.java | 30 +- .../automl/v1beta1/CreateModelRequest.java | 44 +- .../cloud/automl/v1beta1/DataItems.java | 2 +- .../google/cloud/automl/v1beta1/Dataset.java | 44 +- .../automl/v1beta1/DatasetOuterClass.java | 4 +- .../automl/v1beta1/DeleteDatasetRequest.java | 42 +- .../automl/v1beta1/DeleteModelRequest.java | 42 +- .../automl/v1beta1/DeployModelRequest.java | 42 +- .../cloud/automl/v1beta1/ExamplePayload.java | 44 +- .../automl/v1beta1/ExportDataRequest.java | 44 +- .../cloud/automl/v1beta1/GcsDestination.java | 42 +- .../cloud/automl/v1beta1/GcsSource.java | 44 +- .../automl/v1beta1/GetDatasetRequest.java | 42 +- .../v1beta1/GetModelEvaluationRequest.java | 42 +- .../cloud/automl/v1beta1/GetModelRequest.java | 42 +- .../google/cloud/automl/v1beta1/Image.java | 44 +- .../ImageClassificationDatasetMetadata.java | 44 +- .../ImageClassificationModelMetadata.java | 44 +- .../cloud/automl/v1beta1/ImageProto.java | 2 +- .../automl/v1beta1/ImportDataRequest.java | 44 +- .../cloud/automl/v1beta1/InputConfig.java | 44 +- .../com/google/cloud/automl/v1beta1/Io.java | 2 +- .../automl/v1beta1/ListDatasetsRequest.java | 44 +- .../automl/v1beta1/ListDatasetsResponse.java | 44 +- .../v1beta1/ListModelEvaluationsRequest.java | 44 +- .../v1beta1/ListModelEvaluationsResponse.java | 44 +- .../automl/v1beta1/ListModelsRequest.java | 44 +- .../automl/v1beta1/ListModelsResponse.java | 44 +- .../google/cloud/automl/v1beta1/Model.java | 46 +- .../cloud/automl/v1beta1/ModelEvaluation.java | 44 +- .../v1beta1/ModelEvaluationOuterClass.java | 2 +- .../cloud/automl/v1beta1/ModelOuterClass.java | 4 +- .../automl/v1beta1/OperationMetadata.java | 44 +- .../cloud/automl/v1beta1/Operations.java | 2 +- .../cloud/automl/v1beta1/OutputConfig.java | 44 +- .../cloud/automl/v1beta1/PredictRequest.java | 45 +- .../cloud/automl/v1beta1/PredictResponse.java | 45 +- .../v1beta1/PredictionServiceProto.java | 4 +- .../TextClassificationDatasetMetadata.java | 44 +- .../TextClassificationModelMetadata.java | 30 +- .../cloud/automl/v1beta1/TextProto.java | 2 +- .../cloud/automl/v1beta1/TextSnippet.java | 44 +- .../automl/v1beta1/TranslationAnnotation.java | 44 +- .../v1beta1/TranslationDatasetMetadata.java | 44 +- .../v1beta1/TranslationEvaluationMetrics.java | 44 +- .../v1beta1/TranslationModelMetadata.java | 44 +- .../automl/v1beta1/TranslationProto.java | 2 +- .../automl/v1beta1/UndeployModelRequest.java | 42 +- .../v1/CheckValidCredsRequest.java | 42 +- .../v1/CheckValidCredsResponse.java | 40 +- .../v1/CreateTransferConfigRequest.java | 44 +- .../bigquery/datatransfer/v1/DataSource.java | 50 +- .../datatransfer/v1/DataSourceParameter.java | 46 +- .../datatransfer/v1/DataTransferProto.java | 38 +- .../v1/DeleteTransferConfigRequest.java | 42 +- .../v1/DeleteTransferRunRequest.java | 42 +- .../datatransfer/v1/GetDataSourceRequest.java | 42 +- .../v1/GetTransferConfigRequest.java | 42 +- .../v1/GetTransferRunRequest.java | 42 +- .../v1/ListDataSourcesRequest.java | 44 +- .../v1/ListDataSourcesResponse.java | 44 +- .../v1/ListTransferConfigsRequest.java | 44 +- .../v1/ListTransferConfigsResponse.java | 44 +- .../v1/ListTransferLogsRequest.java | 45 +- .../v1/ListTransferLogsResponse.java | 44 +- .../v1/ListTransferRunsRequest.java | 47 +- .../v1/ListTransferRunsResponse.java | 44 +- .../v1/ScheduleTransferRunsRequest.java | 44 +- .../v1/ScheduleTransferRunsResponse.java | 44 +- .../datatransfer/v1/TransferConfig.java | 46 +- .../datatransfer/v1/TransferMessage.java | 46 +- .../datatransfer/v1/TransferProto.java | 8 +- .../bigquery/datatransfer/v1/TransferRun.java | 46 +- .../v1/UpdateTransferConfigRequest.java | 44 +- .../google/bigtable/admin/v2/AppProfile.java | 118 +- .../admin/v2/BigtableInstanceAdminProto.java | 30 +- .../admin/v2/BigtableTableAdminProto.java | 22 +- .../admin/v2/CheckConsistencyRequest.java | 44 +- .../admin/v2/CheckConsistencyResponse.java | 40 +- .../com/google/bigtable/admin/v2/Cluster.java | 48 +- .../bigtable/admin/v2/ColumnFamily.java | 44 +- .../admin/v2/CreateAppProfileRequest.java | 44 +- .../admin/v2/CreateClusterMetadata.java | 44 +- .../admin/v2/CreateClusterRequest.java | 44 +- .../admin/v2/CreateInstanceMetadata.java | 44 +- .../admin/v2/CreateInstanceRequest.java | 45 +- .../v2/CreateTableFromSnapshotMetadata.java | 44 +- .../v2/CreateTableFromSnapshotRequest.java | 44 +- .../bigtable/admin/v2/CreateTableRequest.java | 84 +- .../admin/v2/DeleteAppProfileRequest.java | 44 +- .../admin/v2/DeleteClusterRequest.java | 42 +- .../admin/v2/DeleteInstanceRequest.java | 42 +- .../admin/v2/DeleteSnapshotRequest.java | 42 +- .../bigtable/admin/v2/DeleteTableRequest.java | 42 +- .../admin/v2/DropRowRangeRequest.java | 44 +- .../com/google/bigtable/admin/v2/GcRule.java | 132 +- .../v2/GenerateConsistencyTokenRequest.java | 42 +- .../v2/GenerateConsistencyTokenResponse.java | 42 +- .../admin/v2/GetAppProfileRequest.java | 42 +- .../bigtable/admin/v2/GetClusterRequest.java | 42 +- .../bigtable/admin/v2/GetInstanceRequest.java | 42 +- .../bigtable/admin/v2/GetSnapshotRequest.java | 42 +- .../bigtable/admin/v2/GetTableRequest.java | 46 +- .../google/bigtable/admin/v2/Instance.java | 49 +- .../bigtable/admin/v2/InstanceProto.java | 6 +- .../admin/v2/ListAppProfilesRequest.java | 44 +- .../admin/v2/ListAppProfilesResponse.java | 44 +- .../admin/v2/ListClustersRequest.java | 44 +- .../admin/v2/ListClustersResponse.java | 44 +- .../admin/v2/ListInstancesRequest.java | 44 +- .../admin/v2/ListInstancesResponse.java | 44 +- .../admin/v2/ListSnapshotsRequest.java | 44 +- .../admin/v2/ListSnapshotsResponse.java | 44 +- .../bigtable/admin/v2/ListTablesRequest.java | 46 +- .../bigtable/admin/v2/ListTablesResponse.java | 44 +- .../admin/v2/ModifyColumnFamiliesRequest.java | 88 +- .../v2/PartialUpdateInstanceRequest.java | 44 +- .../google/bigtable/admin/v2/Snapshot.java | 46 +- .../admin/v2/SnapshotTableMetadata.java | 44 +- .../admin/v2/SnapshotTableRequest.java | 44 +- .../com/google/bigtable/admin/v2/Table.java | 91 +- .../google/bigtable/admin/v2/TableProto.java | 8 +- .../admin/v2/UpdateAppProfileMetadata.java | 30 +- .../admin/v2/UpdateAppProfileRequest.java | 44 +- .../admin/v2/UpdateClusterMetadata.java | 44 +- .../admin/v2/UpdateInstanceMetadata.java | 44 +- .../com/google/bigtable/v2/BigtableProto.java | 14 +- .../java/com/google/bigtable/v2/Cell.java | 44 +- .../bigtable/v2/CheckAndMutateRowRequest.java | 44 +- .../v2/CheckAndMutateRowResponse.java | 40 +- .../java/com/google/bigtable/v2/Column.java | 44 +- .../com/google/bigtable/v2/ColumnRange.java | 44 +- .../com/google/bigtable/v2/DataProto.java | 14 +- .../java/com/google/bigtable/v2/Family.java | 44 +- .../google/bigtable/v2/MutateRowRequest.java | 44 +- .../google/bigtable/v2/MutateRowResponse.java | 30 +- .../google/bigtable/v2/MutateRowsRequest.java | 88 +- .../bigtable/v2/MutateRowsResponse.java | 88 +- .../java/com/google/bigtable/v2/Mutation.java | 204 +-- .../v2/ReadModifyWriteRowRequest.java | 44 +- .../v2/ReadModifyWriteRowResponse.java | 44 +- .../bigtable/v2/ReadModifyWriteRule.java | 44 +- .../google/bigtable/v2/ReadRowsRequest.java | 44 +- .../google/bigtable/v2/ReadRowsResponse.java | 88 +- .../main/java/com/google/bigtable/v2/Row.java | 44 +- .../com/google/bigtable/v2/RowFilter.java | 176 +-- .../java/com/google/bigtable/v2/RowRange.java | 44 +- .../java/com/google/bigtable/v2/RowSet.java | 44 +- .../bigtable/v2/SampleRowKeysRequest.java | 44 +- .../bigtable/v2/SampleRowKeysResponse.java | 44 +- .../google/bigtable/v2/TimestampRange.java | 44 +- .../com/google/bigtable/v2/ValueRange.java | 44 +- .../container/v1/AcceleratorConfig.java | 44 +- .../com/google/container/v1/AddonsConfig.java | 44 +- .../container/v1/AutoUpgradeOptions.java | 44 +- .../container/v1/CancelOperationRequest.java | 44 +- .../container/v1/ClientCertificateConfig.java | 40 +- .../java/com/google/container/v1/Cluster.java | 47 +- .../container/v1/ClusterServiceProto.java | 76 +- .../google/container/v1/ClusterUpdate.java | 44 +- .../v1/CompleteIPRotationRequest.java | 44 +- .../container/v1/CreateClusterRequest.java | 44 +- .../container/v1/CreateNodePoolRequest.java | 44 +- .../container/v1/DailyMaintenanceWindow.java | 44 +- .../container/v1/DeleteClusterRequest.java | 44 +- .../container/v1/DeleteNodePoolRequest.java | 44 +- .../container/v1/GetClusterRequest.java | 44 +- .../container/v1/GetNodePoolRequest.java | 44 +- .../container/v1/GetOperationRequest.java | 44 +- .../container/v1/GetServerConfigRequest.java | 44 +- .../v1/HorizontalPodAutoscaling.java | 40 +- .../container/v1/HttpLoadBalancing.java | 40 +- .../container/v1/IPAllocationPolicy.java | 44 +- .../container/v1/KubernetesDashboard.java | 40 +- .../com/google/container/v1/LegacyAbac.java | 40 +- .../container/v1/ListClustersRequest.java | 44 +- .../container/v1/ListClustersResponse.java | 44 +- .../container/v1/ListNodePoolsRequest.java | 44 +- .../container/v1/ListNodePoolsResponse.java | 44 +- .../container/v1/ListOperationsRequest.java | 44 +- .../container/v1/ListOperationsResponse.java | 44 +- .../container/v1/MaintenancePolicy.java | 44 +- .../container/v1/MaintenanceWindow.java | 44 +- .../com/google/container/v1/MasterAuth.java | 44 +- .../v1/MasterAuthorizedNetworksConfig.java | 88 +- .../google/container/v1/NetworkPolicy.java | 46 +- .../container/v1/NetworkPolicyConfig.java | 40 +- .../com/google/container/v1/NodeConfig.java | 45 +- .../google/container/v1/NodeManagement.java | 44 +- .../com/google/container/v1/NodePool.java | 46 +- .../container/v1/NodePoolAutoscaling.java | 44 +- .../com/google/container/v1/Operation.java | 48 +- .../v1/RollbackNodePoolUpgradeRequest.java | 44 +- .../com/google/container/v1/ServerConfig.java | 44 +- .../container/v1/SetAddonsConfigRequest.java | 44 +- .../google/container/v1/SetLabelsRequest.java | 45 +- .../container/v1/SetLegacyAbacRequest.java | 44 +- .../container/v1/SetLocationsRequest.java | 44 +- .../v1/SetLoggingServiceRequest.java | 44 +- .../v1/SetMaintenancePolicyRequest.java | 44 +- .../container/v1/SetMasterAuthRequest.java | 46 +- .../v1/SetMonitoringServiceRequest.java | 44 +- .../container/v1/SetNetworkPolicyRequest.java | 44 +- .../v1/SetNodePoolAutoscalingRequest.java | 44 +- .../v1/SetNodePoolManagementRequest.java | 44 +- .../container/v1/SetNodePoolSizeRequest.java | 44 +- .../container/v1/StartIPRotationRequest.java | 44 +- .../container/v1/UpdateClusterRequest.java | 44 +- .../container/v1/UpdateMasterRequest.java | 44 +- .../container/v1/UpdateNodePoolRequest.java | 44 +- .../v1beta1/Containeranalysis.java | 10 +- .../v1beta1/GetScanConfigRequest.java | 42 +- .../v1beta1/ListScanConfigsRequest.java | 44 +- .../v1beta1/ListScanConfigsResponse.java | 44 +- .../containeranalysis/v1beta1/ScanConfig.java | 44 +- .../v1beta1/UpdateScanConfigRequest.java | 44 +- .../v1beta1/BatchCreateNotesRequest.java | 45 +- .../v1beta1/BatchCreateNotesResponse.java | 44 +- .../BatchCreateOccurrencesRequest.java | 44 +- .../BatchCreateOccurrencesResponse.java | 44 +- .../io/grafeas/v1beta1/CreateNoteRequest.java | 44 +- .../v1beta1/CreateOccurrenceRequest.java | 44 +- .../io/grafeas/v1beta1/DeleteNoteRequest.java | 42 +- .../v1beta1/DeleteOccurrenceRequest.java | 42 +- .../io/grafeas/v1beta1/GetNoteRequest.java | 42 +- .../v1beta1/GetOccurrenceNoteRequest.java | 42 +- .../grafeas/v1beta1/GetOccurrenceRequest.java | 42 +- ...ulnerabilityOccurrencesSummaryRequest.java | 44 +- .../main/java/io/grafeas/v1beta1/Grafeas.java | 32 +- .../v1beta1/ListNoteOccurrencesRequest.java | 44 +- .../v1beta1/ListNoteOccurrencesResponse.java | 44 +- .../io/grafeas/v1beta1/ListNotesRequest.java | 44 +- .../io/grafeas/v1beta1/ListNotesResponse.java | 44 +- .../v1beta1/ListOccurrencesRequest.java | 44 +- .../v1beta1/ListOccurrencesResponse.java | 44 +- .../main/java/io/grafeas/v1beta1/Note.java | 46 +- .../java/io/grafeas/v1beta1/Occurrence.java | 46 +- .../java/io/grafeas/v1beta1/Resource.java | 44 +- .../io/grafeas/v1beta1/UpdateNoteRequest.java | 44 +- .../v1beta1/UpdateOccurrenceRequest.java | 44 +- .../VulnerabilityOccurrencesSummary.java | 90 +- .../v1beta1/attestation/Attestation.java | 44 +- .../attestation/AttestationOuterClass.java | 2 +- .../v1beta1/attestation/Authority.java | 86 +- .../grafeas/v1beta1/attestation/Details.java | 44 +- .../attestation/PgpSignedAttestation.java | 46 +- .../java/io/grafeas/v1beta1/build/Build.java | 44 +- .../v1beta1/build/BuildOuterClass.java | 2 +- .../grafeas/v1beta1/build/BuildSignature.java | 46 +- .../io/grafeas/v1beta1/build/Details.java | 44 +- .../io/grafeas/v1beta1/common/RelatedUrl.java | 44 +- .../v1beta1/deployment/Deployable.java | 44 +- .../v1beta1/deployment/Deployment.java | 46 +- .../deployment/DeploymentOuterClass.java | 2 +- .../grafeas/v1beta1/deployment/Details.java | 44 +- .../io/grafeas/v1beta1/discovery/Details.java | 44 +- .../grafeas/v1beta1/discovery/Discovered.java | 48 +- .../grafeas/v1beta1/discovery/Discovery.java | 44 +- .../discovery/DiscoveryOuterClass.java | 4 +- .../java/io/grafeas/v1beta1/image/Basis.java | 44 +- .../io/grafeas/v1beta1/image/Derived.java | 44 +- .../io/grafeas/v1beta1/image/Details.java | 44 +- .../io/grafeas/v1beta1/image/Fingerprint.java | 44 +- .../java/io/grafeas/v1beta1/image/Image.java | 4 +- .../java/io/grafeas/v1beta1/image/Layer.java | 46 +- .../java/io/grafeas/v1beta1/pkg/Details.java | 44 +- .../io/grafeas/v1beta1/pkg/Distribution.java | 46 +- .../io/grafeas/v1beta1/pkg/Installation.java | 44 +- .../java/io/grafeas/v1beta1/pkg/Location.java | 44 +- .../java/io/grafeas/v1beta1/pkg/Package.java | 44 +- .../v1beta1/pkg/PackageOuterClass.java | 4 +- .../java/io/grafeas/v1beta1/pkg/Version.java | 46 +- .../grafeas/v1beta1/provenance/Artifact.java | 44 +- .../v1beta1/provenance/BuildProvenance.java | 45 +- .../grafeas/v1beta1/provenance/Command.java | 44 +- .../v1beta1/provenance/FileHashes.java | 44 +- .../io/grafeas/v1beta1/provenance/Hash.java | 46 +- .../v1beta1/provenance/Provenance.java | 8 +- .../io/grafeas/v1beta1/provenance/Source.java | 45 +- .../grafeas/v1beta1/source/AliasContext.java | 46 +- .../source/CloudRepoSourceContext.java | 44 +- .../v1beta1/source/GerritSourceContext.java | 44 +- .../v1beta1/source/GitSourceContext.java | 44 +- .../grafeas/v1beta1/source/ProjectRepoId.java | 44 +- .../io/grafeas/v1beta1/source/RepoId.java | 44 +- .../io/grafeas/v1beta1/source/Source.java | 6 +- .../grafeas/v1beta1/source/SourceContext.java | 45 +- .../v1beta1/vulnerability/Details.java | 46 +- .../v1beta1/vulnerability/PackageIssue.java | 44 +- .../v1beta1/vulnerability/Vulnerability.java | 90 +- .../vulnerability/VulnerabilityLocation.java | 44 +- .../VulnerabilityOuterClass.java | 6 +- .../cloud/dataproc/v1/AcceleratorConfig.java | 44 +- .../cloud/dataproc/v1/CancelJobRequest.java | 44 +- .../com/google/cloud/dataproc/v1/Cluster.java | 45 +- .../cloud/dataproc/v1/ClusterConfig.java | 44 +- .../cloud/dataproc/v1/ClusterMetrics.java | 45 +- .../dataproc/v1/ClusterOperationMetadata.java | 45 +- .../dataproc/v1/ClusterOperationStatus.java | 46 +- .../cloud/dataproc/v1/ClusterStatus.java | 48 +- .../cloud/dataproc/v1/ClustersProto.java | 24 +- .../dataproc/v1/CreateClusterRequest.java | 44 +- .../dataproc/v1/DeleteClusterRequest.java | 44 +- .../cloud/dataproc/v1/DeleteJobRequest.java | 44 +- .../dataproc/v1/DiagnoseClusterRequest.java | 44 +- .../dataproc/v1/DiagnoseClusterResults.java | 42 +- .../google/cloud/dataproc/v1/DiskConfig.java | 44 +- .../cloud/dataproc/v1/GceClusterConfig.java | 45 +- .../cloud/dataproc/v1/GetClusterRequest.java | 44 +- .../cloud/dataproc/v1/GetJobRequest.java | 44 +- .../google/cloud/dataproc/v1/HadoopJob.java | 45 +- .../com/google/cloud/dataproc/v1/HiveJob.java | 45 +- .../dataproc/v1/InstanceGroupConfig.java | 44 +- .../com/google/cloud/dataproc/v1/Job.java | 45 +- .../cloud/dataproc/v1/JobPlacement.java | 44 +- .../cloud/dataproc/v1/JobReference.java | 44 +- .../cloud/dataproc/v1/JobScheduling.java | 40 +- .../google/cloud/dataproc/v1/JobStatus.java | 48 +- .../google/cloud/dataproc/v1/JobsProto.java | 32 +- .../dataproc/v1/ListClustersRequest.java | 44 +- .../dataproc/v1/ListClustersResponse.java | 44 +- .../cloud/dataproc/v1/ListJobsRequest.java | 46 +- .../cloud/dataproc/v1/ListJobsResponse.java | 44 +- .../cloud/dataproc/v1/LoggingConfig.java | 45 +- .../cloud/dataproc/v1/ManagedGroupConfig.java | 44 +- .../dataproc/v1/NodeInitializationAction.java | 44 +- .../cloud/dataproc/v1/OperationsProto.java | 4 +- .../com/google/cloud/dataproc/v1/PigJob.java | 45 +- .../google/cloud/dataproc/v1/PySparkJob.java | 45 +- .../google/cloud/dataproc/v1/QueryList.java | 44 +- .../cloud/dataproc/v1/SoftwareConfig.java | 45 +- .../google/cloud/dataproc/v1/SparkJob.java | 45 +- .../google/cloud/dataproc/v1/SparkSqlJob.java | 45 +- .../cloud/dataproc/v1/SubmitJobRequest.java | 44 +- .../dataproc/v1/UpdateClusterRequest.java | 44 +- .../cloud/dataproc/v1/UpdateJobRequest.java | 44 +- .../cloud/dataproc/v1/YarnApplication.java | 46 +- .../dataproc/v1beta2/AcceleratorConfig.java | 44 +- .../dataproc/v1beta2/CancelJobRequest.java | 44 +- .../cloud/dataproc/v1beta2/Cluster.java | 45 +- .../cloud/dataproc/v1beta2/ClusterConfig.java | 44 +- .../dataproc/v1beta2/ClusterMetrics.java | 45 +- .../dataproc/v1beta2/ClusterOperation.java | 44 +- .../v1beta2/ClusterOperationMetadata.java | 45 +- .../v1beta2/ClusterOperationStatus.java | 46 +- .../dataproc/v1beta2/ClusterSelector.java | 45 +- .../cloud/dataproc/v1beta2/ClusterStatus.java | 48 +- .../cloud/dataproc/v1beta2/ClustersProto.java | 28 +- .../v1beta2/CreateClusterRequest.java | 44 +- .../CreateWorkflowTemplateRequest.java | 44 +- .../v1beta2/DeleteClusterRequest.java | 44 +- .../dataproc/v1beta2/DeleteJobRequest.java | 44 +- .../DeleteWorkflowTemplateRequest.java | 44 +- .../v1beta2/DiagnoseClusterRequest.java | 44 +- .../v1beta2/DiagnoseClusterResults.java | 42 +- .../cloud/dataproc/v1beta2/DiskConfig.java | 44 +- .../dataproc/v1beta2/GceClusterConfig.java | 45 +- .../dataproc/v1beta2/GetClusterRequest.java | 44 +- .../cloud/dataproc/v1beta2/GetJobRequest.java | 44 +- .../v1beta2/GetWorkflowTemplateRequest.java | 44 +- .../cloud/dataproc/v1beta2/HadoopJob.java | 45 +- .../cloud/dataproc/v1beta2/HiveJob.java | 45 +- .../dataproc/v1beta2/InstanceGroupConfig.java | 44 +- ...tantiateInlineWorkflowTemplateRequest.java | 44 +- .../InstantiateWorkflowTemplateRequest.java | 44 +- .../google/cloud/dataproc/v1beta2/Job.java | 45 +- .../cloud/dataproc/v1beta2/JobPlacement.java | 44 +- .../cloud/dataproc/v1beta2/JobReference.java | 44 +- .../cloud/dataproc/v1beta2/JobScheduling.java | 40 +- .../cloud/dataproc/v1beta2/JobStatus.java | 48 +- .../cloud/dataproc/v1beta2/JobsProto.java | 34 +- .../dataproc/v1beta2/LifecycleConfig.java | 44 +- .../dataproc/v1beta2/ListClustersRequest.java | 44 +- .../v1beta2/ListClustersResponse.java | 44 +- .../dataproc/v1beta2/ListJobsRequest.java | 46 +- .../dataproc/v1beta2/ListJobsResponse.java | 44 +- .../v1beta2/ListWorkflowTemplatesRequest.java | 44 +- .../ListWorkflowTemplatesResponse.java | 44 +- .../cloud/dataproc/v1beta2/LoggingConfig.java | 45 +- .../dataproc/v1beta2/ManagedCluster.java | 45 +- .../dataproc/v1beta2/ManagedGroupConfig.java | 44 +- .../v1beta2/NodeInitializationAction.java | 44 +- .../dataproc/v1beta2/OperationsProto.java | 4 +- .../cloud/dataproc/v1beta2/OrderedJob.java | 45 +- .../google/cloud/dataproc/v1beta2/PigJob.java | 45 +- .../cloud/dataproc/v1beta2/PySparkJob.java | 45 +- .../cloud/dataproc/v1beta2/QueryList.java | 44 +- .../dataproc/v1beta2/SoftwareConfig.java | 45 +- .../cloud/dataproc/v1beta2/SparkJob.java | 45 +- .../cloud/dataproc/v1beta2/SparkSqlJob.java | 45 +- .../dataproc/v1beta2/SubmitJobRequest.java | 44 +- .../v1beta2/UpdateClusterRequest.java | 44 +- .../dataproc/v1beta2/UpdateJobRequest.java | 44 +- .../UpdateWorkflowTemplateRequest.java | 44 +- .../cloud/dataproc/v1beta2/WorkflowGraph.java | 44 +- .../dataproc/v1beta2/WorkflowMetadata.java | 47 +- .../cloud/dataproc/v1beta2/WorkflowNode.java | 46 +- .../dataproc/v1beta2/WorkflowTemplate.java | 45 +- .../v1beta2/WorkflowTemplatePlacement.java | 44 +- .../v1beta2/WorkflowTemplatesProto.java | 28 +- .../dataproc/v1beta2/YarnApplication.java | 46 +- .../datastore/v1/AllocateIdsRequest.java | 44 +- .../datastore/v1/AllocateIdsResponse.java | 44 +- .../com/google/datastore/v1/ArrayValue.java | 44 +- .../datastore/v1/BeginTransactionRequest.java | 44 +- .../v1/BeginTransactionResponse.java | 40 +- .../google/datastore/v1/CommitRequest.java | 46 +- .../google/datastore/v1/CommitResponse.java | 44 +- .../google/datastore/v1/CompositeFilter.java | 46 +- .../google/datastore/v1/DatastoreProto.java | 18 +- .../java/com/google/datastore/v1/Entity.java | 45 +- .../com/google/datastore/v1/EntityProto.java | 6 +- .../com/google/datastore/v1/EntityResult.java | 44 +- .../java/com/google/datastore/v1/Filter.java | 44 +- .../com/google/datastore/v1/GqlQuery.java | 45 +- .../datastore/v1/GqlQueryParameter.java | 44 +- .../java/com/google/datastore/v1/Key.java | 88 +- .../google/datastore/v1/KindExpression.java | 42 +- .../google/datastore/v1/LookupRequest.java | 44 +- .../google/datastore/v1/LookupResponse.java | 44 +- .../com/google/datastore/v1/Mutation.java | 44 +- .../google/datastore/v1/MutationResult.java | 44 +- .../com/google/datastore/v1/PartitionId.java | 44 +- .../com/google/datastore/v1/Projection.java | 44 +- .../google/datastore/v1/PropertyFilter.java | 46 +- .../google/datastore/v1/PropertyOrder.java | 46 +- .../datastore/v1/PropertyReference.java | 42 +- .../java/com/google/datastore/v1/Query.java | 44 +- .../com/google/datastore/v1/QueryProto.java | 12 +- .../google/datastore/v1/QueryResultBatch.java | 48 +- .../com/google/datastore/v1/ReadOptions.java | 46 +- .../datastore/v1/ReserveIdsRequest.java | 44 +- .../datastore/v1/ReserveIdsResponse.java | 30 +- .../google/datastore/v1/RollbackRequest.java | 44 +- .../google/datastore/v1/RollbackResponse.java | 30 +- .../google/datastore/v1/RunQueryRequest.java | 44 +- .../google/datastore/v1/RunQueryResponse.java | 44 +- .../datastore/v1/TransactionOptions.java | 114 +- .../java/com/google/datastore/v1/Value.java | 46 +- .../com/google/cloud/dialogflow/v2/Agent.java | 46 +- .../cloud/dialogflow/v2/AgentProto.java | 10 +- .../v2/BatchCreateEntitiesRequest.java | 44 +- .../v2/BatchDeleteEntitiesRequest.java | 44 +- .../v2/BatchDeleteEntityTypesRequest.java | 44 +- .../v2/BatchDeleteIntentsRequest.java | 44 +- .../v2/BatchUpdateEntitiesRequest.java | 44 +- .../v2/BatchUpdateEntityTypesRequest.java | 44 +- .../v2/BatchUpdateEntityTypesResponse.java | 44 +- .../v2/BatchUpdateIntentsRequest.java | 46 +- .../v2/BatchUpdateIntentsResponse.java | 44 +- .../google/cloud/dialogflow/v2/Context.java | 44 +- .../cloud/dialogflow/v2/ContextProto.java | 8 +- .../dialogflow/v2/CreateContextRequest.java | 44 +- .../v2/CreateEntityTypeRequest.java | 44 +- .../dialogflow/v2/CreateIntentRequest.java | 46 +- .../v2/CreateSessionEntityTypeRequest.java | 44 +- .../v2/DeleteAllContextsRequest.java | 42 +- .../dialogflow/v2/DeleteContextRequest.java | 42 +- .../v2/DeleteEntityTypeRequest.java | 42 +- .../dialogflow/v2/DeleteIntentRequest.java | 42 +- .../v2/DeleteSessionEntityTypeRequest.java | 42 +- .../dialogflow/v2/DetectIntentRequest.java | 44 +- .../dialogflow/v2/DetectIntentResponse.java | 44 +- .../cloud/dialogflow/v2/EntityType.java | 92 +- .../cloud/dialogflow/v2/EntityTypeBatch.java | 44 +- .../cloud/dialogflow/v2/EntityTypeProto.java | 20 +- .../cloud/dialogflow/v2/EventInput.java | 44 +- .../dialogflow/v2/ExportAgentRequest.java | 44 +- .../dialogflow/v2/ExportAgentResponse.java | 44 +- .../cloud/dialogflow/v2/GetAgentRequest.java | 42 +- .../dialogflow/v2/GetContextRequest.java | 42 +- .../dialogflow/v2/GetEntityTypeRequest.java | 44 +- .../cloud/dialogflow/v2/GetIntentRequest.java | 46 +- .../v2/GetSessionEntityTypeRequest.java | 42 +- .../dialogflow/v2/ImportAgentRequest.java | 44 +- .../cloud/dialogflow/v2/InputAudioConfig.java | 46 +- .../google/cloud/dialogflow/v2/Intent.java | 1059 +++------------ .../cloud/dialogflow/v2/IntentBatch.java | 44 +- .../cloud/dialogflow/v2/IntentProto.java | 34 +- .../dialogflow/v2/ListContextsRequest.java | 44 +- .../dialogflow/v2/ListContextsResponse.java | 44 +- .../dialogflow/v2/ListEntityTypesRequest.java | 44 +- .../v2/ListEntityTypesResponse.java | 44 +- .../dialogflow/v2/ListIntentsRequest.java | 46 +- .../dialogflow/v2/ListIntentsResponse.java | 44 +- .../v2/ListSessionEntityTypesRequest.java | 44 +- .../v2/ListSessionEntityTypesResponse.java | 44 +- .../v2/OriginalDetectIntentRequest.java | 44 +- .../cloud/dialogflow/v2/QueryInput.java | 44 +- .../cloud/dialogflow/v2/QueryParameters.java | 44 +- .../cloud/dialogflow/v2/QueryResult.java | 44 +- .../dialogflow/v2/RestoreAgentRequest.java | 44 +- .../dialogflow/v2/SearchAgentsRequest.java | 44 +- .../dialogflow/v2/SearchAgentsResponse.java | 44 +- .../dialogflow/v2/SessionEntityType.java | 46 +- .../dialogflow/v2/SessionEntityTypeProto.java | 10 +- .../cloud/dialogflow/v2/SessionProto.java | 16 +- .../v2/StreamingDetectIntentRequest.java | 44 +- .../v2/StreamingDetectIntentResponse.java | 44 +- .../v2/StreamingRecognitionResult.java | 46 +- .../google/cloud/dialogflow/v2/TextInput.java | 44 +- .../dialogflow/v2/TrainAgentRequest.java | 42 +- .../dialogflow/v2/UpdateContextRequest.java | 44 +- .../v2/UpdateEntityTypeRequest.java | 44 +- .../dialogflow/v2/UpdateIntentRequest.java | 46 +- .../v2/UpdateSessionEntityTypeRequest.java | 44 +- .../cloud/dialogflow/v2/WebhookProto.java | 4 +- .../cloud/dialogflow/v2/WebhookRequest.java | 44 +- .../cloud/dialogflow/v2/WebhookResponse.java | 44 +- .../cloud/dialogflow/v2beta1/Agent.java | 46 +- .../cloud/dialogflow/v2beta1/AgentProto.java | 10 +- .../dialogflow/v2beta1/AudioConfigProto.java | 4 +- .../v2beta1/BatchCreateEntitiesRequest.java | 44 +- .../v2beta1/BatchDeleteEntitiesRequest.java | 44 +- .../BatchDeleteEntityTypesRequest.java | 44 +- .../v2beta1/BatchDeleteIntentsRequest.java | 44 +- .../v2beta1/BatchUpdateEntitiesRequest.java | 44 +- .../BatchUpdateEntityTypesRequest.java | 44 +- .../BatchUpdateEntityTypesResponse.java | 44 +- .../v2beta1/BatchUpdateIntentsRequest.java | 46 +- .../v2beta1/BatchUpdateIntentsResponse.java | 44 +- .../cloud/dialogflow/v2beta1/Context.java | 44 +- .../dialogflow/v2beta1/ContextProto.java | 12 +- .../v2beta1/CreateContextRequest.java | 44 +- .../v2beta1/CreateDocumentRequest.java | 44 +- .../v2beta1/CreateEntityTypeRequest.java | 44 +- .../v2beta1/CreateIntentRequest.java | 46 +- .../v2beta1/CreateKnowledgeBaseRequest.java | 44 +- .../CreateSessionEntityTypeRequest.java | 44 +- .../v2beta1/DeleteAllContextsRequest.java | 42 +- .../v2beta1/DeleteContextRequest.java | 42 +- .../v2beta1/DeleteDocumentRequest.java | 42 +- .../v2beta1/DeleteEntityTypeRequest.java | 42 +- .../v2beta1/DeleteIntentRequest.java | 42 +- .../v2beta1/DeleteKnowledgeBaseRequest.java | 44 +- .../DeleteSessionEntityTypeRequest.java | 42 +- .../v2beta1/DetectIntentRequest.java | 44 +- .../v2beta1/DetectIntentResponse.java | 44 +- .../cloud/dialogflow/v2beta1/Document.java | 45 +- .../dialogflow/v2beta1/DocumentProto.java | 10 +- .../cloud/dialogflow/v2beta1/EntityType.java | 92 +- .../dialogflow/v2beta1/EntityTypeBatch.java | 44 +- .../dialogflow/v2beta1/EntityTypeProto.java | 20 +- .../cloud/dialogflow/v2beta1/EventInput.java | 44 +- .../v2beta1/ExportAgentRequest.java | 44 +- .../v2beta1/ExportAgentResponse.java | 44 +- .../dialogflow/v2beta1/GetAgentRequest.java | 42 +- .../dialogflow/v2beta1/GetContextRequest.java | 42 +- .../v2beta1/GetDocumentRequest.java | 42 +- .../v2beta1/GetEntityTypeRequest.java | 44 +- .../dialogflow/v2beta1/GetIntentRequest.java | 46 +- .../v2beta1/GetKnowledgeBaseRequest.java | 42 +- .../v2beta1/GetSessionEntityTypeRequest.java | 42 +- .../v2beta1/ImportAgentRequest.java | 44 +- .../dialogflow/v2beta1/InputAudioConfig.java | 46 +- .../cloud/dialogflow/v2beta1/Intent.java | 1187 +++-------------- .../cloud/dialogflow/v2beta1/IntentBatch.java | 44 +- .../cloud/dialogflow/v2beta1/IntentProto.java | 40 +- .../dialogflow/v2beta1/KnowledgeAnswers.java | 90 +- .../dialogflow/v2beta1/KnowledgeBase.java | 44 +- .../v2beta1/KnowledgeBaseProto.java | 8 +- .../v2beta1/KnowledgeOperationMetadata.java | 44 +- .../v2beta1/ListContextsRequest.java | 44 +- .../v2beta1/ListContextsResponse.java | 44 +- .../v2beta1/ListDocumentsRequest.java | 44 +- .../v2beta1/ListDocumentsResponse.java | 44 +- .../v2beta1/ListEntityTypesRequest.java | 44 +- .../v2beta1/ListEntityTypesResponse.java | 44 +- .../v2beta1/ListIntentsRequest.java | 46 +- .../v2beta1/ListIntentsResponse.java | 44 +- .../v2beta1/ListKnowledgeBasesRequest.java | 44 +- .../v2beta1/ListKnowledgeBasesResponse.java | 44 +- .../ListSessionEntityTypesRequest.java | 44 +- .../ListSessionEntityTypesResponse.java | 44 +- .../v2beta1/OriginalDetectIntentRequest.java | 44 +- .../dialogflow/v2beta1/OutputAudioConfig.java | 46 +- .../cloud/dialogflow/v2beta1/QueryInput.java | 44 +- .../dialogflow/v2beta1/QueryParameters.java | 44 +- .../cloud/dialogflow/v2beta1/QueryResult.java | 44 +- .../v2beta1/RestoreAgentRequest.java | 44 +- .../v2beta1/SearchAgentsRequest.java | 44 +- .../v2beta1/SearchAgentsResponse.java | 44 +- .../cloud/dialogflow/v2beta1/Sentiment.java | 44 +- .../SentimentAnalysisRequestConfig.java | 40 +- .../v2beta1/SentimentAnalysisResult.java | 44 +- .../dialogflow/v2beta1/SessionEntityType.java | 46 +- .../v2beta1/SessionEntityTypeProto.java | 14 +- .../dialogflow/v2beta1/SessionProto.java | 26 +- .../v2beta1/StreamingDetectIntentRequest.java | 44 +- .../StreamingDetectIntentResponse.java | 44 +- .../v2beta1/StreamingRecognitionResult.java | 46 +- .../v2beta1/SynthesizeSpeechConfig.java | 44 +- .../cloud/dialogflow/v2beta1/TextInput.java | 44 +- .../dialogflow/v2beta1/TrainAgentRequest.java | 42 +- .../v2beta1/UpdateContextRequest.java | 44 +- .../v2beta1/UpdateEntityTypeRequest.java | 44 +- .../v2beta1/UpdateIntentRequest.java | 46 +- .../UpdateSessionEntityTypeRequest.java | 44 +- .../v2beta1/VoiceSelectionParams.java | 46 +- .../dialogflow/v2beta1/WebhookProto.java | 6 +- .../dialogflow/v2beta1/WebhookRequest.java | 44 +- .../dialogflow/v2beta1/WebhookResponse.java | 44 +- .../com/google/privacy/dlp/v2/Action.java | 160 +-- .../dlp/v2/AnalyzeDataSourceRiskDetails.java | 704 ++-------- .../google/privacy/dlp/v2/BigQueryField.java | 44 +- .../google/privacy/dlp/v2/BigQueryKey.java | 44 +- .../privacy/dlp/v2/BigQueryOptions.java | 46 +- .../google/privacy/dlp/v2/BigQueryTable.java | 44 +- .../google/privacy/dlp/v2/BoundingBox.java | 44 +- .../privacy/dlp/v2/BucketingConfig.java | 88 +- .../privacy/dlp/v2/ByteContentItem.java | 46 +- .../privacy/dlp/v2/CancelDlpJobRequest.java | 42 +- .../privacy/dlp/v2/CharacterMaskConfig.java | 44 +- .../google/privacy/dlp/v2/CharsToIgnore.java | 46 +- .../privacy/dlp/v2/CloudStorageFileSet.java | 42 +- .../privacy/dlp/v2/CloudStorageOptions.java | 89 +- .../privacy/dlp/v2/CloudStoragePath.java | 42 +- .../java/com/google/privacy/dlp/v2/Color.java | 44 +- .../google/privacy/dlp/v2/ContentItem.java | 44 +- .../privacy/dlp/v2/ContentLocation.java | 44 +- .../v2/CreateDeidentifyTemplateRequest.java | 44 +- .../privacy/dlp/v2/CreateDlpJobRequest.java | 44 +- .../dlp/v2/CreateInspectTemplateRequest.java | 44 +- .../dlp/v2/CreateJobTriggerRequest.java | 44 +- .../dlp/v2/CreateStoredInfoTypeRequest.java | 44 +- .../privacy/dlp/v2/CryptoHashConfig.java | 44 +- .../com/google/privacy/dlp/v2/CryptoKey.java | 44 +- .../dlp/v2/CryptoReplaceFfxFpeConfig.java | 46 +- .../google/privacy/dlp/v2/CustomInfoType.java | 384 +----- .../google/privacy/dlp/v2/DatastoreKey.java | 44 +- .../privacy/dlp/v2/DatastoreOptions.java | 44 +- .../privacy/dlp/v2/DateShiftConfig.java | 44 +- .../com/google/privacy/dlp/v2/DateTime.java | 86 +- .../privacy/dlp/v2/DeidentifyConfig.java | 44 +- .../dlp/v2/DeidentifyContentRequest.java | 44 +- .../dlp/v2/DeidentifyContentResponse.java | 44 +- .../privacy/dlp/v2/DeidentifyTemplate.java | 44 +- .../v2/DeleteDeidentifyTemplateRequest.java | 42 +- .../privacy/dlp/v2/DeleteDlpJobRequest.java | 42 +- .../dlp/v2/DeleteInspectTemplateRequest.java | 42 +- .../dlp/v2/DeleteJobTriggerRequest.java | 42 +- .../dlp/v2/DeleteStoredInfoTypeRequest.java | 42 +- .../com/google/privacy/dlp/v2/DlpJob.java | 48 +- .../com/google/privacy/dlp/v2/DlpProto.java | 152 +-- .../com/google/privacy/dlp/v2/DlpStorage.java | 20 +- .../privacy/dlp/v2/DocumentLocation.java | 40 +- .../com/google/privacy/dlp/v2/EntityId.java | 44 +- .../java/com/google/privacy/dlp/v2/Error.java | 44 +- .../com/google/privacy/dlp/v2/FieldId.java | 42 +- .../privacy/dlp/v2/FieldTransformation.java | 44 +- .../com/google/privacy/dlp/v2/Finding.java | 46 +- .../dlp/v2/FixedSizeBucketingConfig.java | 44 +- .../dlp/v2/GetDeidentifyTemplateRequest.java | 42 +- .../privacy/dlp/v2/GetDlpJobRequest.java | 42 +- .../dlp/v2/GetInspectTemplateRequest.java | 42 +- .../privacy/dlp/v2/GetJobTriggerRequest.java | 42 +- .../dlp/v2/GetStoredInfoTypeRequest.java | 42 +- .../google/privacy/dlp/v2/ImageLocation.java | 44 +- .../com/google/privacy/dlp/v2/InfoType.java | 42 +- .../privacy/dlp/v2/InfoTypeDescription.java | 45 +- .../google/privacy/dlp/v2/InfoTypeStats.java | 44 +- .../dlp/v2/InfoTypeTransformations.java | 88 +- .../google/privacy/dlp/v2/InspectConfig.java | 135 +- .../privacy/dlp/v2/InspectContentRequest.java | 44 +- .../dlp/v2/InspectContentResponse.java | 44 +- .../dlp/v2/InspectDataSourceDetails.java | 132 +- .../privacy/dlp/v2/InspectJobConfig.java | 44 +- .../google/privacy/dlp/v2/InspectResult.java | 44 +- .../privacy/dlp/v2/InspectTemplate.java | 44 +- .../com/google/privacy/dlp/v2/JobTrigger.java | 90 +- .../java/com/google/privacy/dlp/v2/Key.java | 88 +- .../google/privacy/dlp/v2/KindExpression.java | 42 +- .../privacy/dlp/v2/KmsWrappedCryptoKey.java | 44 +- .../dlp/v2/LargeCustomDictionaryConfig.java | 44 +- .../v2/ListDeidentifyTemplatesRequest.java | 44 +- .../v2/ListDeidentifyTemplatesResponse.java | 44 +- .../privacy/dlp/v2/ListDlpJobsRequest.java | 46 +- .../privacy/dlp/v2/ListDlpJobsResponse.java | 44 +- .../privacy/dlp/v2/ListInfoTypesRequest.java | 44 +- .../privacy/dlp/v2/ListInfoTypesResponse.java | 44 +- .../dlp/v2/ListInspectTemplatesRequest.java | 44 +- .../dlp/v2/ListInspectTemplatesResponse.java | 44 +- .../dlp/v2/ListJobTriggersRequest.java | 44 +- .../dlp/v2/ListJobTriggersResponse.java | 44 +- .../dlp/v2/ListStoredInfoTypesRequest.java | 44 +- .../dlp/v2/ListStoredInfoTypesResponse.java | 44 +- .../com/google/privacy/dlp/v2/Location.java | 44 +- .../privacy/dlp/v2/OutputStorageConfig.java | 46 +- .../google/privacy/dlp/v2/PartitionId.java | 44 +- .../dlp/v2/PrimitiveTransformation.java | 44 +- .../google/privacy/dlp/v2/PrivacyMetric.java | 440 ++---- .../com/google/privacy/dlp/v2/QuasiId.java | 44 +- .../com/google/privacy/dlp/v2/QuoteInfo.java | 44 +- .../java/com/google/privacy/dlp/v2/Range.java | 44 +- .../privacy/dlp/v2/RecordCondition.java | 180 +-- .../com/google/privacy/dlp/v2/RecordKey.java | 44 +- .../google/privacy/dlp/v2/RecordLocation.java | 44 +- .../privacy/dlp/v2/RecordSuppression.java | 44 +- .../privacy/dlp/v2/RecordTransformations.java | 44 +- .../google/privacy/dlp/v2/RedactConfig.java | 30 +- .../privacy/dlp/v2/RedactImageRequest.java | 88 +- .../privacy/dlp/v2/RedactImageResponse.java | 44 +- .../dlp/v2/ReidentifyContentRequest.java | 44 +- .../dlp/v2/ReidentifyContentResponse.java | 44 +- .../privacy/dlp/v2/ReplaceValueConfig.java | 44 +- .../dlp/v2/ReplaceWithInfoTypeConfig.java | 30 +- .../privacy/dlp/v2/RiskAnalysisJobConfig.java | 44 +- .../com/google/privacy/dlp/v2/Schedule.java | 44 +- .../privacy/dlp/v2/StatisticalTable.java | 88 +- .../google/privacy/dlp/v2/StorageConfig.java | 88 +- .../google/privacy/dlp/v2/StoredInfoType.java | 44 +- .../privacy/dlp/v2/StoredInfoTypeConfig.java | 44 +- .../privacy/dlp/v2/StoredInfoTypeVersion.java | 46 +- .../com/google/privacy/dlp/v2/StoredType.java | 44 +- .../java/com/google/privacy/dlp/v2/Table.java | 88 +- .../google/privacy/dlp/v2/TableLocation.java | 40 +- .../google/privacy/dlp/v2/TimePartConfig.java | 44 +- .../dlp/v2/TransformationOverview.java | 44 +- .../privacy/dlp/v2/TransformationSummary.java | 90 +- .../privacy/dlp/v2/TransientCryptoKey.java | 42 +- .../privacy/dlp/v2/UnwrappedCryptoKey.java | 40 +- .../v2/UpdateDeidentifyTemplateRequest.java | 44 +- .../dlp/v2/UpdateInspectTemplateRequest.java | 44 +- .../dlp/v2/UpdateJobTriggerRequest.java | 44 +- .../dlp/v2/UpdateStoredInfoTypeRequest.java | 44 +- .../java/com/google/privacy/dlp/v2/Value.java | 46 +- .../google/privacy/dlp/v2/ValueFrequency.java | 44 +- .../v1beta1/CommonProto.java | 6 +- .../v1beta1/DeleteEventsRequest.java | 42 +- .../v1beta1/DeleteEventsResponse.java | 30 +- .../v1beta1/ErrorContext.java | 44 +- .../v1beta1/ErrorEvent.java | 44 +- .../v1beta1/ErrorGroup.java | 44 +- .../v1beta1/ErrorGroupServiceProto.java | 4 +- .../v1beta1/ErrorGroupStats.java | 44 +- .../v1beta1/ErrorStatsServiceProto.java | 18 +- .../v1beta1/GetGroupRequest.java | 42 +- .../v1beta1/HttpRequestContext.java | 44 +- .../v1beta1/ListEventsRequest.java | 44 +- .../v1beta1/ListEventsResponse.java | 44 +- .../v1beta1/ListGroupStatsRequest.java | 48 +- .../v1beta1/ListGroupStatsResponse.java | 44 +- .../v1beta1/QueryTimeRange.java | 44 +- .../v1beta1/ReportErrorEventRequest.java | 44 +- .../v1beta1/ReportErrorEventResponse.java | 30 +- .../v1beta1/ReportErrorsServiceProto.java | 4 +- .../v1beta1/ReportedErrorEvent.java | 44 +- .../v1beta1/ServiceContext.java | 44 +- .../v1beta1/ServiceContextFilter.java | 44 +- .../v1beta1/SourceLocation.java | 44 +- .../v1beta1/TimedCount.java | 44 +- .../v1beta1/TrackingIssue.java | 42 +- .../v1beta1/UpdateGroupRequest.java | 44 +- .../google/firestore/v1beta1/ArrayValue.java | 44 +- .../v1beta1/BatchGetDocumentsRequest.java | 44 +- .../v1beta1/BatchGetDocumentsResponse.java | 44 +- .../v1beta1/BeginTransactionRequest.java | 44 +- .../v1beta1/BeginTransactionResponse.java | 40 +- .../firestore/v1beta1/CommitRequest.java | 44 +- .../firestore/v1beta1/CommitResponse.java | 44 +- .../google/firestore/v1beta1/CommonProto.java | 2 +- .../v1beta1/CreateDocumentRequest.java | 44 +- .../com/google/firestore/v1beta1/Cursor.java | 44 +- .../v1beta1/DeleteDocumentRequest.java | 44 +- .../google/firestore/v1beta1/Document.java | 45 +- .../firestore/v1beta1/DocumentChange.java | 44 +- .../firestore/v1beta1/DocumentDelete.java | 44 +- .../firestore/v1beta1/DocumentMask.java | 44 +- .../firestore/v1beta1/DocumentProto.java | 6 +- .../firestore/v1beta1/DocumentRemove.java | 44 +- .../firestore/v1beta1/DocumentTransform.java | 90 +- .../firestore/v1beta1/ExistenceFilter.java | 44 +- .../firestore/v1beta1/FirestoreProto.java | 36 +- .../firestore/v1beta1/GetDocumentRequest.java | 44 +- .../v1beta1/ListCollectionIdsRequest.java | 44 +- .../v1beta1/ListCollectionIdsResponse.java | 44 +- .../v1beta1/ListDocumentsRequest.java | 44 +- .../v1beta1/ListDocumentsResponse.java | 44 +- .../firestore/v1beta1/ListenRequest.java | 45 +- .../firestore/v1beta1/ListenResponse.java | 44 +- .../google/firestore/v1beta1/MapValue.java | 45 +- .../firestore/v1beta1/Precondition.java | 44 +- .../google/firestore/v1beta1/QueryProto.java | 12 +- .../firestore/v1beta1/RollbackRequest.java | 44 +- .../firestore/v1beta1/RunQueryRequest.java | 44 +- .../firestore/v1beta1/RunQueryResponse.java | 44 +- .../firestore/v1beta1/StructuredQuery.java | 402 +----- .../com/google/firestore/v1beta1/Target.java | 132 +- .../firestore/v1beta1/TargetChange.java | 46 +- .../firestore/v1beta1/TransactionOptions.java | 128 +- .../v1beta1/UpdateDocumentRequest.java | 44 +- .../com/google/firestore/v1beta1/Value.java | 46 +- .../com/google/firestore/v1beta1/Write.java | 44 +- .../google/firestore/v1beta1/WriteProto.java | 8 +- .../firestore/v1beta1/WriteRequest.java | 45 +- .../firestore/v1beta1/WriteResponse.java | 44 +- .../google/firestore/v1beta1/WriteResult.java | 44 +- .../iot/v1/CreateDeviceRegistryRequest.java | 44 +- .../cloud/iot/v1/CreateDeviceRequest.java | 44 +- .../iot/v1/DeleteDeviceRegistryRequest.java | 42 +- .../cloud/iot/v1/DeleteDeviceRequest.java | 42 +- .../java/com/google/cloud/iot/v1/Device.java | 45 +- .../com/google/cloud/iot/v1/DeviceConfig.java | 44 +- .../google/cloud/iot/v1/DeviceCredential.java | 44 +- .../cloud/iot/v1/DeviceManagerProto.java | 26 +- .../google/cloud/iot/v1/DeviceRegistry.java | 44 +- .../com/google/cloud/iot/v1/DeviceState.java | 44 +- .../cloud/iot/v1/EventNotificationConfig.java | 44 +- .../iot/v1/GetDeviceRegistryRequest.java | 42 +- .../google/cloud/iot/v1/GetDeviceRequest.java | 44 +- .../com/google/cloud/iot/v1/HttpConfig.java | 44 +- .../v1/ListDeviceConfigVersionsRequest.java | 44 +- .../v1/ListDeviceConfigVersionsResponse.java | 44 +- .../iot/v1/ListDeviceRegistriesRequest.java | 44 +- .../iot/v1/ListDeviceRegistriesResponse.java | 44 +- .../cloud/iot/v1/ListDeviceStatesRequest.java | 44 +- .../iot/v1/ListDeviceStatesResponse.java | 44 +- .../cloud/iot/v1/ListDevicesRequest.java | 44 +- .../cloud/iot/v1/ListDevicesResponse.java | 44 +- .../v1/ModifyCloudToDeviceConfigRequest.java | 44 +- .../com/google/cloud/iot/v1/MqttConfig.java | 44 +- .../cloud/iot/v1/PublicKeyCertificate.java | 46 +- .../cloud/iot/v1/PublicKeyCredential.java | 46 +- .../cloud/iot/v1/RegistryCredential.java | 44 +- .../google/cloud/iot/v1/ResourcesProto.java | 14 +- .../cloud/iot/v1/StateNotificationConfig.java | 42 +- .../iot/v1/UpdateDeviceRegistryRequest.java | 44 +- .../cloud/iot/v1/UpdateDeviceRequest.java | 44 +- .../cloud/iot/v1/X509CertificateDetails.java | 44 +- .../cloud/kms/v1/CreateCryptoKeyRequest.java | 44 +- .../kms/v1/CreateCryptoKeyVersionRequest.java | 44 +- .../cloud/kms/v1/CreateKeyRingRequest.java | 44 +- .../com/google/cloud/kms/v1/CryptoKey.java | 47 +- .../google/cloud/kms/v1/CryptoKeyVersion.java | 46 +- .../google/cloud/kms/v1/DecryptRequest.java | 44 +- .../google/cloud/kms/v1/DecryptResponse.java | 40 +- .../v1/DestroyCryptoKeyVersionRequest.java | 42 +- .../google/cloud/kms/v1/EncryptRequest.java | 44 +- .../google/cloud/kms/v1/EncryptResponse.java | 44 +- .../cloud/kms/v1/GetCryptoKeyRequest.java | 42 +- .../kms/v1/GetCryptoKeyVersionRequest.java | 42 +- .../cloud/kms/v1/GetKeyRingRequest.java | 42 +- .../java/com/google/cloud/kms/v1/KeyRing.java | 44 +- .../com/google/cloud/kms/v1/KmsProto.java | 26 +- .../cloud/kms/v1/KmsResourcesProto.java | 6 +- .../kms/v1/ListCryptoKeyVersionsRequest.java | 44 +- .../kms/v1/ListCryptoKeyVersionsResponse.java | 44 +- .../cloud/kms/v1/ListCryptoKeysRequest.java | 44 +- .../cloud/kms/v1/ListCryptoKeysResponse.java | 44 +- .../cloud/kms/v1/ListKeyRingsRequest.java | 44 +- .../cloud/kms/v1/ListKeyRingsResponse.java | 44 +- .../v1/RestoreCryptoKeyVersionRequest.java | 42 +- .../UpdateCryptoKeyPrimaryVersionRequest.java | 44 +- .../cloud/kms/v1/UpdateCryptoKeyRequest.java | 44 +- .../kms/v1/UpdateCryptoKeyVersionRequest.java | 44 +- .../language/v1/AnalyzeEntitiesRequest.java | 46 +- .../language/v1/AnalyzeEntitiesResponse.java | 44 +- .../v1/AnalyzeEntitySentimentRequest.java | 46 +- .../v1/AnalyzeEntitySentimentResponse.java | 44 +- .../language/v1/AnalyzeSentimentRequest.java | 46 +- .../language/v1/AnalyzeSentimentResponse.java | 44 +- .../language/v1/AnalyzeSyntaxRequest.java | 46 +- .../language/v1/AnalyzeSyntaxResponse.java | 44 +- .../language/v1/AnnotateTextRequest.java | 90 +- .../language/v1/AnnotateTextResponse.java | 44 +- .../language/v1/ClassificationCategory.java | 44 +- .../language/v1/ClassifyTextRequest.java | 44 +- .../language/v1/ClassifyTextResponse.java | 44 +- .../cloud/language/v1/DependencyEdge.java | 46 +- .../google/cloud/language/v1/Document.java | 46 +- .../com/google/cloud/language/v1/Entity.java | 47 +- .../cloud/language/v1/EntityMention.java | 46 +- .../language/v1/LanguageServiceProto.java | 38 +- .../cloud/language/v1/PartOfSpeech.java | 68 +- .../google/cloud/language/v1/Sentence.java | 44 +- .../google/cloud/language/v1/Sentiment.java | 44 +- .../google/cloud/language/v1/TextSpan.java | 44 +- .../com/google/cloud/language/v1/Token.java | 44 +- .../v1beta2/AnalyzeEntitiesRequest.java | 46 +- .../v1beta2/AnalyzeEntitiesResponse.java | 44 +- .../AnalyzeEntitySentimentRequest.java | 46 +- .../AnalyzeEntitySentimentResponse.java | 44 +- .../v1beta2/AnalyzeSentimentRequest.java | 46 +- .../v1beta2/AnalyzeSentimentResponse.java | 44 +- .../v1beta2/AnalyzeSyntaxRequest.java | 46 +- .../v1beta2/AnalyzeSyntaxResponse.java | 44 +- .../language/v1beta2/AnnotateTextRequest.java | 90 +- .../v1beta2/AnnotateTextResponse.java | 44 +- .../v1beta2/ClassificationCategory.java | 44 +- .../language/v1beta2/ClassifyTextRequest.java | 44 +- .../v1beta2/ClassifyTextResponse.java | 44 +- .../language/v1beta2/DependencyEdge.java | 46 +- .../cloud/language/v1beta2/Document.java | 46 +- .../google/cloud/language/v1beta2/Entity.java | 47 +- .../cloud/language/v1beta2/EntityMention.java | 46 +- .../v1beta2/LanguageServiceProto.java | 40 +- .../cloud/language/v1beta2/PartOfSpeech.java | 68 +- .../cloud/language/v1beta2/Sentence.java | 44 +- .../cloud/language/v1beta2/Sentiment.java | 44 +- .../cloud/language/v1beta2/TextSpan.java | 44 +- .../google/cloud/language/v1beta2/Token.java | 44 +- .../logging/v2/CreateExclusionRequest.java | 44 +- .../logging/v2/CreateLogMetricRequest.java | 44 +- .../google/logging/v2/CreateSinkRequest.java | 44 +- .../logging/v2/DeleteExclusionRequest.java | 42 +- .../logging/v2/DeleteLogMetricRequest.java | 42 +- .../google/logging/v2/DeleteLogRequest.java | 42 +- .../google/logging/v2/DeleteSinkRequest.java | 42 +- .../logging/v2/GetExclusionRequest.java | 42 +- .../logging/v2/GetLogMetricRequest.java | 42 +- .../com/google/logging/v2/GetSinkRequest.java | 42 +- .../logging/v2/ListExclusionsRequest.java | 44 +- .../logging/v2/ListExclusionsResponse.java | 44 +- .../logging/v2/ListLogEntriesRequest.java | 44 +- .../logging/v2/ListLogEntriesResponse.java | 44 +- .../logging/v2/ListLogMetricsRequest.java | 44 +- .../logging/v2/ListLogMetricsResponse.java | 44 +- .../google/logging/v2/ListLogsRequest.java | 44 +- .../google/logging/v2/ListLogsResponse.java | 44 +- ...stMonitoredResourceDescriptorsRequest.java | 44 +- ...tMonitoredResourceDescriptorsResponse.java | 44 +- .../google/logging/v2/ListSinksRequest.java | 44 +- .../google/logging/v2/ListSinksResponse.java | 44 +- .../java/com/google/logging/v2/LogEntry.java | 47 +- .../google/logging/v2/LogEntryOperation.java | 44 +- .../com/google/logging/v2/LogEntryProto.java | 6 +- .../logging/v2/LogEntrySourceLocation.java | 44 +- .../com/google/logging/v2/LogExclusion.java | 44 +- .../java/com/google/logging/v2/LogMetric.java | 47 +- .../java/com/google/logging/v2/LogSink.java | 46 +- .../google/logging/v2/LoggingConfigProto.java | 24 +- .../logging/v2/LoggingMetricsProto.java | 8 +- .../com/google/logging/v2/LoggingProto.java | 12 +- .../logging/v2/UpdateExclusionRequest.java | 44 +- .../logging/v2/UpdateLogMetricRequest.java | 44 +- .../google/logging/v2/UpdateSinkRequest.java | 44 +- .../v2/WriteLogEntriesPartialErrors.java | 45 +- .../logging/v2/WriteLogEntriesRequest.java | 45 +- .../logging/v2/WriteLogEntriesResponse.java | 30 +- .../com/google/monitoring/v3/Aggregation.java | 48 +- .../com/google/monitoring/v3/AlertPolicy.java | 269 +--- .../com/google/monitoring/v3/AlertProto.java | 10 +- .../monitoring/v3/AlertServiceProto.java | 8 +- .../com/google/monitoring/v3/CommonProto.java | 8 +- .../v3/CreateAlertPolicyRequest.java | 44 +- .../monitoring/v3/CreateGroupRequest.java | 44 +- .../v3/CreateMetricDescriptorRequest.java | 44 +- .../v3/CreateNotificationChannelRequest.java | 44 +- .../monitoring/v3/CreateTimeSeriesError.java | 44 +- .../v3/CreateTimeSeriesRequest.java | 44 +- .../v3/CreateUptimeCheckConfigRequest.java | 44 +- .../v3/DeleteAlertPolicyRequest.java | 42 +- .../monitoring/v3/DeleteGroupRequest.java | 42 +- .../v3/DeleteMetricDescriptorRequest.java | 42 +- .../v3/DeleteNotificationChannelRequest.java | 44 +- .../v3/DeleteUptimeCheckConfigRequest.java | 42 +- .../monitoring/v3/GetAlertPolicyRequest.java | 42 +- .../google/monitoring/v3/GetGroupRequest.java | 42 +- .../v3/GetMetricDescriptorRequest.java | 42 +- ...GetMonitoredResourceDescriptorRequest.java | 42 +- ...tNotificationChannelDescriptorRequest.java | 42 +- .../v3/GetNotificationChannelRequest.java | 42 +- ...icationChannelVerificationCodeRequest.java | 44 +- ...cationChannelVerificationCodeResponse.java | 44 +- .../v3/GetUptimeCheckConfigRequest.java | 42 +- .../java/com/google/monitoring/v3/Group.java | 44 +- .../monitoring/v3/GroupServiceProto.java | 10 +- .../google/monitoring/v3/InternalChecker.java | 44 +- .../v3/ListAlertPoliciesRequest.java | 44 +- .../v3/ListAlertPoliciesResponse.java | 44 +- .../v3/ListGroupMembersRequest.java | 44 +- .../v3/ListGroupMembersResponse.java | 44 +- .../monitoring/v3/ListGroupsRequest.java | 44 +- .../monitoring/v3/ListGroupsResponse.java | 44 +- .../v3/ListMetricDescriptorsRequest.java | 44 +- .../v3/ListMetricDescriptorsResponse.java | 44 +- ...stMonitoredResourceDescriptorsRequest.java | 44 +- ...tMonitoredResourceDescriptorsResponse.java | 44 +- ...NotificationChannelDescriptorsRequest.java | 44 +- ...otificationChannelDescriptorsResponse.java | 44 +- .../v3/ListNotificationChannelsRequest.java | 44 +- .../v3/ListNotificationChannelsResponse.java | 44 +- .../monitoring/v3/ListTimeSeriesRequest.java | 46 +- .../monitoring/v3/ListTimeSeriesResponse.java | 44 +- .../v3/ListUptimeCheckConfigsRequest.java | 44 +- .../v3/ListUptimeCheckConfigsResponse.java | 44 +- .../v3/ListUptimeCheckIpsRequest.java | 44 +- .../v3/ListUptimeCheckIpsResponse.java | 44 +- .../com/google/monitoring/v3/MetricProto.java | 4 +- .../monitoring/v3/MetricServiceProto.java | 16 +- .../google/monitoring/v3/MutationRecord.java | 44 +- .../monitoring/v3/NotificationChannel.java | 47 +- .../v3/NotificationChannelDescriptor.java | 45 +- .../monitoring/v3/NotificationProto.java | 4 +- .../v3/NotificationServiceProto.java | 18 +- .../java/com/google/monitoring/v3/Point.java | 44 +- ...icationChannelVerificationCodeRequest.java | 42 +- .../com/google/monitoring/v3/SpanContext.java | 42 +- .../google/monitoring/v3/TimeInterval.java | 44 +- .../com/google/monitoring/v3/TimeSeries.java | 48 +- .../com/google/monitoring/v3/TypedValue.java | 44 +- .../v3/UpdateAlertPolicyRequest.java | 44 +- .../monitoring/v3/UpdateGroupRequest.java | 44 +- .../v3/UpdateNotificationChannelRequest.java | 44 +- .../v3/UpdateUptimeCheckConfigRequest.java | 44 +- .../monitoring/v3/UptimeCheckConfig.java | 262 +--- .../google/monitoring/v3/UptimeCheckIp.java | 46 +- .../com/google/monitoring/v3/UptimeProto.java | 8 +- .../monitoring/v3/UptimeServiceProto.java | 10 +- .../v3/VerifyNotificationChannelRequest.java | 44 +- .../v3/DroppedLabelsOuterClass.java | 45 +- .../cloud/oslogin/common/OsLoginProto.java | 90 +- .../oslogin/v1/DeletePosixAccountRequest.java | 42 +- .../oslogin/v1/DeleteSshPublicKeyRequest.java | 42 +- .../oslogin/v1/GetLoginProfileRequest.java | 42 +- .../oslogin/v1/GetSshPublicKeyRequest.java | 42 +- .../oslogin/v1/ImportSshPublicKeyRequest.java | 44 +- .../v1/ImportSshPublicKeyResponse.java | 44 +- .../google/cloud/oslogin/v1/LoginProfile.java | 45 +- .../google/cloud/oslogin/v1/OsLoginProto.java | 10 +- .../oslogin/v1/UpdateSshPublicKeyRequest.java | 44 +- .../google/pubsub/v1/AcknowledgeRequest.java | 44 +- .../pubsub/v1/CreateSnapshotRequest.java | 45 +- .../pubsub/v1/DeleteSnapshotRequest.java | 42 +- .../pubsub/v1/DeleteSubscriptionRequest.java | 42 +- .../google/pubsub/v1/DeleteTopicRequest.java | 42 +- .../google/pubsub/v1/GetSnapshotRequest.java | 42 +- .../pubsub/v1/GetSubscriptionRequest.java | 42 +- .../com/google/pubsub/v1/GetTopicRequest.java | 42 +- .../pubsub/v1/ListSnapshotsRequest.java | 44 +- .../pubsub/v1/ListSnapshotsResponse.java | 44 +- .../pubsub/v1/ListSubscriptionsRequest.java | 44 +- .../pubsub/v1/ListSubscriptionsResponse.java | 44 +- .../pubsub/v1/ListTopicSnapshotsRequest.java | 44 +- .../pubsub/v1/ListTopicSnapshotsResponse.java | 44 +- .../v1/ListTopicSubscriptionsRequest.java | 44 +- .../v1/ListTopicSubscriptionsResponse.java | 44 +- .../google/pubsub/v1/ListTopicsRequest.java | 44 +- .../google/pubsub/v1/ListTopicsResponse.java | 44 +- .../pubsub/v1/MessageStoragePolicy.java | 44 +- .../pubsub/v1/ModifyAckDeadlineRequest.java | 44 +- .../pubsub/v1/ModifyPushConfigRequest.java | 44 +- .../com/google/pubsub/v1/PublishRequest.java | 44 +- .../com/google/pubsub/v1/PublishResponse.java | 44 +- .../com/google/pubsub/v1/PubsubMessage.java | 45 +- .../com/google/pubsub/v1/PubsubProto.java | 36 +- .../com/google/pubsub/v1/PullRequest.java | 44 +- .../com/google/pubsub/v1/PullResponse.java | 44 +- .../java/com/google/pubsub/v1/PushConfig.java | 45 +- .../com/google/pubsub/v1/ReceivedMessage.java | 44 +- .../com/google/pubsub/v1/SeekRequest.java | 44 +- .../com/google/pubsub/v1/SeekResponse.java | 30 +- .../java/com/google/pubsub/v1/Snapshot.java | 45 +- .../pubsub/v1/StreamingPullRequest.java | 44 +- .../pubsub/v1/StreamingPullResponse.java | 44 +- .../com/google/pubsub/v1/Subscription.java | 45 +- .../main/java/com/google/pubsub/v1/Topic.java | 45 +- .../pubsub/v1/UpdateSnapshotRequest.java | 44 +- .../pubsub/v1/UpdateSubscriptionRequest.java | 44 +- .../google/pubsub/v1/UpdateTopicRequest.java | 44 +- .../v1beta1/CloudRedisServiceBetaProto.java | 14 +- .../redis/v1beta1/CreateInstanceRequest.java | 44 +- .../redis/v1beta1/DeleteInstanceRequest.java | 42 +- .../redis/v1beta1/GetInstanceRequest.java | 42 +- .../google/cloud/redis/v1beta1/Instance.java | 49 +- .../redis/v1beta1/ListInstancesRequest.java | 44 +- .../redis/v1beta1/ListInstancesResponse.java | 44 +- .../cloud/redis/v1beta1/LocationMetadata.java | 45 +- .../redis/v1beta1/UpdateInstanceRequest.java | 44 +- .../cloud/redis/v1beta1/ZoneMetadata.java | 30 +- .../database/v1/CreateDatabaseMetadata.java | 42 +- .../database/v1/CreateDatabaseRequest.java | 44 +- .../spanner/admin/database/v1/Database.java | 46 +- .../database/v1/DropDatabaseRequest.java | 42 +- .../database/v1/GetDatabaseDdlRequest.java | 42 +- .../database/v1/GetDatabaseDdlResponse.java | 44 +- .../admin/database/v1/GetDatabaseRequest.java | 42 +- .../database/v1/ListDatabasesRequest.java | 44 +- .../database/v1/ListDatabasesResponse.java | 44 +- .../v1/SpannerDatabaseAdminProto.java | 14 +- .../v1/UpdateDatabaseDdlMetadata.java | 44 +- .../database/v1/UpdateDatabaseDdlRequest.java | 44 +- .../instance/v1/CreateInstanceMetadata.java | 44 +- .../instance/v1/CreateInstanceRequest.java | 44 +- .../instance/v1/DeleteInstanceRequest.java | 42 +- .../instance/v1/GetInstanceConfigRequest.java | 42 +- .../admin/instance/v1/GetInstanceRequest.java | 42 +- .../spanner/admin/instance/v1/Instance.java | 47 +- .../admin/instance/v1/InstanceConfig.java | 44 +- .../v1/ListInstanceConfigsRequest.java | 44 +- .../v1/ListInstanceConfigsResponse.java | 44 +- .../instance/v1/ListInstancesRequest.java | 44 +- .../instance/v1/ListInstancesResponse.java | 44 +- .../v1/SpannerInstanceAdminProto.java | 18 +- .../instance/v1/UpdateInstanceMetadata.java | 44 +- .../instance/v1/UpdateInstanceRequest.java | 44 +- .../spanner/v1/BeginTransactionRequest.java | 44 +- .../com/google/spanner/v1/CommitRequest.java | 44 +- .../com/google/spanner/v1/CommitResponse.java | 44 +- .../spanner/v1/CreateSessionRequest.java | 44 +- .../spanner/v1/DeleteSessionRequest.java | 42 +- .../google/spanner/v1/ExecuteSqlRequest.java | 47 +- .../google/spanner/v1/GetSessionRequest.java | 42 +- .../java/com/google/spanner/v1/KeyRange.java | 44 +- .../java/com/google/spanner/v1/KeySet.java | 44 +- .../java/com/google/spanner/v1/KeysProto.java | 2 +- .../spanner/v1/ListSessionsRequest.java | 44 +- .../spanner/v1/ListSessionsResponse.java | 44 +- .../java/com/google/spanner/v1/Mutation.java | 132 +- .../com/google/spanner/v1/MutationProto.java | 2 +- .../google/spanner/v1/PartialResultSet.java | 44 +- .../java/com/google/spanner/v1/Partition.java | 40 +- .../google/spanner/v1/PartitionOptions.java | 44 +- .../spanner/v1/PartitionQueryRequest.java | 45 +- .../spanner/v1/PartitionReadRequest.java | 44 +- .../google/spanner/v1/PartitionResponse.java | 44 +- .../java/com/google/spanner/v1/PlanNode.java | 135 +- .../java/com/google/spanner/v1/QueryPlan.java | 44 +- .../com/google/spanner/v1/QueryPlanProto.java | 4 +- .../com/google/spanner/v1/ReadRequest.java | 44 +- .../java/com/google/spanner/v1/ResultSet.java | 44 +- .../google/spanner/v1/ResultSetMetadata.java | 44 +- .../com/google/spanner/v1/ResultSetProto.java | 4 +- .../com/google/spanner/v1/ResultSetStats.java | 44 +- .../google/spanner/v1/RollbackRequest.java | 44 +- .../java/com/google/spanner/v1/Session.java | 45 +- .../com/google/spanner/v1/SpannerProto.java | 26 +- .../com/google/spanner/v1/StructType.java | 88 +- .../com/google/spanner/v1/Transaction.java | 44 +- .../google/spanner/v1/TransactionOptions.java | 118 +- .../google/spanner/v1/TransactionProto.java | 4 +- .../spanner/v1/TransactionSelector.java | 44 +- .../main/java/com/google/spanner/v1/Type.java | 46 +- .../java/com/google/spanner/v1/TypeProto.java | 2 +- .../v1/LongRunningRecognizeMetadata.java | 44 +- .../v1/LongRunningRecognizeRequest.java | 44 +- .../v1/LongRunningRecognizeResponse.java | 90 +- ...LongRunningRecognizeResponseOrBuilder.java | 10 +- .../cloud/speech/v1/RecognitionAudio.java | 69 +- .../speech/v1/RecognitionAudioOrBuilder.java | 6 +- .../cloud/speech/v1/RecognitionConfig.java | 810 +++++++++-- .../speech/v1/RecognitionConfigOrBuilder.java | 149 ++- .../cloud/speech/v1/RecognizeRequest.java | 44 +- .../cloud/speech/v1/RecognizeResponse.java | 90 +- .../speech/v1/RecognizeResponseOrBuilder.java | 10 +- .../google/cloud/speech/v1/SpeechContext.java | 70 +- .../speech/v1/SpeechContextOrBuilder.java | 8 +- .../google/cloud/speech/v1/SpeechProto.java | 153 ++- .../v1/SpeechRecognitionAlternative.java | 140 +- ...SpeechRecognitionAlternativeOrBuilder.java | 23 +- .../speech/v1/SpeechRecognitionResult.java | 90 +- .../v1/SpeechRecognitionResultOrBuilder.java | 10 +- .../speech/v1/StreamingRecognitionConfig.java | 44 +- .../speech/v1/StreamingRecognitionResult.java | 152 ++- .../StreamingRecognitionResultOrBuilder.java | 24 +- .../speech/v1/StreamingRecognizeRequest.java | 52 +- .../StreamingRecognizeRequestOrBuilder.java | 2 +- .../speech/v1/StreamingRecognizeResponse.java | 222 ++- .../StreamingRecognizeResponseOrBuilder.java | 40 +- .../com/google/cloud/speech/v1/WordInfo.java | 114 +- .../cloud/speech/v1/WordInfoOrBuilder.java | 16 +- .../google/cloud/speech/v1/cloud_speech.proto | 175 ++- .../LongRunningRecognizeMetadata.java | 44 +- .../LongRunningRecognizeRequest.java | 44 +- .../LongRunningRecognizeResponse.java | 44 +- .../speech/v1p1beta1/RecognitionAudio.java | 44 +- .../speech/v1p1beta1/RecognitionConfig.java | 46 +- .../speech/v1p1beta1/RecognitionMetadata.java | 52 +- .../speech/v1p1beta1/RecognizeRequest.java | 44 +- .../speech/v1p1beta1/RecognizeResponse.java | 44 +- .../cloud/speech/v1p1beta1/SpeechContext.java | 44 +- .../cloud/speech/v1p1beta1/SpeechProto.java | 24 +- .../SpeechRecognitionAlternative.java | 44 +- .../v1p1beta1/SpeechRecognitionResult.java | 44 +- .../v1p1beta1/StreamingRecognitionConfig.java | 44 +- .../v1p1beta1/StreamingRecognitionResult.java | 44 +- .../v1p1beta1/StreamingRecognizeRequest.java | 44 +- .../v1p1beta1/StreamingRecognizeResponse.java | 46 +- .../cloud/speech/v1p1beta1/WordInfo.java | 44 +- .../tasks/v2beta2/AcknowledgeTaskRequest.java | 44 +- .../tasks/v2beta2/AppEngineHttpRequest.java | 47 +- .../tasks/v2beta2/AppEngineHttpTarget.java | 44 +- .../cloud/tasks/v2beta2/AppEngineRouting.java | 44 +- .../cloud/tasks/v2beta2/AttemptStatus.java | 44 +- .../tasks/v2beta2/CancelLeaseRequest.java | 46 +- .../cloud/tasks/v2beta2/CloudTasksProto.java | 28 +- .../tasks/v2beta2/CreateQueueRequest.java | 44 +- .../tasks/v2beta2/CreateTaskRequest.java | 46 +- .../tasks/v2beta2/DeleteQueueRequest.java | 42 +- .../tasks/v2beta2/DeleteTaskRequest.java | 42 +- .../cloud/tasks/v2beta2/GetQueueRequest.java | 42 +- .../cloud/tasks/v2beta2/GetTaskRequest.java | 46 +- .../tasks/v2beta2/LeaseTasksRequest.java | 46 +- .../tasks/v2beta2/LeaseTasksResponse.java | 44 +- .../tasks/v2beta2/ListQueuesRequest.java | 44 +- .../tasks/v2beta2/ListQueuesResponse.java | 44 +- .../cloud/tasks/v2beta2/ListTasksRequest.java | 46 +- .../tasks/v2beta2/ListTasksResponse.java | 44 +- .../tasks/v2beta2/PauseQueueRequest.java | 42 +- .../cloud/tasks/v2beta2/PullMessage.java | 44 +- .../cloud/tasks/v2beta2/PullTarget.java | 30 +- .../tasks/v2beta2/PurgeQueueRequest.java | 42 +- .../com/google/cloud/tasks/v2beta2/Queue.java | 46 +- .../cloud/tasks/v2beta2/QueueProto.java | 4 +- .../cloud/tasks/v2beta2/RateLimits.java | 44 +- .../tasks/v2beta2/RenewLeaseRequest.java | 46 +- .../tasks/v2beta2/ResumeQueueRequest.java | 42 +- .../cloud/tasks/v2beta2/RetryConfig.java | 44 +- .../cloud/tasks/v2beta2/RunTaskRequest.java | 46 +- .../cloud/tasks/v2beta2/TargetProto.java | 4 +- .../com/google/cloud/tasks/v2beta2/Task.java | 46 +- .../google/cloud/tasks/v2beta2/TaskProto.java | 6 +- .../cloud/tasks/v2beta2/TaskStatus.java | 44 +- .../tasks/v2beta2/UpdateQueueRequest.java | 44 +- .../tasks/v2beta3/AppEngineHttpQueue.java | 44 +- .../tasks/v2beta3/AppEngineHttpRequest.java | 47 +- .../cloud/tasks/v2beta3/AppEngineRouting.java | 44 +- .../google/cloud/tasks/v2beta3/Attempt.java | 44 +- .../cloud/tasks/v2beta3/CloudTasksProto.java | 20 +- .../tasks/v2beta3/CreateQueueRequest.java | 44 +- .../tasks/v2beta3/CreateTaskRequest.java | 46 +- .../tasks/v2beta3/DeleteQueueRequest.java | 42 +- .../tasks/v2beta3/DeleteTaskRequest.java | 42 +- .../cloud/tasks/v2beta3/GetQueueRequest.java | 42 +- .../cloud/tasks/v2beta3/GetTaskRequest.java | 46 +- .../tasks/v2beta3/ListQueuesRequest.java | 44 +- .../tasks/v2beta3/ListQueuesResponse.java | 44 +- .../cloud/tasks/v2beta3/ListTasksRequest.java | 46 +- .../tasks/v2beta3/ListTasksResponse.java | 44 +- .../tasks/v2beta3/PauseQueueRequest.java | 42 +- .../tasks/v2beta3/PurgeQueueRequest.java | 42 +- .../com/google/cloud/tasks/v2beta3/Queue.java | 46 +- .../cloud/tasks/v2beta3/QueueProto.java | 4 +- .../cloud/tasks/v2beta3/RateLimits.java | 44 +- .../tasks/v2beta3/ResumeQueueRequest.java | 42 +- .../cloud/tasks/v2beta3/RetryConfig.java | 44 +- .../cloud/tasks/v2beta3/RunTaskRequest.java | 46 +- .../cloud/tasks/v2beta3/TargetProto.java | 4 +- .../com/google/cloud/tasks/v2beta3/Task.java | 46 +- .../google/cloud/tasks/v2beta3/TaskProto.java | 4 +- .../tasks/v2beta3/UpdateQueueRequest.java | 44 +- .../cloud/texttospeech/v1/AudioConfig.java | 46 +- .../texttospeech/v1/ListVoicesRequest.java | 42 +- .../texttospeech/v1/ListVoicesResponse.java | 44 +- .../cloud/texttospeech/v1/SynthesisInput.java | 44 +- .../v1/SynthesizeSpeechRequest.java | 44 +- .../v1/SynthesizeSpeechResponse.java | 40 +- .../texttospeech/v1/TextToSpeechProto.java | 8 +- .../google/cloud/texttospeech/v1/Voice.java | 46 +- .../texttospeech/v1/VoiceSelectionParams.java | 46 +- .../texttospeech/v1beta1/AudioConfig.java | 46 +- .../v1beta1/ListVoicesRequest.java | 42 +- .../v1beta1/ListVoicesResponse.java | 44 +- .../texttospeech/v1beta1/SynthesisInput.java | 44 +- .../v1beta1/SynthesizeSpeechRequest.java | 44 +- .../v1beta1/SynthesizeSpeechResponse.java | 40 +- .../v1beta1/TextToSpeechProto.java | 8 +- .../cloud/texttospeech/v1beta1/Voice.java | 46 +- .../v1beta1/VoiceSelectionParams.java | 46 +- .../cloudtrace/v1/GetTraceRequest.java | 44 +- .../cloudtrace/v1/ListTracesRequest.java | 46 +- .../cloudtrace/v1/ListTracesResponse.java | 44 +- .../cloudtrace/v1/PatchTracesRequest.java | 44 +- .../google/devtools/cloudtrace/v1/Trace.java | 44 +- .../devtools/cloudtrace/v1/TraceProto.java | 10 +- .../devtools/cloudtrace/v1/TraceSpan.java | 47 +- .../google/devtools/cloudtrace/v1/Traces.java | 44 +- .../cloudtrace/v2/AttributeValue.java | 44 +- .../cloudtrace/v2/BatchWriteSpansRequest.java | 44 +- .../google/devtools/cloudtrace/v2/Module.java | 44 +- .../google/devtools/cloudtrace/v2/Span.java | 357 +---- .../devtools/cloudtrace/v2/StackTrace.java | 132 +- .../devtools/cloudtrace/v2/TraceProto.java | 16 +- .../devtools/cloudtrace/v2/TracingProto.java | 2 +- .../cloudtrace/v2/TruncatableString.java | 44 +- .../v1/AnnotateVideoProgress.java | 44 +- .../v1/AnnotateVideoRequest.java | 45 +- .../v1/AnnotateVideoResponse.java | 44 +- .../cloud/videointelligence/v1/Entity.java | 44 +- .../v1/ExplicitContentAnnotation.java | 44 +- .../v1/ExplicitContentDetectionConfig.java | 42 +- .../v1/ExplicitContentFrame.java | 46 +- .../videointelligence/v1/FaceAnnotation.java | 44 +- .../v1/FaceDetectionConfig.java | 44 +- .../cloud/videointelligence/v1/FaceFrame.java | 44 +- .../videointelligence/v1/FaceSegment.java | 44 +- .../videointelligence/v1/LabelAnnotation.java | 44 +- .../v1/LabelDetectionConfig.java | 46 +- .../videointelligence/v1/LabelFrame.java | 44 +- .../videointelligence/v1/LabelSegment.java | 44 +- .../v1/NormalizedBoundingBox.java | 44 +- .../v1/ShotChangeDetectionConfig.java | 42 +- .../v1/VideoAnnotationProgress.java | 44 +- .../v1/VideoAnnotationResults.java | 44 +- .../videointelligence/v1/VideoContext.java | 44 +- .../v1/VideoIntelligenceServiceProto.java | 22 +- .../videointelligence/v1/VideoSegment.java | 44 +- .../v1beta1/AnnotateVideoProgress.java | 44 +- .../v1beta1/AnnotateVideoRequest.java | 45 +- .../v1beta1/AnnotateVideoResponse.java | 44 +- .../v1beta1/BoundingBox.java | 44 +- .../v1beta1/FaceAnnotation.java | 44 +- .../v1beta1/FaceLocation.java | 44 +- .../v1beta1/LabelAnnotation.java | 44 +- .../v1beta1/LabelLocation.java | 46 +- .../v1beta1/SafeSearchAnnotation.java | 54 +- .../v1beta1/VideoAnnotationProgress.java | 44 +- .../v1beta1/VideoAnnotationResults.java | 44 +- .../v1beta1/VideoContext.java | 46 +- .../VideoIntelligenceServiceProto.java | 18 +- .../v1beta1/VideoSegment.java | 44 +- .../v1beta2/AnnotateVideoProgress.java | 44 +- .../v1beta2/AnnotateVideoRequest.java | 45 +- .../v1beta2/AnnotateVideoResponse.java | 44 +- .../videointelligence/v1beta2/Entity.java | 44 +- .../v1beta2/ExplicitContentAnnotation.java | 44 +- .../ExplicitContentDetectionConfig.java | 42 +- .../v1beta2/ExplicitContentFrame.java | 46 +- .../v1beta2/FaceAnnotation.java | 44 +- .../v1beta2/FaceDetectionConfig.java | 44 +- .../videointelligence/v1beta2/FaceFrame.java | 44 +- .../v1beta2/FaceSegment.java | 44 +- .../v1beta2/LabelAnnotation.java | 44 +- .../v1beta2/LabelDetectionConfig.java | 46 +- .../videointelligence/v1beta2/LabelFrame.java | 44 +- .../v1beta2/LabelSegment.java | 44 +- .../v1beta2/NormalizedBoundingBox.java | 44 +- .../v1beta2/ShotChangeDetectionConfig.java | 42 +- .../v1beta2/VideoAnnotationProgress.java | 44 +- .../v1beta2/VideoAnnotationResults.java | 44 +- .../v1beta2/VideoContext.java | 44 +- .../VideoIntelligenceServiceProto.java | 22 +- .../v1beta2/VideoSegment.java | 44 +- .../v1p1beta1/AnnotateVideoProgress.java | 44 +- .../v1p1beta1/AnnotateVideoRequest.java | 45 +- .../v1p1beta1/AnnotateVideoResponse.java | 44 +- .../videointelligence/v1p1beta1/Entity.java | 44 +- .../v1p1beta1/ExplicitContentAnnotation.java | 44 +- .../ExplicitContentDetectionConfig.java | 42 +- .../v1p1beta1/ExplicitContentFrame.java | 46 +- .../v1p1beta1/LabelAnnotation.java | 44 +- .../v1p1beta1/LabelDetectionConfig.java | 46 +- .../v1p1beta1/LabelFrame.java | 44 +- .../v1p1beta1/LabelSegment.java | 44 +- .../v1p1beta1/ShotChangeDetectionConfig.java | 42 +- .../v1p1beta1/SpeechContext.java | 44 +- .../SpeechRecognitionAlternative.java | 44 +- .../v1p1beta1/SpeechTranscription.java | 44 +- .../v1p1beta1/SpeechTranscriptionConfig.java | 44 +- .../v1p1beta1/VideoAnnotationProgress.java | 44 +- .../v1p1beta1/VideoAnnotationResults.java | 44 +- .../v1p1beta1/VideoContext.java | 44 +- .../VideoIntelligenceServiceProto.java | 22 +- .../v1p1beta1/VideoSegment.java | 44 +- .../videointelligence/v1p1beta1/WordInfo.java | 44 +- .../cloud/vision/v1/AnnotateFileResponse.java | 44 +- .../cloud/vision/v1/AnnotateImageRequest.java | 44 +- .../vision/v1/AnnotateImageResponse.java | 44 +- .../vision/v1/AsyncAnnotateFileRequest.java | 44 +- .../vision/v1/AsyncAnnotateFileResponse.java | 44 +- .../v1/AsyncBatchAnnotateFilesRequest.java | 44 +- .../v1/AsyncBatchAnnotateFilesResponse.java | 44 +- .../vision/v1/BatchAnnotateImagesRequest.java | 44 +- .../v1/BatchAnnotateImagesResponse.java | 44 +- .../com/google/cloud/vision/v1/Block.java | 46 +- .../google/cloud/vision/v1/BoundingPoly.java | 44 +- .../com/google/cloud/vision/v1/ColorInfo.java | 44 +- .../com/google/cloud/vision/v1/CropHint.java | 44 +- .../cloud/vision/v1/CropHintsAnnotation.java | 44 +- .../cloud/vision/v1/CropHintsParams.java | 44 +- .../vision/v1/DominantColorsAnnotation.java | 44 +- .../cloud/vision/v1/EntityAnnotation.java | 44 +- .../cloud/vision/v1/FaceAnnotation.java | 104 +- .../com/google/cloud/vision/v1/Feature.java | 46 +- .../cloud/vision/v1/GcsDestination.java | 42 +- .../com/google/cloud/vision/v1/GcsSource.java | 42 +- .../google/cloud/vision/v1/GeometryProto.java | 2 +- .../com/google/cloud/vision/v1/Image.java | 44 +- .../vision/v1/ImageAnnotationContext.java | 44 +- .../cloud/vision/v1/ImageAnnotatorProto.java | 36 +- .../google/cloud/vision/v1/ImageContext.java | 44 +- .../cloud/vision/v1/ImageProperties.java | 44 +- .../google/cloud/vision/v1/ImageSource.java | 44 +- .../google/cloud/vision/v1/InputConfig.java | 44 +- .../google/cloud/vision/v1/LatLongRect.java | 44 +- .../vision/v1/LocalizedObjectAnnotation.java | 44 +- .../google/cloud/vision/v1/LocationInfo.java | 44 +- .../cloud/vision/v1/NormalizedVertex.java | 44 +- .../cloud/vision/v1/OperationMetadata.java | 46 +- .../google/cloud/vision/v1/OutputConfig.java | 44 +- .../java/com/google/cloud/vision/v1/Page.java | 44 +- .../com/google/cloud/vision/v1/Paragraph.java | 44 +- .../com/google/cloud/vision/v1/Position.java | 44 +- .../com/google/cloud/vision/v1/Property.java | 44 +- .../cloud/vision/v1/SafeSearchAnnotation.java | 54 +- .../com/google/cloud/vision/v1/Symbol.java | 44 +- .../cloud/vision/v1/TextAnnotation.java | 178 +-- .../cloud/vision/v1/TextAnnotationProto.java | 8 +- .../com/google/cloud/vision/v1/Vertex.java | 44 +- .../google/cloud/vision/v1/WebDetection.java | 220 +-- .../cloud/vision/v1/WebDetectionParams.java | 40 +- .../cloud/vision/v1/WebDetectionProto.java | 4 +- .../java/com/google/cloud/vision/v1/Word.java | 44 +- .../v1p1beta1/AnnotateImageRequest.java | 44 +- .../v1p1beta1/AnnotateImageResponse.java | 44 +- .../v1p1beta1/BatchAnnotateImagesRequest.java | 44 +- .../BatchAnnotateImagesResponse.java | 44 +- .../google/cloud/vision/v1p1beta1/Block.java | 46 +- .../cloud/vision/v1p1beta1/BoundingPoly.java | 44 +- .../cloud/vision/v1p1beta1/ColorInfo.java | 44 +- .../cloud/vision/v1p1beta1/CropHint.java | 44 +- .../vision/v1p1beta1/CropHintsAnnotation.java | 44 +- .../vision/v1p1beta1/CropHintsParams.java | 44 +- .../v1p1beta1/DominantColorsAnnotation.java | 44 +- .../vision/v1p1beta1/EntityAnnotation.java | 44 +- .../vision/v1p1beta1/FaceAnnotation.java | 104 +- .../cloud/vision/v1p1beta1/Feature.java | 46 +- .../google/cloud/vision/v1p1beta1/Image.java | 44 +- .../vision/v1p1beta1/ImageAnnotatorProto.java | 30 +- .../cloud/vision/v1p1beta1/ImageContext.java | 44 +- .../vision/v1p1beta1/ImageProperties.java | 44 +- .../cloud/vision/v1p1beta1/ImageSource.java | 44 +- .../cloud/vision/v1p1beta1/LatLongRect.java | 44 +- .../cloud/vision/v1p1beta1/LocationInfo.java | 44 +- .../google/cloud/vision/v1p1beta1/Page.java | 44 +- .../cloud/vision/v1p1beta1/Paragraph.java | 44 +- .../cloud/vision/v1p1beta1/Position.java | 44 +- .../cloud/vision/v1p1beta1/Property.java | 44 +- .../v1p1beta1/SafeSearchAnnotation.java | 54 +- .../google/cloud/vision/v1p1beta1/Symbol.java | 44 +- .../vision/v1p1beta1/TextAnnotation.java | 178 +-- .../vision/v1p1beta1/TextAnnotationProto.java | 10 +- .../google/cloud/vision/v1p1beta1/Vertex.java | 44 +- .../cloud/vision/v1p1beta1/WebDetection.java | 220 +-- .../vision/v1p1beta1/WebDetectionParams.java | 40 +- .../vision/v1p1beta1/WebDetectionProto.java | 4 +- .../google/cloud/vision/v1p1beta1/Word.java | 44 +- .../v1p2beta1/AnnotateFileResponse.java | 44 +- .../v1p2beta1/AnnotateImageRequest.java | 44 +- .../v1p2beta1/AnnotateImageResponse.java | 44 +- .../v1p2beta1/AsyncAnnotateFileRequest.java | 44 +- .../v1p2beta1/AsyncAnnotateFileResponse.java | 44 +- .../AsyncBatchAnnotateFilesRequest.java | 44 +- .../AsyncBatchAnnotateFilesResponse.java | 44 +- .../v1p2beta1/BatchAnnotateImagesRequest.java | 44 +- .../BatchAnnotateImagesResponse.java | 44 +- .../google/cloud/vision/v1p2beta1/Block.java | 46 +- .../cloud/vision/v1p2beta1/BoundingPoly.java | 44 +- .../cloud/vision/v1p2beta1/ColorInfo.java | 44 +- .../cloud/vision/v1p2beta1/CropHint.java | 44 +- .../vision/v1p2beta1/CropHintsAnnotation.java | 44 +- .../vision/v1p2beta1/CropHintsParams.java | 44 +- .../v1p2beta1/DominantColorsAnnotation.java | 44 +- .../vision/v1p2beta1/EntityAnnotation.java | 44 +- .../vision/v1p2beta1/FaceAnnotation.java | 104 +- .../cloud/vision/v1p2beta1/Feature.java | 46 +- .../vision/v1p2beta1/GcsDestination.java | 42 +- .../cloud/vision/v1p2beta1/GcsSource.java | 42 +- .../cloud/vision/v1p2beta1/GeometryProto.java | 2 +- .../google/cloud/vision/v1p2beta1/Image.java | 44 +- .../v1p2beta1/ImageAnnotationContext.java | 44 +- .../vision/v1p2beta1/ImageAnnotatorProto.java | 38 +- .../cloud/vision/v1p2beta1/ImageContext.java | 44 +- .../vision/v1p2beta1/ImageProperties.java | 44 +- .../cloud/vision/v1p2beta1/ImageSource.java | 44 +- .../cloud/vision/v1p2beta1/InputConfig.java | 44 +- .../cloud/vision/v1p2beta1/LatLongRect.java | 44 +- .../cloud/vision/v1p2beta1/LocationInfo.java | 44 +- .../vision/v1p2beta1/NormalizedVertex.java | 44 +- .../vision/v1p2beta1/OperationMetadata.java | 46 +- .../cloud/vision/v1p2beta1/OutputConfig.java | 44 +- .../google/cloud/vision/v1p2beta1/Page.java | 44 +- .../cloud/vision/v1p2beta1/Paragraph.java | 44 +- .../cloud/vision/v1p2beta1/Position.java | 44 +- .../cloud/vision/v1p2beta1/Property.java | 44 +- .../v1p2beta1/SafeSearchAnnotation.java | 54 +- .../google/cloud/vision/v1p2beta1/Symbol.java | 44 +- .../vision/v1p2beta1/TextAnnotation.java | 178 +-- .../vision/v1p2beta1/TextAnnotationProto.java | 10 +- .../google/cloud/vision/v1p2beta1/Vertex.java | 44 +- .../cloud/vision/v1p2beta1/WebDetection.java | 220 +-- .../vision/v1p2beta1/WebDetectionParams.java | 40 +- .../vision/v1p2beta1/WebDetectionProto.java | 4 +- .../google/cloud/vision/v1p2beta1/Word.java | 44 +- .../AddProductToProductSetRequest.java | 44 +- .../v1p3beta1/AnnotateFileResponse.java | 44 +- .../v1p3beta1/AnnotateImageRequest.java | 44 +- .../v1p3beta1/AnnotateImageResponse.java | 44 +- .../v1p3beta1/AsyncAnnotateFileRequest.java | 44 +- .../v1p3beta1/AsyncAnnotateFileResponse.java | 44 +- .../AsyncBatchAnnotateFilesRequest.java | 44 +- .../AsyncBatchAnnotateFilesResponse.java | 44 +- .../v1p3beta1/BatchAnnotateImagesRequest.java | 44 +- .../BatchAnnotateImagesResponse.java | 44 +- .../v1p3beta1/BatchOperationMetadata.java | 46 +- .../google/cloud/vision/v1p3beta1/Block.java | 46 +- .../cloud/vision/v1p3beta1/BoundingPoly.java | 44 +- .../cloud/vision/v1p3beta1/ColorInfo.java | 44 +- .../v1p3beta1/CreateProductRequest.java | 44 +- .../v1p3beta1/CreateProductSetRequest.java | 44 +- .../CreateReferenceImageRequest.java | 44 +- .../cloud/vision/v1p3beta1/CropHint.java | 44 +- .../vision/v1p3beta1/CropHintsAnnotation.java | 44 +- .../vision/v1p3beta1/CropHintsParams.java | 44 +- .../v1p3beta1/DeleteProductRequest.java | 42 +- .../v1p3beta1/DeleteProductSetRequest.java | 42 +- .../DeleteReferenceImageRequest.java | 42 +- .../v1p3beta1/DominantColorsAnnotation.java | 44 +- .../vision/v1p3beta1/EntityAnnotation.java | 44 +- .../vision/v1p3beta1/FaceAnnotation.java | 104 +- .../cloud/vision/v1p3beta1/Feature.java | 46 +- .../vision/v1p3beta1/GcsDestination.java | 42 +- .../cloud/vision/v1p3beta1/GcsSource.java | 42 +- .../cloud/vision/v1p3beta1/GeometryProto.java | 2 +- .../vision/v1p3beta1/GetProductRequest.java | 42 +- .../v1p3beta1/GetProductSetRequest.java | 42 +- .../v1p3beta1/GetReferenceImageRequest.java | 42 +- .../google/cloud/vision/v1p3beta1/Image.java | 44 +- .../v1p3beta1/ImageAnnotationContext.java | 44 +- .../vision/v1p3beta1/ImageAnnotatorProto.java | 40 +- .../cloud/vision/v1p3beta1/ImageContext.java | 44 +- .../vision/v1p3beta1/ImageProperties.java | 44 +- .../cloud/vision/v1p3beta1/ImageSource.java | 44 +- .../v1p3beta1/ImportProductSetsGcsSource.java | 42 +- .../ImportProductSetsInputConfig.java | 44 +- .../v1p3beta1/ImportProductSetsRequest.java | 44 +- .../v1p3beta1/ImportProductSetsResponse.java | 44 +- .../cloud/vision/v1p3beta1/InputConfig.java | 44 +- .../cloud/vision/v1p3beta1/LatLongRect.java | 44 +- .../v1p3beta1/ListProductSetsRequest.java | 44 +- .../v1p3beta1/ListProductSetsResponse.java | 44 +- .../ListProductsInProductSetRequest.java | 44 +- .../ListProductsInProductSetResponse.java | 44 +- .../vision/v1p3beta1/ListProductsRequest.java | 44 +- .../v1p3beta1/ListProductsResponse.java | 44 +- .../v1p3beta1/ListReferenceImagesRequest.java | 44 +- .../ListReferenceImagesResponse.java | 44 +- .../v1p3beta1/LocalizedObjectAnnotation.java | 44 +- .../cloud/vision/v1p3beta1/LocationInfo.java | 44 +- .../v1p3beta1/NormalizedBoundingPoly.java | 44 +- .../vision/v1p3beta1/NormalizedVertex.java | 44 +- .../vision/v1p3beta1/OperationMetadata.java | 46 +- .../cloud/vision/v1p3beta1/OutputConfig.java | 44 +- .../google/cloud/vision/v1p3beta1/Page.java | 44 +- .../cloud/vision/v1p3beta1/Paragraph.java | 44 +- .../cloud/vision/v1p3beta1/Position.java | 44 +- .../cloud/vision/v1p3beta1/Product.java | 88 +- .../vision/v1p3beta1/ProductSearchParams.java | 48 +- .../vision/v1p3beta1/ProductSearchProto.java | 6 +- .../v1p3beta1/ProductSearchResults.java | 134 +- .../v1p3beta1/ProductSearchServiceProto.java | 34 +- .../cloud/vision/v1p3beta1/ProductSet.java | 44 +- .../cloud/vision/v1p3beta1/Property.java | 44 +- .../vision/v1p3beta1/ReferenceImage.java | 44 +- .../RemoveProductFromProductSetRequest.java | 44 +- .../v1p3beta1/SafeSearchAnnotation.java | 54 +- .../google/cloud/vision/v1p3beta1/Symbol.java | 44 +- .../vision/v1p3beta1/TextAnnotation.java | 178 +-- .../vision/v1p3beta1/TextAnnotationProto.java | 10 +- .../v1p3beta1/UpdateProductRequest.java | 44 +- .../v1p3beta1/UpdateProductSetRequest.java | 44 +- .../google/cloud/vision/v1p3beta1/Vertex.java | 44 +- .../cloud/vision/v1p3beta1/WebDetection.java | 220 +-- .../vision/v1p3beta1/WebDetectionParams.java | 40 +- .../vision/v1p3beta1/WebDetectionProto.java | 4 +- .../google/cloud/vision/v1p3beta1/Word.java | 44 +- .../v1alpha/CrawledUrl.java | 44 +- .../v1alpha/CreateScanConfigRequest.java | 44 +- .../v1alpha/DeleteScanConfigRequest.java | 42 +- .../websecurityscanner/v1alpha/Finding.java | 46 +- .../v1alpha/FindingAddonProto.java | 2 +- .../v1alpha/FindingProto.java | 4 +- .../v1alpha/FindingTypeStats.java | 46 +- .../v1alpha/FindingTypeStatsProto.java | 2 +- .../v1alpha/GetFindingRequest.java | 42 +- .../v1alpha/GetScanConfigRequest.java | 42 +- .../v1alpha/GetScanRunRequest.java | 42 +- .../v1alpha/ListCrawledUrlsRequest.java | 44 +- .../v1alpha/ListCrawledUrlsResponse.java | 44 +- .../v1alpha/ListFindingTypeStatsRequest.java | 42 +- .../v1alpha/ListFindingTypeStatsResponse.java | 44 +- .../v1alpha/ListFindingsRequest.java | 44 +- .../v1alpha/ListFindingsResponse.java | 44 +- .../v1alpha/ListScanConfigsRequest.java | 44 +- .../v1alpha/ListScanConfigsResponse.java | 44 +- .../v1alpha/ListScanRunsRequest.java | 44 +- .../v1alpha/ListScanRunsResponse.java | 44 +- .../v1alpha/OutdatedLibrary.java | 44 +- .../v1alpha/ScanConfig.java | 223 +--- .../v1alpha/ScanConfigProto.java | 6 +- .../websecurityscanner/v1alpha/ScanRun.java | 48 +- .../v1alpha/ScanRunProto.java | 4 +- .../v1alpha/StartScanRunRequest.java | 42 +- .../v1alpha/StopScanRunRequest.java | 42 +- .../v1alpha/UpdateScanConfigRequest.java | 44 +- .../v1alpha/ViolatingResource.java | 44 +- .../v1alpha/VulnerableParameters.java | 44 +- .../v1alpha/WebSecurityScannerProto.java | 22 +- .../cloud/websecurityscanner/v1alpha/Xss.java | 44 +- .../asset/v1beta1/AssetServiceClient.java | 6 +- .../google/cloud/speech/v1/package-info.java | 2 +- .../v1/stub/GrpcSpeechCallableFactory.java | 2 +- .../cloud/speech/v1/stub/GrpcSpeechStub.java | 2 +- .../cloud/speech/v1/stub/SpeechStub.java | 2 +- 1628 files changed, 15883 insertions(+), 62704 deletions(-) diff --git a/google-api-grpc/grpc-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceGrpc.java b/google-api-grpc/grpc-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceGrpc.java index 7aa36353543d..c7cfc4e7ad96 100644 --- a/google-api-grpc/grpc-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceGrpc.java +++ b/google-api-grpc/grpc-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceGrpc.java @@ -138,7 +138,7 @@ public static abstract class AssetServiceImplBase implements io.grpc.BindableSer /** * 
      * Exports assets with time and resource types to a given Google Cloud Storage
-     * location. The output format is newline delimited JSON.
+     * location. The output format is newline-delimited JSON.
      * This API implements the [google.longrunning.Operation][google.longrunning.Operation] API allowing users
      * to keep track of the export.
      *
@@ -206,7 +206,7 @@ protected AssetServiceStub build(io.grpc.Channel channel, /** * 
      * Exports assets with time and resource types to a given Google Cloud Storage
-     * location. The output format is newline delimited JSON.
+     * location. The output format is newline-delimited JSON.
      * This API implements the [google.longrunning.Operation][google.longrunning.Operation] API allowing users
      * to keep track of the export.
      *
@@ -257,7 +257,7 @@ protected AssetServiceBlockingStub build(io.grpc.Channel channel, /** * 
      * Exports assets with time and resource types to a given Google Cloud Storage
-     * location. The output format is newline delimited JSON.
+     * location. The output format is newline-delimited JSON.
      * This API implements the [google.longrunning.Operation][google.longrunning.Operation] API allowing users
      * to keep track of the export.
      *
@@ -306,7 +306,7 @@ protected AssetServiceFutureStub build(io.grpc.Channel channel, /** * 
      * Exports assets with time and resource types to a given Google Cloud Storage
-     * location. The output format is newline delimited JSON.
+     * location. The output format is newline-delimited JSON.
      * This API implements the [google.longrunning.Operation][google.longrunning.Operation] API allowing users
      * to keep track of the export.
      *
diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/Asset.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/Asset.java index 187869b9274f..332ce56b2abd 100644 --- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/Asset.java +++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/Asset.java @@ -35,9 +35,6 @@ private Asset( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -49,6 +46,13 @@ private Asset( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { java.lang.String s = input.readStringRequireUtf8(); @@ -87,13 +91,6 @@ private Asset( break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -111,7 +108,6 @@ private Asset( return com.google.cloud.asset.v1beta1.AssetProto.internal_static_google_cloud_asset_v1beta1_Asset_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.cloud.asset.v1beta1.AssetProto.internal_static_google_cloud_asset_v1beta1_Asset_fieldAccessorTable @@ -279,7 +275,6 @@ public com.google.iam.v1.PolicyOrBuilder getIamPolicyOrBuilder() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -289,7 +284,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getNameBytes().isEmpty()) { @@ -307,7 +301,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -455,7 +448,6 @@ public static com.google.cloud.asset.v1beta1.Asset parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -463,7 +455,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.cloud.asset.v1beta1.Asset prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -492,7 +483,6 @@ public static final class Builder extends return com.google.cloud.asset.v1beta1.AssetProto.internal_static_google_cloud_asset_v1beta1_Asset_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.cloud.asset.v1beta1.AssetProto.internal_static_google_cloud_asset_v1beta1_Asset_fieldAccessorTable @@ -515,7 +505,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); name_ = ""; @@ -537,18 +526,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.cloud.asset.v1beta1.AssetProto.internal_static_google_cloud_asset_v1beta1_Asset_descriptor; } - @java.lang.Override public com.google.cloud.asset.v1beta1.Asset getDefaultInstanceForType() { return com.google.cloud.asset.v1beta1.Asset.getDefaultInstance(); } - @java.lang.Override public com.google.cloud.asset.v1beta1.Asset build() { com.google.cloud.asset.v1beta1.Asset result = buildPartial(); if (!result.isInitialized()) { @@ -557,7 +543,6 @@ public com.google.cloud.asset.v1beta1.Asset build() { return result; } - @java.lang.Override public com.google.cloud.asset.v1beta1.Asset buildPartial() { com.google.cloud.asset.v1beta1.Asset result = new com.google.cloud.asset.v1beta1.Asset(this); result.name_ = name_; @@ -576,39 +561,32 @@ public com.google.cloud.asset.v1beta1.Asset buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.cloud.asset.v1beta1.Asset) { return mergeFrom((com.google.cloud.asset.v1beta1.Asset)other); @@ -639,12 +617,10 @@ public Builder mergeFrom(com.google.cloud.asset.v1beta1.Asset other) { return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -1170,13 +1146,11 @@ public com.google.iam.v1.PolicyOrBuilder getIamPolicyOrBuilder() { } return iamPolicyBuilder_; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1198,12 +1172,11 @@ public static com.google.cloud.asset.v1beta1.Asset getDefaultInstance() { private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public Asset parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new Asset(input, extensionRegistry); + return new Asset(input, extensionRegistry); } }; @@ -1216,7 +1189,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.cloud.asset.v1beta1.Asset getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetProto.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetProto.java index cb216ad144aa..16f43e531d19 100644 --- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetProto.java +++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetProto.java @@ -52,7 +52,7 @@ public static void registerAllExtensions( "indow\030\001 \001(\0132&.google.cloud.asset.v1beta1" + ".TimeWindow\022\017\n\007deleted\030\002 \001(\010\0220\n\005asset\030\003 " + "\001(\0132!.google.cloud.asset.v1beta1.Asset\"j" + - "\n\nTimeWindow\022.\n\nstart_time\030\001 \001(\0132\032.googl" + + "\n\nTimeWindow\022.\n\nstart_time\030\001 \001(\0132\032.googl", "e.protobuf.Timestamp\022,\n\010end_time\030\002 \001(\0132\032" + ".google.protobuf.Timestamp\"\214\001\n\005Asset\022\014\n\004" + "name\030\001 \001(\t\022\022\n\nasset_type\030\002 \001(\t\0226\n\010resour" + @@ -62,7 +62,7 @@ public static void registerAllExtensions( "\036\n\026discovery_document_uri\030\002 \001(\t\022\026\n\016disco" + "very_name\030\003 \001(\t\022\024\n\014resource_url\030\004 \001(\t\022\016\n" + "\006parent\030\005 \001(\t\022%\n\004data\030\006 \001(\0132\027.google.pro" + - "tobuf.StructB\251\001\n\036com.google.cloud.asset." + + "tobuf.StructB\251\001\n\036com.google.cloud.asset.", "v1beta1B\nAssetProtoP\001Z?google.golang.org" + "/genproto/googleapis/cloud/asset/v1beta1" + ";asset\252\002\032Google.Cloud.Asset.V1Beta1\312\002\032Go" + diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceProto.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceProto.java index 7b64b92eb3d8..50fd80fcc7c0 100644 --- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceProto.java +++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceProto.java @@ -58,45 +58,45 @@ public static void registerAllExtensions( "ogle/api/annotations.proto\032\'google/cloud" + "/asset/v1beta1/assets.proto\032#google/long" + "running/operations.proto\032\037google/protobu" + - "f/timestamp.proto\"\352\001\n\023ExportAssetsReques" + + "f/timestamp.proto\"\351\001\n\023ExportAssetsReques" + "t\022\016\n\006parent\030\001 \001(\t\022-\n\tread_time\030\002 \001(\0132\032.g" + "oogle.protobuf.Timestamp\022\023\n\013asset_types\030" + - "\003 \003(\t\022>\n\rcontent_types\030\004 \003(\0162\'.google.cl" + - "oud.asset.v1beta1.ContentType\022?\n\routput_" + - "config\030\005 \001(\0132(.google.cloud.asset.v1beta" + - "1.OutputConfig\"\206\001\n\024ExportAssetsResponse\022" + - "-\n\tread_time\030\001 \001(\0132\032.google.protobuf.Tim" + - "estamp\022?\n\routput_config\030\002 \001(\0132(.google.c" + - "loud.asset.v1beta1.OutputConfig\"\304\001\n\034Batc" + - "hGetAssetsHistoryRequest\022\016\n\006parent\030\001 \001(\t" + - "\022\023\n\013asset_names\030\002 \003(\t\022=\n\014content_type\030\003 " + - "\001(\0162\'.google.cloud.asset.v1beta1.Content" + - "Type\022@\n\020read_time_window\030\004 \001(\0132&.google." + - "cloud.asset.v1beta1.TimeWindow\"Z\n\035BatchG" + - "etAssetsHistoryResponse\0229\n\006assets\030\001 \003(\0132" + - ").google.cloud.asset.v1beta1.TemporalAss" + - "et\"d\n\014OutputConfig\022E\n\017gcs_destination\030\001 " + - "\001(\0132*.google.cloud.asset.v1beta1.GcsDest" + - "inationH\000B\r\n\013destination\"\035\n\016GcsDestinati" + - "on\022\013\n\003uri\030\001 \001(\t*I\n\013ContentType\022\034\n\030CONTEN" + - "T_TYPE_UNSPECIFIED\020\000\022\014\n\010RESOURCE\020\001\022\016\n\nIA" + - "M_POLICY\020\0022\337\003\n\014AssetService\022\311\001\n\014ExportAs" + - "sets\022/.google.cloud.asset.v1beta1.Export" + - "AssetsRequest\032\035.google.longrunning.Opera" + - "tion\"i\202\323\344\223\002c\")/v1beta1/{parent=projects/" + - "*}:exportAssets:\001*Z3\"./v1beta1/{parent=o" + - "rganizations/*}:exportAssets:\001*\022\202\002\n\025Batc" + - "hGetAssetsHistory\0228.google.cloud.asset.v" + - "1beta1.BatchGetAssetsHistoryRequest\0329.go" + - "ogle.cloud.asset.v1beta1.BatchGetAssetsH" + - "istoryResponse\"t\202\323\344\223\002n\0222/v1beta1/{parent" + - "=projects/*}:batchGetAssetsHistoryZ8\0226/v" + - "1beta1/{parent=organizations/*}:batchGet" + - "AssetHistoryB\260\001\n\036com.google.cloud.asset." + - "v1beta1B\021AssetServiceProtoP\001Z?google.gol" + - "ang.org/genproto/googleapis/cloud/asset/" + - "v1beta1;asset\252\002\032Google.Cloud.Asset.V1Bet" + - "a1\312\002\032Google\\Cloud\\Asset\\V1beta1b\006proto3" + "\003 \003(\t\022=\n\014content_type\030\004 \001(\0162\'.google.clo" + + "ud.asset.v1beta1.ContentType\022?\n\routput_c", + "onfig\030\005 \001(\0132(.google.cloud.asset.v1beta1" + + ".OutputConfig\"\206\001\n\024ExportAssetsResponse\022-" + + "\n\tread_time\030\001 \001(\0132\032.google.protobuf.Time" + + "stamp\022?\n\routput_config\030\002 \001(\0132(.google.cl" + + "oud.asset.v1beta1.OutputConfig\"\304\001\n\034Batch" + + "GetAssetsHistoryRequest\022\016\n\006parent\030\001 \001(\t\022" + + "\023\n\013asset_names\030\002 \003(\t\022=\n\014content_type\030\003 \001" + + "(\0162\'.google.cloud.asset.v1beta1.ContentT" + + "ype\022@\n\020read_time_window\030\004 \001(\0132&.google.c" + + "loud.asset.v1beta1.TimeWindow\"Z\n\035BatchGe", + "tAssetsHistoryResponse\0229\n\006assets\030\001 \003(\0132)" + + ".google.cloud.asset.v1beta1.TemporalAsse" + + "t\"d\n\014OutputConfig\022E\n\017gcs_destination\030\001 \001" + + "(\0132*.google.cloud.asset.v1beta1.GcsDesti" + + "nationH\000B\r\n\013destination\"\035\n\016GcsDestinatio" + + "n\022\013\n\003uri\030\001 \001(\t*I\n\013ContentType\022\034\n\030CONTENT" + + "_TYPE_UNSPECIFIED\020\000\022\014\n\010RESOURCE\020\001\022\016\n\nIAM" + + "_POLICY\020\0022\337\003\n\014AssetService\022\311\001\n\014ExportAss" + + "ets\022/.google.cloud.asset.v1beta1.ExportA" + + "ssetsRequest\032\035.google.longrunning.Operat", + "ion\"i\202\323\344\223\002c\")/v1beta1/{parent=projects/*" + + "}:exportAssets:\001*Z3\"./v1beta1/{parent=or" + + "ganizations/*}:exportAssets:\001*\022\202\002\n\025Batch" + + "GetAssetsHistory\0228.google.cloud.asset.v1" + + "beta1.BatchGetAssetsHistoryRequest\0329.goo" + + "gle.cloud.asset.v1beta1.BatchGetAssetsHi" + + "storyResponse\"t\202\323\344\223\002n\0222/v1beta1/{parent=" + + "projects/*}:batchGetAssetsHistoryZ8\0226/v1" + + "beta1/{parent=organizations/*}:batchGetA" + + "ssetHistoryB\260\001\n\036com.google.cloud.asset.v", + "1beta1B\021AssetServiceProtoP\001Z?google.gola" + + "ng.org/genproto/googleapis/cloud/asset/v" + + "1beta1;asset\252\002\032Google.Cloud.Asset.V1Beta" + + "1\312\002\032Google\\Cloud\\Asset\\V1beta1b\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -119,7 +119,7 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( internal_static_google_cloud_asset_v1beta1_ExportAssetsRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_cloud_asset_v1beta1_ExportAssetsRequest_descriptor, - new java.lang.String[] { "Parent", "ReadTime", "AssetTypes", "ContentTypes", "OutputConfig", }); + new java.lang.String[] { "Parent", "ReadTime", "AssetTypes", "ContentType", "OutputConfig", }); internal_static_google_cloud_asset_v1beta1_ExportAssetsResponse_descriptor = getDescriptor().getMessageTypes().get(1); internal_static_google_cloud_asset_v1beta1_ExportAssetsResponse_fieldAccessorTable = new diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryRequest.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryRequest.java index 489816adf014..0a4fc9c17d3b 100644 --- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryRequest.java +++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryRequest.java @@ -35,9 +35,6 @@ private BatchGetAssetsHistoryRequest( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -49,6 +46,13 @@ private BatchGetAssetsHistoryRequest( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { java.lang.String s = input.readStringRequireUtf8(); @@ -83,13 +87,6 @@ private BatchGetAssetsHistoryRequest( break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -110,7 +107,6 @@ private BatchGetAssetsHistoryRequest( return com.google.cloud.asset.v1beta1.AssetServiceProto.internal_static_google_cloud_asset_v1beta1_BatchGetAssetsHistoryRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.cloud.asset.v1beta1.AssetServiceProto.internal_static_google_cloud_asset_v1beta1_BatchGetAssetsHistoryRequest_fieldAccessorTable @@ -124,8 +120,8 @@ private BatchGetAssetsHistoryRequest( /** * 
    * Required. The relative name of the root asset. It can only be an
-   * organization ID (e.g. "organizations/123") or a project ID
-   * (e.g. "projects/12345").
+   * organization number (such as "organizations/123"), or a project id (such as
+   * "projects/my-project-id")"or a project number (such as "projects/12345").
    *
* * string parent = 1; @@ -145,8 +141,8 @@ public java.lang.String getParent() { /** * 
    * Required. The relative name of the root asset. It can only be an
-   * organization ID (e.g. "organizations/123") or a project ID
-   * (e.g. "projects/12345").
+   * organization number (such as "organizations/123"), or a project id (such as
+   * "projects/my-project-id")"or a project number (such as "projects/12345").
    *
* * string parent = 1; @@ -173,7 +169,8 @@ public java.lang.String getParent() { * https://cloud.google.com/apis/design/resource_names#full_resource_name * Example: * "//compute.googleapis.com/projects/my_project_123/zones/zone1/instances/instance1". - * The request becomes a no-op if the asset name list is empty. + * The request becomes a no-op if the asset name list is empty, and the max + * size of the asset name list is 100 in one request. * * * repeated string asset_names = 2; @@ -188,7 +185,8 @@ public java.lang.String getParent() { * https://cloud.google.com/apis/design/resource_names#full_resource_name * Example: * "//compute.googleapis.com/projects/my_project_123/zones/zone1/instances/instance1". - * The request becomes a no-op if the asset name list is empty. + * The request becomes a no-op if the asset name list is empty, and the max + * size of the asset name list is 100 in one request. * * * repeated string asset_names = 2; @@ -202,7 +200,8 @@ public int getAssetNamesCount() { * https://cloud.google.com/apis/design/resource_names#full_resource_name * Example: * "//compute.googleapis.com/projects/my_project_123/zones/zone1/instances/instance1". - * The request becomes a no-op if the asset name list is empty. + * The request becomes a no-op if the asset name list is empty, and the max + * size of the asset name list is 100 in one request. * * * repeated string asset_names = 2; @@ -216,7 +215,8 @@ public java.lang.String getAssetNames(int index) { * https://cloud.google.com/apis/design/resource_names#full_resource_name * Example: * "//compute.googleapis.com/projects/my_project_123/zones/zone1/instances/instance1". - * The request becomes a no-op if the asset name list is empty. + * The request becomes a no-op if the asset name list is empty, and the max + * size of the asset name list is 100 in one request. * * * repeated string asset_names = 2; @@ -246,7 +246,6 @@ public int getContentTypeValue() { * .google.cloud.asset.v1beta1.ContentType content_type = 3; */ public com.google.cloud.asset.v1beta1.ContentType getContentType() { - @SuppressWarnings("deprecation") com.google.cloud.asset.v1beta1.ContentType result = com.google.cloud.asset.v1beta1.ContentType.valueOf(contentType_); return result == null ? com.google.cloud.asset.v1beta1.ContentType.UNRECOGNIZED : result; } @@ -255,9 +254,9 @@ public com.google.cloud.asset.v1beta1.ContentType getContentType() { private com.google.cloud.asset.v1beta1.TimeWindow readTimeWindow_; /** * 
-   * Required. The time window for the asset history. The returned results
-   * contain all temporal assets whose time window overlap with
-   * read_time_window.
+   * Required. The time window for the asset history. The start time is
+   * required. The returned results contain all temporal assets whose time
+   * window overlap with read_time_window.
    *
* * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4; @@ -267,9 +266,9 @@ public boolean hasReadTimeWindow() { } /** * 
-   * Required. The time window for the asset history. The returned results
-   * contain all temporal assets whose time window overlap with
-   * read_time_window.
+   * Required. The time window for the asset history. The start time is
+   * required. The returned results contain all temporal assets whose time
+   * window overlap with read_time_window.
    *
* * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4; @@ -279,9 +278,9 @@ public com.google.cloud.asset.v1beta1.TimeWindow getReadTimeWindow() { } /** * 
-   * Required. The time window for the asset history. The returned results
-   * contain all temporal assets whose time window overlap with
-   * read_time_window.
+   * Required. The time window for the asset history. The start time is
+   * required. The returned results contain all temporal assets whose time
+   * window overlap with read_time_window.
    *
* * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4; @@ -291,7 +290,6 @@ public com.google.cloud.asset.v1beta1.TimeWindowOrBuilder getReadTimeWindowOrBui } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -301,7 +299,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!getParentBytes().isEmpty()) { @@ -319,7 +316,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -468,7 +464,6 @@ public static com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryRequest parseF .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -476,7 +471,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -504,7 +498,6 @@ public static final class Builder extends return com.google.cloud.asset.v1beta1.AssetServiceProto.internal_static_google_cloud_asset_v1beta1_BatchGetAssetsHistoryRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.cloud.asset.v1beta1.AssetServiceProto.internal_static_google_cloud_asset_v1beta1_BatchGetAssetsHistoryRequest_fieldAccessorTable @@ -527,7 +520,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); parent_ = ""; @@ -545,18 +537,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.cloud.asset.v1beta1.AssetServiceProto.internal_static_google_cloud_asset_v1beta1_BatchGetAssetsHistoryRequest_descriptor; } - @java.lang.Override public com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryRequest getDefaultInstanceForType() { return com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryRequest.getDefaultInstance(); } - @java.lang.Override public com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryRequest build() { com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryRequest result = buildPartial(); if (!result.isInitialized()) { @@ -565,7 +554,6 @@ public com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryRequest build() { return result; } - @java.lang.Override public com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryRequest buildPartial() { com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryRequest result = new com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryRequest(this); int from_bitField0_ = bitField0_; @@ -587,39 +575,32 @@ public com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryRequest buildPartial( return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryRequest) { return mergeFrom((com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryRequest)other); @@ -656,12 +637,10 @@ public Builder mergeFrom(com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryReq return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -685,8 +664,8 @@ public Builder mergeFrom( /** * 
      * Required. The relative name of the root asset. It can only be an
-     * organization ID (e.g. "organizations/123") or a project ID
-     * (e.g. "projects/12345").
+     * organization number (such as "organizations/123"), or a project id (such as
+     * "projects/my-project-id")"or a project number (such as "projects/12345").
      *
* * string parent = 1; @@ -706,8 +685,8 @@ public java.lang.String getParent() { /** * 
      * Required. The relative name of the root asset. It can only be an
-     * organization ID (e.g. "organizations/123") or a project ID
-     * (e.g. "projects/12345").
+     * organization number (such as "organizations/123"), or a project id (such as
+     * "projects/my-project-id")"or a project number (such as "projects/12345").
      *
* * string parent = 1; @@ -728,8 +707,8 @@ public java.lang.String getParent() { /** * 
      * Required. The relative name of the root asset. It can only be an
-     * organization ID (e.g. "organizations/123") or a project ID
-     * (e.g. "projects/12345").
+     * organization number (such as "organizations/123"), or a project id (such as
+     * "projects/my-project-id")"or a project number (such as "projects/12345").
      *
* * string parent = 1; @@ -747,8 +726,8 @@ public Builder setParent( /** * 
      * Required. The relative name of the root asset. It can only be an
-     * organization ID (e.g. "organizations/123") or a project ID
-     * (e.g. "projects/12345").
+     * organization number (such as "organizations/123"), or a project id (such as
+     * "projects/my-project-id")"or a project number (such as "projects/12345").
      *
* * string parent = 1; @@ -762,8 +741,8 @@ public Builder clearParent() { /** * 
      * Required. The relative name of the root asset. It can only be an
-     * organization ID (e.g. "organizations/123") or a project ID
-     * (e.g. "projects/12345").
+     * organization number (such as "organizations/123"), or a project id (such as
+     * "projects/my-project-id")"or a project number (such as "projects/12345").
      *
* * string parent = 1; @@ -793,7 +772,8 @@ private void ensureAssetNamesIsMutable() { * https://cloud.google.com/apis/design/resource_names#full_resource_name * Example: * "//compute.googleapis.com/projects/my_project_123/zones/zone1/instances/instance1". - * The request becomes a no-op if the asset name list is empty. + * The request becomes a no-op if the asset name list is empty, and the max + * size of the asset name list is 100 in one request. * * * repeated string asset_names = 2; @@ -808,7 +788,8 @@ private void ensureAssetNamesIsMutable() { * https://cloud.google.com/apis/design/resource_names#full_resource_name * Example: * "//compute.googleapis.com/projects/my_project_123/zones/zone1/instances/instance1". - * The request becomes a no-op if the asset name list is empty. + * The request becomes a no-op if the asset name list is empty, and the max + * size of the asset name list is 100 in one request. * * * repeated string asset_names = 2; @@ -822,7 +803,8 @@ public int getAssetNamesCount() { * https://cloud.google.com/apis/design/resource_names#full_resource_name * Example: * "//compute.googleapis.com/projects/my_project_123/zones/zone1/instances/instance1". - * The request becomes a no-op if the asset name list is empty. + * The request becomes a no-op if the asset name list is empty, and the max + * size of the asset name list is 100 in one request. * * * repeated string asset_names = 2; @@ -836,7 +818,8 @@ public java.lang.String getAssetNames(int index) { * https://cloud.google.com/apis/design/resource_names#full_resource_name * Example: * "//compute.googleapis.com/projects/my_project_123/zones/zone1/instances/instance1". - * The request becomes a no-op if the asset name list is empty. + * The request becomes a no-op if the asset name list is empty, and the max + * size of the asset name list is 100 in one request. * * * repeated string asset_names = 2; @@ -851,7 +834,8 @@ public java.lang.String getAssetNames(int index) { * https://cloud.google.com/apis/design/resource_names#full_resource_name * Example: * "//compute.googleapis.com/projects/my_project_123/zones/zone1/instances/instance1". - * The request becomes a no-op if the asset name list is empty. + * The request becomes a no-op if the asset name list is empty, and the max + * size of the asset name list is 100 in one request. * * * repeated string asset_names = 2; @@ -872,7 +856,8 @@ public Builder setAssetNames( * https://cloud.google.com/apis/design/resource_names#full_resource_name * Example: * "//compute.googleapis.com/projects/my_project_123/zones/zone1/instances/instance1". - * The request becomes a no-op if the asset name list is empty. + * The request becomes a no-op if the asset name list is empty, and the max + * size of the asset name list is 100 in one request. * * * repeated string asset_names = 2; @@ -893,7 +878,8 @@ public Builder addAssetNames( * https://cloud.google.com/apis/design/resource_names#full_resource_name * Example: * "//compute.googleapis.com/projects/my_project_123/zones/zone1/instances/instance1". - * The request becomes a no-op if the asset name list is empty. + * The request becomes a no-op if the asset name list is empty, and the max + * size of the asset name list is 100 in one request. * * * repeated string asset_names = 2; @@ -912,7 +898,8 @@ public Builder addAllAssetNames( * https://cloud.google.com/apis/design/resource_names#full_resource_name * Example: * "//compute.googleapis.com/projects/my_project_123/zones/zone1/instances/instance1". - * The request becomes a no-op if the asset name list is empty. + * The request becomes a no-op if the asset name list is empty, and the max + * size of the asset name list is 100 in one request. * * * repeated string asset_names = 2; @@ -929,7 +916,8 @@ public Builder clearAssetNames() { * https://cloud.google.com/apis/design/resource_names#full_resource_name * Example: * "//compute.googleapis.com/projects/my_project_123/zones/zone1/instances/instance1". - * The request becomes a no-op if the asset name list is empty. + * The request becomes a no-op if the asset name list is empty, and the max + * size of the asset name list is 100 in one request. * * * repeated string asset_names = 2; @@ -977,7 +965,6 @@ public Builder setContentTypeValue(int value) { * .google.cloud.asset.v1beta1.ContentType content_type = 3; */ public com.google.cloud.asset.v1beta1.ContentType getContentType() { - @SuppressWarnings("deprecation") com.google.cloud.asset.v1beta1.ContentType result = com.google.cloud.asset.v1beta1.ContentType.valueOf(contentType_); return result == null ? com.google.cloud.asset.v1beta1.ContentType.UNRECOGNIZED : result; } @@ -1016,9 +1003,9 @@ public Builder clearContentType() { com.google.cloud.asset.v1beta1.TimeWindow, com.google.cloud.asset.v1beta1.TimeWindow.Builder, com.google.cloud.asset.v1beta1.TimeWindowOrBuilder> readTimeWindowBuilder_; /** * 
-     * Required. The time window for the asset history. The returned results
-     * contain all temporal assets whose time window overlap with
-     * read_time_window.
+     * Required. The time window for the asset history. The start time is
+     * required. The returned results contain all temporal assets whose time
+     * window overlap with read_time_window.
      *
* * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4; @@ -1028,9 +1015,9 @@ public boolean hasReadTimeWindow() { } /** * 
-     * Required. The time window for the asset history. The returned results
-     * contain all temporal assets whose time window overlap with
-     * read_time_window.
+     * Required. The time window for the asset history. The start time is
+     * required. The returned results contain all temporal assets whose time
+     * window overlap with read_time_window.
      *
* * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4; @@ -1044,9 +1031,9 @@ public com.google.cloud.asset.v1beta1.TimeWindow getReadTimeWindow() { } /** * 
-     * Required. The time window for the asset history. The returned results
-     * contain all temporal assets whose time window overlap with
-     * read_time_window.
+     * Required. The time window for the asset history. The start time is
+     * required. The returned results contain all temporal assets whose time
+     * window overlap with read_time_window.
      *
* * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4; @@ -1066,9 +1053,9 @@ public Builder setReadTimeWindow(com.google.cloud.asset.v1beta1.TimeWindow value } /** * 
-     * Required. The time window for the asset history. The returned results
-     * contain all temporal assets whose time window overlap with
-     * read_time_window.
+     * Required. The time window for the asset history. The start time is
+     * required. The returned results contain all temporal assets whose time
+     * window overlap with read_time_window.
      *
* * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4; @@ -1086,9 +1073,9 @@ public Builder setReadTimeWindow( } /** * 
-     * Required. The time window for the asset history. The returned results
-     * contain all temporal assets whose time window overlap with
-     * read_time_window.
+     * Required. The time window for the asset history. The start time is
+     * required. The returned results contain all temporal assets whose time
+     * window overlap with read_time_window.
      *
* * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4; @@ -1110,9 +1097,9 @@ public Builder mergeReadTimeWindow(com.google.cloud.asset.v1beta1.TimeWindow val } /** * 
-     * Required. The time window for the asset history. The returned results
-     * contain all temporal assets whose time window overlap with
-     * read_time_window.
+     * Required. The time window for the asset history. The start time is
+     * required. The returned results contain all temporal assets whose time
+     * window overlap with read_time_window.
      *
* * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4; @@ -1130,9 +1117,9 @@ public Builder clearReadTimeWindow() { } /** * 
-     * Required. The time window for the asset history. The returned results
-     * contain all temporal assets whose time window overlap with
-     * read_time_window.
+     * Required. The time window for the asset history. The start time is
+     * required. The returned results contain all temporal assets whose time
+     * window overlap with read_time_window.
      *
* * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4; @@ -1144,9 +1131,9 @@ public com.google.cloud.asset.v1beta1.TimeWindow.Builder getReadTimeWindowBuilde } /** * 
-     * Required. The time window for the asset history. The returned results
-     * contain all temporal assets whose time window overlap with
-     * read_time_window.
+     * Required. The time window for the asset history. The start time is
+     * required. The returned results contain all temporal assets whose time
+     * window overlap with read_time_window.
      *
* * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4; @@ -1161,9 +1148,9 @@ public com.google.cloud.asset.v1beta1.TimeWindowOrBuilder getReadTimeWindowOrBui } /** * 
-     * Required. The time window for the asset history. The returned results
-     * contain all temporal assets whose time window overlap with
-     * read_time_window.
+     * Required. The time window for the asset history. The start time is
+     * required. The returned results contain all temporal assets whose time
+     * window overlap with read_time_window.
      *
* * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4; @@ -1181,13 +1168,11 @@ public com.google.cloud.asset.v1beta1.TimeWindowOrBuilder getReadTimeWindowOrBui } return readTimeWindowBuilder_; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1209,12 +1194,11 @@ public static com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryRequest getDef private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public BatchGetAssetsHistoryRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new BatchGetAssetsHistoryRequest(input, extensionRegistry); + return new BatchGetAssetsHistoryRequest(input, extensionRegistry); } }; @@ -1227,7 +1211,6 @@ public com.google.protobuf.Parser getParserForType return PARSER; } - @java.lang.Override public com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryRequestOrBuilder.java index 674681b254af..015ea0635afd 100644 --- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryRequestOrBuilder.java +++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryRequestOrBuilder.java @@ -10,8 +10,8 @@ public interface BatchGetAssetsHistoryRequestOrBuilder extends /** * 
    * Required. The relative name of the root asset. It can only be an
-   * organization ID (e.g. "organizations/123") or a project ID
-   * (e.g. "projects/12345").
+   * organization number (such as "organizations/123"), or a project id (such as
+   * "projects/my-project-id")"or a project number (such as "projects/12345").
    *
* * string parent = 1; @@ -20,8 +20,8 @@ public interface BatchGetAssetsHistoryRequestOrBuilder extends /** * 
    * Required. The relative name of the root asset. It can only be an
-   * organization ID (e.g. "organizations/123") or a project ID
-   * (e.g. "projects/12345").
+   * organization number (such as "organizations/123"), or a project id (such as
+   * "projects/my-project-id")"or a project number (such as "projects/12345").
    *
* * string parent = 1; @@ -35,7 +35,8 @@ public interface BatchGetAssetsHistoryRequestOrBuilder extends * https://cloud.google.com/apis/design/resource_names#full_resource_name * Example: * "//compute.googleapis.com/projects/my_project_123/zones/zone1/instances/instance1". - * The request becomes a no-op if the asset name list is empty. + * The request becomes a no-op if the asset name list is empty, and the max + * size of the asset name list is 100 in one request. * * * repeated string asset_names = 2; @@ -48,7 +49,8 @@ public interface BatchGetAssetsHistoryRequestOrBuilder extends * https://cloud.google.com/apis/design/resource_names#full_resource_name * Example: * "//compute.googleapis.com/projects/my_project_123/zones/zone1/instances/instance1". - * The request becomes a no-op if the asset name list is empty. + * The request becomes a no-op if the asset name list is empty, and the max + * size of the asset name list is 100 in one request. * * * repeated string asset_names = 2; @@ -60,7 +62,8 @@ public interface BatchGetAssetsHistoryRequestOrBuilder extends * https://cloud.google.com/apis/design/resource_names#full_resource_name * Example: * "//compute.googleapis.com/projects/my_project_123/zones/zone1/instances/instance1". - * The request becomes a no-op if the asset name list is empty. + * The request becomes a no-op if the asset name list is empty, and the max + * size of the asset name list is 100 in one request. * * * repeated string asset_names = 2; @@ -72,7 +75,8 @@ public interface BatchGetAssetsHistoryRequestOrBuilder extends * https://cloud.google.com/apis/design/resource_names#full_resource_name * Example: * "//compute.googleapis.com/projects/my_project_123/zones/zone1/instances/instance1". - * The request becomes a no-op if the asset name list is empty. + * The request becomes a no-op if the asset name list is empty, and the max + * size of the asset name list is 100 in one request. * * * repeated string asset_names = 2; @@ -99,9 +103,9 @@ public interface BatchGetAssetsHistoryRequestOrBuilder extends /** * 
-   * Required. The time window for the asset history. The returned results
-   * contain all temporal assets whose time window overlap with
-   * read_time_window.
+   * Required. The time window for the asset history. The start time is
+   * required. The returned results contain all temporal assets whose time
+   * window overlap with read_time_window.
    *
* * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4; @@ -109,9 +113,9 @@ public interface BatchGetAssetsHistoryRequestOrBuilder extends boolean hasReadTimeWindow(); /** * 
-   * Required. The time window for the asset history. The returned results
-   * contain all temporal assets whose time window overlap with
-   * read_time_window.
+   * Required. The time window for the asset history. The start time is
+   * required. The returned results contain all temporal assets whose time
+   * window overlap with read_time_window.
    *
* * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4; @@ -119,9 +123,9 @@ public interface BatchGetAssetsHistoryRequestOrBuilder extends com.google.cloud.asset.v1beta1.TimeWindow getReadTimeWindow(); /** * 
-   * Required. The time window for the asset history. The returned results
-   * contain all temporal assets whose time window overlap with
-   * read_time_window.
+   * Required. The time window for the asset history. The start time is
+   * required. The returned results contain all temporal assets whose time
+   * window overlap with read_time_window.
    *
* * .google.cloud.asset.v1beta1.TimeWindow read_time_window = 4; diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryResponse.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryResponse.java index 059c23b69d5b..945a3aa37feb 100644 --- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryResponse.java +++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/BatchGetAssetsHistoryResponse.java @@ -33,9 +33,6 @@ private BatchGetAssetsHistoryResponse( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -47,6 +44,13 @@ private BatchGetAssetsHistoryResponse( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { assets_ = new java.util.ArrayList(); @@ -56,13 +60,6 @@ private BatchGetAssetsHistoryResponse( input.readMessage(com.google.cloud.asset.v1beta1.TemporalAsset.parser(), extensionRegistry)); break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -83,7 +80,6 @@ private BatchGetAssetsHistoryResponse( return com.google.cloud.asset.v1beta1.AssetServiceProto.internal_static_google_cloud_asset_v1beta1_BatchGetAssetsHistoryResponse_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.cloud.asset.v1beta1.AssetServiceProto.internal_static_google_cloud_asset_v1beta1_BatchGetAssetsHistoryResponse_fieldAccessorTable @@ -147,7 +143,6 @@ public com.google.cloud.asset.v1beta1.TemporalAssetOrBuilder getAssetsOrBuilder( } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -157,7 +152,6 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { for (int i = 0; i < assets_.size(); i++) { @@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -284,7 +277,6 @@ public static com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryResponse parse .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -292,7 +284,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryResponse prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -320,7 +311,6 @@ public static final class Builder extends return com.google.cloud.asset.v1beta1.AssetServiceProto.internal_static_google_cloud_asset_v1beta1_BatchGetAssetsHistoryResponse_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.cloud.asset.v1beta1.AssetServiceProto.internal_static_google_cloud_asset_v1beta1_BatchGetAssetsHistoryResponse_fieldAccessorTable @@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() { getAssetsFieldBuilder(); } } - @java.lang.Override public Builder clear() { super.clear(); if (assetsBuilder_ == null) { @@ -356,18 +345,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.cloud.asset.v1beta1.AssetServiceProto.internal_static_google_cloud_asset_v1beta1_BatchGetAssetsHistoryResponse_descriptor; } - @java.lang.Override public com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryResponse getDefaultInstanceForType() { return com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryResponse.getDefaultInstance(); } - @java.lang.Override public com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryResponse build() { com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryResponse result = buildPartial(); if (!result.isInitialized()) { @@ -376,7 +362,6 @@ public com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryResponse build() { return result; } - @java.lang.Override public com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryResponse buildPartial() { com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryResponse result = new com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryResponse(this); int from_bitField0_ = bitField0_; @@ -393,39 +378,32 @@ public com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryResponse buildPartial return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryResponse) { return mergeFrom((com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryResponse)other); @@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryRes return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -804,13 +780,11 @@ public com.google.cloud.asset.v1beta1.TemporalAsset.Builder addAssetsBuilder( } return assetsBuilder_; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -832,12 +806,11 @@ public static com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryResponse getDe private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public BatchGetAssetsHistoryResponse parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new BatchGetAssetsHistoryResponse(input, extensionRegistry); + return new BatchGetAssetsHistoryResponse(input, extensionRegistry); } }; @@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForTyp return PARSER; } - @java.lang.Override public com.google.cloud.asset.v1beta1.BatchGetAssetsHistoryResponse getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsRequest.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsRequest.java index 1a941e049680..7ff3a47739e1 100644 --- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsRequest.java +++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsRequest.java @@ -22,7 +22,7 @@ private ExportAssetsRequest(com.google.protobuf.GeneratedMessageV3.Builder bu private ExportAssetsRequest() { parent_ = ""; assetTypes_ = com.google.protobuf.LazyStringArrayList.EMPTY; - contentTypes_ = java.util.Collections.emptyList(); + contentType_ = 0; } @java.lang.Override @@ -35,9 +35,6 @@ private ExportAssetsRequest( com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -49,6 +46,13 @@ private ExportAssetsRequest( case 0: done = true; break; + default: { + if (!parseUnknownFieldProto3( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } case 10: { java.lang.String s = input.readStringRequireUtf8(); @@ -79,25 +83,8 @@ private ExportAssetsRequest( } case 32: { int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { - contentTypes_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000008; - } - contentTypes_.add(rawValue); - break; - } - case 34: { - int length = input.readRawVarint32(); - int oldLimit = input.pushLimit(length); - while(input.getBytesUntilLimit() > 0) { - int rawValue = input.readEnum(); - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { - contentTypes_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000008; - } - contentTypes_.add(rawValue); - } - input.popLimit(oldLimit); + + contentType_ = rawValue; break; } case 42: { @@ -113,13 +100,6 @@ private ExportAssetsRequest( break; } - default: { - if (!parseUnknownFieldProto3( - input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -131,9 +111,6 @@ private ExportAssetsRequest( if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { assetTypes_ = assetTypes_.getUnmodifiableView(); } - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { - contentTypes_ = java.util.Collections.unmodifiableList(contentTypes_); - } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } @@ -143,7 +120,6 @@ private ExportAssetsRequest( return com.google.cloud.asset.v1beta1.AssetServiceProto.internal_static_google_cloud_asset_v1beta1_ExportAssetsRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.cloud.asset.v1beta1.AssetServiceProto.internal_static_google_cloud_asset_v1beta1_ExportAssetsRequest_fieldAccessorTable @@ -156,9 +132,9 @@ private ExportAssetsRequest( private volatile java.lang.Object parent_; /** * 
-   * Required. The relative name of the root asset. It can only be an
-   * organization number (e.g. "organizations/123") or a project number
-   * (e.g. "projects/12345").
+   * Required. The relative name of the root asset. Can only be an organization
+   * number (such as "organizations/123"), or a project id (such as
+   * "projects/my-project-id") or a project number (such as "projects/12345").
    *
* * string parent = 1; @@ -177,9 +153,9 @@ public java.lang.String getParent() { } /** * 
-   * Required. The relative name of the root asset. It can only be an
-   * organization number (e.g. "organizations/123") or a project number
-   * (e.g. "projects/12345").
+   * Required. The relative name of the root asset. Can only be an organization
+   * number (such as "organizations/123"), or a project id (such as
+   * "projects/my-project-id") or a project number (such as "projects/12345").
    *
* * string parent = 1; @@ -202,10 +178,11 @@ public java.lang.String getParent() { private com.google.protobuf.Timestamp readTime_; /** * 
-   * Timestamp to take an asset snapshot. This can only be current or past
-   * time. If not specified, the current time will be used. Due to delays in
-   * resource data collection and indexing, there is a volatile window during
-   * which running the same query may get different results.
+   * Timestamp to take an asset snapshot. This can only be set to a timestamp in
+   * the past or of the current time. If not specified, the current time will be
+   * used. Due to delays in resource data collection and indexing, there is a
+   * volatile window during which running the same query may get different
+   * results.
    *
* * .google.protobuf.Timestamp read_time = 2; @@ -215,10 +192,11 @@ public boolean hasReadTime() { } /** * 
-   * Timestamp to take an asset snapshot. This can only be current or past
-   * time. If not specified, the current time will be used. Due to delays in
-   * resource data collection and indexing, there is a volatile window during
-   * which running the same query may get different results.
+   * Timestamp to take an asset snapshot. This can only be set to a timestamp in
+   * the past or of the current time. If not specified, the current time will be
+   * used. Due to delays in resource data collection and indexing, there is a
+   * volatile window during which running the same query may get different
+   * results.
    *
* * .google.protobuf.Timestamp read_time = 2; @@ -228,10 +206,11 @@ public com.google.protobuf.Timestamp getReadTime() { } /** * 
-   * Timestamp to take an asset snapshot. This can only be current or past
-   * time. If not specified, the current time will be used. Due to delays in
-   * resource data collection and indexing, there is a volatile window during
-   * which running the same query may get different results.
+   * Timestamp to take an asset snapshot. This can only be set to a timestamp in
+   * the past or of the current time. If not specified, the current time will be
+   * used. Due to delays in resource data collection and indexing, there is a
+   * volatile window during which running the same query may get different
+   * results.
    *
* * .google.protobuf.Timestamp read_time = 2; @@ -244,7 +223,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() { private com.google.protobuf.LazyStringList assetTypes_; /** * 
-   * A list of asset types to take a snapshot for. Example:
+   * A list of asset types of which to take a snapshot for. Example:
    * "google.compute.disk". If specified, only matching assets will be returned.
    *
* @@ -256,7 +235,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() { } /** * 
-   * A list of asset types to take a snapshot for. Example:
+   * A list of asset types of which to take a snapshot for. Example:
    * "google.compute.disk". If specified, only matching assets will be returned.
    *
* @@ -267,7 +246,7 @@ public int getAssetTypesCount() { } /** * 
-   * A list of asset types to take a snapshot for. Example:
+   * A list of asset types of which to take a snapshot for. Example:
    * "google.compute.disk". If specified, only matching assets will be returned.
    *
* @@ -278,7 +257,7 @@ public java.lang.String getAssetTypes(int index) { } /** * 
-   * A list of asset types to take a snapshot for. Example:
+   * A list of asset types of which to take a snapshot for. Example:
    * "google.compute.disk". If specified, only matching assets will be returned.
    *
* @@ -289,76 +268,31 @@ public java.lang.String getAssetTypes(int index) { return assetTypes_.getByteString(index); } - public static final int CONTENT_TYPES_FIELD_NUMBER = 4; - private java.util.List contentTypes_; - private static final com.google.protobuf.Internal.ListAdapter.Converter< - java.lang.Integer, com.google.cloud.asset.v1beta1.ContentType> contentTypes_converter_ = - new com.google.protobuf.Internal.ListAdapter.Converter< - java.lang.Integer, com.google.cloud.asset.v1beta1.ContentType>() { - public com.google.cloud.asset.v1beta1.ContentType convert(java.lang.Integer from) { - @SuppressWarnings("deprecation") - com.google.cloud.asset.v1beta1.ContentType result = com.google.cloud.asset.v1beta1.ContentType.valueOf(from); - return result == null ? com.google.cloud.asset.v1beta1.ContentType.UNRECOGNIZED : result; - } - }; + public static final int CONTENT_TYPE_FIELD_NUMBER = 4; + private int contentType_; /** * 
-   * A list of asset content types. If specified, only matching content will be
-   * returned. Otherwise, no content but the asset name will be returned.
+   * Asset content type. If not specified, no content but the asset name will be
+   * returned.
    *
* - * repeated .google.cloud.asset.v1beta1.ContentType content_types = 4; + * .google.cloud.asset.v1beta1.ContentType content_type = 4; */ - public java.util.List getContentTypesList() { - return new com.google.protobuf.Internal.ListAdapter< - java.lang.Integer, com.google.cloud.asset.v1beta1.ContentType>(contentTypes_, contentTypes_converter_); + public int getContentTypeValue() { + return contentType_; } /** * 
-   * A list of asset content types. If specified, only matching content will be
-   * returned. Otherwise, no content but the asset name will be returned.
+   * Asset content type. If not specified, no content but the asset name will be
+   * returned.
    *
* - * repeated .google.cloud.asset.v1beta1.ContentType content_types = 4; + * .google.cloud.asset.v1beta1.ContentType content_type = 4; */ - public int getContentTypesCount() { - return contentTypes_.size(); + public com.google.cloud.asset.v1beta1.ContentType getContentType() { + com.google.cloud.asset.v1beta1.ContentType result = com.google.cloud.asset.v1beta1.ContentType.valueOf(contentType_); + return result == null ? com.google.cloud.asset.v1beta1.ContentType.UNRECOGNIZED : result; } - /** - * 
-   * A list of asset content types. If specified, only matching content will be
-   * returned. Otherwise, no content but the asset name will be returned.
-   *
- * - * repeated .google.cloud.asset.v1beta1.ContentType content_types = 4; - */ - public com.google.cloud.asset.v1beta1.ContentType getContentTypes(int index) { - return contentTypes_converter_.convert(contentTypes_.get(index)); - } - /** - * 
-   * A list of asset content types. If specified, only matching content will be
-   * returned. Otherwise, no content but the asset name will be returned.
-   *
- * - * repeated .google.cloud.asset.v1beta1.ContentType content_types = 4; - */ - public java.util.List - getContentTypesValueList() { - return contentTypes_; - } - /** - * 
-   * A list of asset content types. If specified, only matching content will be
-   * returned. Otherwise, no content but the asset name will be returned.
-   *
- * - * repeated .google.cloud.asset.v1beta1.ContentType content_types = 4; - */ - public int getContentTypesValue(int index) { - return contentTypes_.get(index); - } - private int contentTypesMemoizedSerializedSize; public static final int OUTPUT_CONFIG_FIELD_NUMBER = 5; private com.google.cloud.asset.v1beta1.OutputConfig outputConfig_; @@ -397,7 +331,6 @@ public com.google.cloud.asset.v1beta1.OutputConfigOrBuilder getOutputConfigOrBui } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) return true; @@ -407,10 +340,8 @@ public final boolean isInitialized() { return true; } - @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - getSerializedSize(); if (!getParentBytes().isEmpty()) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, parent_); } @@ -420,12 +351,8 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) for (int i = 0; i < assetTypes_.size(); i++) { com.google.protobuf.GeneratedMessageV3.writeString(output, 3, assetTypes_.getRaw(i)); } - if (getContentTypesList().size() > 0) { - output.writeUInt32NoTag(34); - output.writeUInt32NoTag(contentTypesMemoizedSerializedSize); - } - for (int i = 0; i < contentTypes_.size(); i++) { - output.writeEnumNoTag(contentTypes_.get(i)); + if (contentType_ != com.google.cloud.asset.v1beta1.ContentType.CONTENT_TYPE_UNSPECIFIED.getNumber()) { + output.writeEnum(4, contentType_); } if (outputConfig_ != null) { output.writeMessage(5, getOutputConfig()); @@ -433,7 +360,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) unknownFields.writeTo(output); } - @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) return size; @@ -454,17 +380,9 @@ public int getSerializedSize() { size += dataSize; size += 1 * getAssetTypesList().size(); } - { - int dataSize = 0; - for (int i = 0; i < contentTypes_.size(); i++) { - dataSize += com.google.protobuf.CodedOutputStream - .computeEnumSizeNoTag(contentTypes_.get(i)); - } - size += dataSize; - if (!getContentTypesList().isEmpty()) { size += 1; - size += com.google.protobuf.CodedOutputStream - .computeUInt32SizeNoTag(dataSize); - }contentTypesMemoizedSerializedSize = dataSize; + if (contentType_ != com.google.cloud.asset.v1beta1.ContentType.CONTENT_TYPE_UNSPECIFIED.getNumber()) { + size += com.google.protobuf.CodedOutputStream + .computeEnumSize(4, contentType_); } if (outputConfig_ != null) { size += com.google.protobuf.CodedOutputStream @@ -495,7 +413,7 @@ public boolean equals(final java.lang.Object obj) { } result = result && getAssetTypesList() .equals(other.getAssetTypesList()); - result = result && contentTypes_.equals(other.contentTypes_); + result = result && contentType_ == other.contentType_; result = result && (hasOutputConfig() == other.hasOutputConfig()); if (hasOutputConfig()) { result = result && getOutputConfig() @@ -522,10 +440,8 @@ public int hashCode() { hash = (37 * hash) + ASSET_TYPES_FIELD_NUMBER; hash = (53 * hash) + getAssetTypesList().hashCode(); } - if (getContentTypesCount() > 0) { - hash = (37 * hash) + CONTENT_TYPES_FIELD_NUMBER; - hash = (53 * hash) + contentTypes_.hashCode(); - } + hash = (37 * hash) + CONTENT_TYPE_FIELD_NUMBER; + hash = (53 * hash) + contentType_; if (hasOutputConfig()) { hash = (37 * hash) + OUTPUT_CONFIG_FIELD_NUMBER; hash = (53 * hash) + getOutputConfig().hashCode(); @@ -605,7 +521,6 @@ public static com.google.cloud.asset.v1beta1.ExportAssetsRequest parseFrom( .parseWithIOException(PARSER, input, extensionRegistry); } - @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); @@ -613,7 +528,6 @@ public static Builder newBuilder() { public static Builder newBuilder(com.google.cloud.asset.v1beta1.ExportAssetsRequest prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); @@ -641,7 +555,6 @@ public static final class Builder extends return com.google.cloud.asset.v1beta1.AssetServiceProto.internal_static_google_cloud_asset_v1beta1_ExportAssetsRequest_descriptor; } - @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return com.google.cloud.asset.v1beta1.AssetServiceProto.internal_static_google_cloud_asset_v1beta1_ExportAssetsRequest_fieldAccessorTable @@ -664,7 +577,6 @@ private void maybeForceBuilderInitialization() { .alwaysUseFieldBuilders) { } } - @java.lang.Override public Builder clear() { super.clear(); parent_ = ""; @@ -677,8 +589,8 @@ public Builder clear() { } assetTypes_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000004); - contentTypes_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000008); + contentType_ = 0; + if (outputConfigBuilder_ == null) { outputConfig_ = null; } else { @@ -688,18 +600,15 @@ public Builder clear() { return this; } - @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return com.google.cloud.asset.v1beta1.AssetServiceProto.internal_static_google_cloud_asset_v1beta1_ExportAssetsRequest_descriptor; } - @java.lang.Override public com.google.cloud.asset.v1beta1.ExportAssetsRequest getDefaultInstanceForType() { return com.google.cloud.asset.v1beta1.ExportAssetsRequest.getDefaultInstance(); } - @java.lang.Override public com.google.cloud.asset.v1beta1.ExportAssetsRequest build() { com.google.cloud.asset.v1beta1.ExportAssetsRequest result = buildPartial(); if (!result.isInitialized()) { @@ -708,7 +617,6 @@ public com.google.cloud.asset.v1beta1.ExportAssetsRequest build() { return result; } - @java.lang.Override public com.google.cloud.asset.v1beta1.ExportAssetsRequest buildPartial() { com.google.cloud.asset.v1beta1.ExportAssetsRequest result = new com.google.cloud.asset.v1beta1.ExportAssetsRequest(this); int from_bitField0_ = bitField0_; @@ -724,11 +632,7 @@ public com.google.cloud.asset.v1beta1.ExportAssetsRequest buildPartial() { bitField0_ = (bitField0_ & ~0x00000004); } result.assetTypes_ = assetTypes_; - if (((bitField0_ & 0x00000008) == 0x00000008)) { - contentTypes_ = java.util.Collections.unmodifiableList(contentTypes_); - bitField0_ = (bitField0_ & ~0x00000008); - } - result.contentTypes_ = contentTypes_; + result.contentType_ = contentType_; if (outputConfigBuilder_ == null) { result.outputConfig_ = outputConfig_; } else { @@ -739,39 +643,32 @@ public com.google.cloud.asset.v1beta1.ExportAssetsRequest buildPartial() { return result; } - @java.lang.Override public Builder clone() { return (Builder) super.clone(); } - @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } - @java.lang.Override public Builder clearField( com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } - @java.lang.Override public Builder clearOneof( com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } - @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } - @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.google.cloud.asset.v1beta1.ExportAssetsRequest) { return mergeFrom((com.google.cloud.asset.v1beta1.ExportAssetsRequest)other); @@ -800,15 +697,8 @@ public Builder mergeFrom(com.google.cloud.asset.v1beta1.ExportAssetsRequest othe } onChanged(); } - if (!other.contentTypes_.isEmpty()) { - if (contentTypes_.isEmpty()) { - contentTypes_ = other.contentTypes_; - bitField0_ = (bitField0_ & ~0x00000008); - } else { - ensureContentTypesIsMutable(); - contentTypes_.addAll(other.contentTypes_); - } - onChanged(); + if (other.contentType_ != 0) { + setContentTypeValue(other.getContentTypeValue()); } if (other.hasOutputConfig()) { mergeOutputConfig(other.getOutputConfig()); @@ -818,12 +708,10 @@ public Builder mergeFrom(com.google.cloud.asset.v1beta1.ExportAssetsRequest othe return this; } - @java.lang.Override public final boolean isInitialized() { return true; } - @java.lang.Override public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) @@ -846,9 +734,9 @@ public Builder mergeFrom( private java.lang.Object parent_ = ""; /** * 
-     * Required. The relative name of the root asset. It can only be an
-     * organization number (e.g. "organizations/123") or a project number
-     * (e.g. "projects/12345").
+     * Required. The relative name of the root asset. Can only be an organization
+     * number (such as "organizations/123"), or a project id (such as
+     * "projects/my-project-id") or a project number (such as "projects/12345").
      *
* * string parent = 1; @@ -867,9 +755,9 @@ public java.lang.String getParent() { } /** * 
-     * Required. The relative name of the root asset. It can only be an
-     * organization number (e.g. "organizations/123") or a project number
-     * (e.g. "projects/12345").
+     * Required. The relative name of the root asset. Can only be an organization
+     * number (such as "organizations/123"), or a project id (such as
+     * "projects/my-project-id") or a project number (such as "projects/12345").
      *
* * string parent = 1; @@ -889,9 +777,9 @@ public java.lang.String getParent() { } /** * 
-     * Required. The relative name of the root asset. It can only be an
-     * organization number (e.g. "organizations/123") or a project number
-     * (e.g. "projects/12345").
+     * Required. The relative name of the root asset. Can only be an organization
+     * number (such as "organizations/123"), or a project id (such as
+     * "projects/my-project-id") or a project number (such as "projects/12345").
      *
* * string parent = 1; @@ -908,9 +796,9 @@ public Builder setParent( } /** * 
-     * Required. The relative name of the root asset. It can only be an
-     * organization number (e.g. "organizations/123") or a project number
-     * (e.g. "projects/12345").
+     * Required. The relative name of the root asset. Can only be an organization
+     * number (such as "organizations/123"), or a project id (such as
+     * "projects/my-project-id") or a project number (such as "projects/12345").
      *
* * string parent = 1; @@ -923,9 +811,9 @@ public Builder clearParent() { } /** * 
-     * Required. The relative name of the root asset. It can only be an
-     * organization number (e.g. "organizations/123") or a project number
-     * (e.g. "projects/12345").
+     * Required. The relative name of the root asset. Can only be an organization
+     * number (such as "organizations/123"), or a project id (such as
+     * "projects/my-project-id") or a project number (such as "projects/12345").
      *
* * string parent = 1; @@ -947,10 +835,11 @@ public Builder setParentBytes( com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> readTimeBuilder_; /** * 
-     * Timestamp to take an asset snapshot. This can only be current or past
-     * time. If not specified, the current time will be used. Due to delays in
-     * resource data collection and indexing, there is a volatile window during
-     * which running the same query may get different results.
+     * Timestamp to take an asset snapshot. This can only be set to a timestamp in
+     * the past or of the current time. If not specified, the current time will be
+     * used. Due to delays in resource data collection and indexing, there is a
+     * volatile window during which running the same query may get different
+     * results.
      *
* * .google.protobuf.Timestamp read_time = 2; @@ -960,10 +849,11 @@ public boolean hasReadTime() { } /** * 
-     * Timestamp to take an asset snapshot. This can only be current or past
-     * time. If not specified, the current time will be used. Due to delays in
-     * resource data collection and indexing, there is a volatile window during
-     * which running the same query may get different results.
+     * Timestamp to take an asset snapshot. This can only be set to a timestamp in
+     * the past or of the current time. If not specified, the current time will be
+     * used. Due to delays in resource data collection and indexing, there is a
+     * volatile window during which running the same query may get different
+     * results.
      *
* * .google.protobuf.Timestamp read_time = 2; @@ -977,10 +867,11 @@ public com.google.protobuf.Timestamp getReadTime() { } /** * 
-     * Timestamp to take an asset snapshot. This can only be current or past
-     * time. If not specified, the current time will be used. Due to delays in
-     * resource data collection and indexing, there is a volatile window during
-     * which running the same query may get different results.
+     * Timestamp to take an asset snapshot. This can only be set to a timestamp in
+     * the past or of the current time. If not specified, the current time will be
+     * used. Due to delays in resource data collection and indexing, there is a
+     * volatile window during which running the same query may get different
+     * results.
      *
* * .google.protobuf.Timestamp read_time = 2; @@ -1000,10 +891,11 @@ public Builder setReadTime(com.google.protobuf.Timestamp value) { } /** * 
-     * Timestamp to take an asset snapshot. This can only be current or past
-     * time. If not specified, the current time will be used. Due to delays in
-     * resource data collection and indexing, there is a volatile window during
-     * which running the same query may get different results.
+     * Timestamp to take an asset snapshot. This can only be set to a timestamp in
+     * the past or of the current time. If not specified, the current time will be
+     * used. Due to delays in resource data collection and indexing, there is a
+     * volatile window during which running the same query may get different
+     * results.
      *
* * .google.protobuf.Timestamp read_time = 2; @@ -1021,10 +913,11 @@ public Builder setReadTime( } /** * 
-     * Timestamp to take an asset snapshot. This can only be current or past
-     * time. If not specified, the current time will be used. Due to delays in
-     * resource data collection and indexing, there is a volatile window during
-     * which running the same query may get different results.
+     * Timestamp to take an asset snapshot. This can only be set to a timestamp in
+     * the past or of the current time. If not specified, the current time will be
+     * used. Due to delays in resource data collection and indexing, there is a
+     * volatile window during which running the same query may get different
+     * results.
      *
* * .google.protobuf.Timestamp read_time = 2; @@ -1046,10 +939,11 @@ public Builder mergeReadTime(com.google.protobuf.Timestamp value) { } /** * 
-     * Timestamp to take an asset snapshot. This can only be current or past
-     * time. If not specified, the current time will be used. Due to delays in
-     * resource data collection and indexing, there is a volatile window during
-     * which running the same query may get different results.
+     * Timestamp to take an asset snapshot. This can only be set to a timestamp in
+     * the past or of the current time. If not specified, the current time will be
+     * used. Due to delays in resource data collection and indexing, there is a
+     * volatile window during which running the same query may get different
+     * results.
      *
* * .google.protobuf.Timestamp read_time = 2; @@ -1067,10 +961,11 @@ public Builder clearReadTime() { } /** * 
-     * Timestamp to take an asset snapshot. This can only be current or past
-     * time. If not specified, the current time will be used. Due to delays in
-     * resource data collection and indexing, there is a volatile window during
-     * which running the same query may get different results.
+     * Timestamp to take an asset snapshot. This can only be set to a timestamp in
+     * the past or of the current time. If not specified, the current time will be
+     * used. Due to delays in resource data collection and indexing, there is a
+     * volatile window during which running the same query may get different
+     * results.
      *
* * .google.protobuf.Timestamp read_time = 2; @@ -1082,10 +977,11 @@ public com.google.protobuf.Timestamp.Builder getReadTimeBuilder() { } /** * 
-     * Timestamp to take an asset snapshot. This can only be current or past
-     * time. If not specified, the current time will be used. Due to delays in
-     * resource data collection and indexing, there is a volatile window during
-     * which running the same query may get different results.
+     * Timestamp to take an asset snapshot. This can only be set to a timestamp in
+     * the past or of the current time. If not specified, the current time will be
+     * used. Due to delays in resource data collection and indexing, there is a
+     * volatile window during which running the same query may get different
+     * results.
      *
* * .google.protobuf.Timestamp read_time = 2; @@ -1100,10 +996,11 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() { } /** * 
-     * Timestamp to take an asset snapshot. This can only be current or past
-     * time. If not specified, the current time will be used. Due to delays in
-     * resource data collection and indexing, there is a volatile window during
-     * which running the same query may get different results.
+     * Timestamp to take an asset snapshot. This can only be set to a timestamp in
+     * the past or of the current time. If not specified, the current time will be
+     * used. Due to delays in resource data collection and indexing, there is a
+     * volatile window during which running the same query may get different
+     * results.
      *
* * .google.protobuf.Timestamp read_time = 2; @@ -1131,7 +1028,7 @@ private void ensureAssetTypesIsMutable() { } /** * 
-     * A list of asset types to take a snapshot for. Example:
+     * A list of asset types of which to take a snapshot for. Example:
      * "google.compute.disk". If specified, only matching assets will be returned.
      *
* @@ -1143,7 +1040,7 @@ private void ensureAssetTypesIsMutable() { } /** * 
-     * A list of asset types to take a snapshot for. Example:
+     * A list of asset types of which to take a snapshot for. Example:
      * "google.compute.disk". If specified, only matching assets will be returned.
      *
* @@ -1154,7 +1051,7 @@ public int getAssetTypesCount() { } /** * 
-     * A list of asset types to take a snapshot for. Example:
+     * A list of asset types of which to take a snapshot for. Example:
      * "google.compute.disk". If specified, only matching assets will be returned.
      *
* @@ -1165,7 +1062,7 @@ public java.lang.String getAssetTypes(int index) { } /** * 
-     * A list of asset types to take a snapshot for. Example:
+     * A list of asset types of which to take a snapshot for. Example:
      * "google.compute.disk". If specified, only matching assets will be returned.
      *
* @@ -1177,7 +1074,7 @@ public java.lang.String getAssetTypes(int index) { } /** * 
-     * A list of asset types to take a snapshot for. Example:
+     * A list of asset types of which to take a snapshot for. Example:
      * "google.compute.disk". If specified, only matching assets will be returned.
      *
* @@ -1195,7 +1092,7 @@ public Builder setAssetTypes( } /** * 
-     * A list of asset types to take a snapshot for. Example:
+     * A list of asset types of which to take a snapshot for. Example:
      * "google.compute.disk". If specified, only matching assets will be returned.
      *
* @@ -1213,7 +1110,7 @@ public Builder addAssetTypes( } /** * 
-     * A list of asset types to take a snapshot for. Example:
+     * A list of asset types of which to take a snapshot for. Example:
      * "google.compute.disk". If specified, only matching assets will be returned.
      *
* @@ -1229,7 +1126,7 @@ public Builder addAllAssetTypes( } /** * 
-     * A list of asset types to take a snapshot for. Example:
+     * A list of asset types of which to take a snapshot for. Example:
      * "google.compute.disk". If specified, only matching assets will be returned.
      *
* @@ -1243,7 +1140,7 @@ public Builder clearAssetTypes() { } /** * 
-     * A list of asset types to take a snapshot for. Example:
+     * A list of asset types of which to take a snapshot for. Example:
      * "google.compute.disk". If specified, only matching assets will be returned.
      *
* @@ -1261,180 +1158,71 @@ public Builder addAssetTypesBytes( return this; } - private java.util.List contentTypes_ = - java.util.Collections.emptyList(); - private void ensureContentTypesIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { - contentTypes_ = new java.util.ArrayList(contentTypes_); - bitField0_ |= 0x00000008; - } - } - /** - * 
-     * A list of asset content types. If specified, only matching content will be
-     * returned. Otherwise, no content but the asset name will be returned.
-     *
- * - * repeated .google.cloud.asset.v1beta1.ContentType content_types = 4; - */ - public java.util.List getContentTypesList() { - return new com.google.protobuf.Internal.ListAdapter< - java.lang.Integer, com.google.cloud.asset.v1beta1.ContentType>(contentTypes_, contentTypes_converter_); - } - /** - * 
-     * A list of asset content types. If specified, only matching content will be
-     * returned. Otherwise, no content but the asset name will be returned.
-     *
- * - * repeated .google.cloud.asset.v1beta1.ContentType content_types = 4; - */ - public int getContentTypesCount() { - return contentTypes_.size(); - } + private int contentType_ = 0; /** * 
-     * A list of asset content types. If specified, only matching content will be
-     * returned. Otherwise, no content but the asset name will be returned.
+     * Asset content type. If not specified, no content but the asset name will be
+     * returned.
      *
* - * repeated .google.cloud.asset.v1beta1.ContentType content_types = 4; + * .google.cloud.asset.v1beta1.ContentType content_type = 4; */ - public com.google.cloud.asset.v1beta1.ContentType getContentTypes(int index) { - return contentTypes_converter_.convert(contentTypes_.get(index)); + public int getContentTypeValue() { + return contentType_; } /** * 
-     * A list of asset content types. If specified, only matching content will be
-     * returned. Otherwise, no content but the asset name will be returned.
+     * Asset content type. If not specified, no content but the asset name will be
+     * returned.
      *
* - * repeated .google.cloud.asset.v1beta1.ContentType content_types = 4; + * .google.cloud.asset.v1beta1.ContentType content_type = 4; */ - public Builder setContentTypes( - int index, com.google.cloud.asset.v1beta1.ContentType value) { - if (value == null) { - throw new NullPointerException(); - } - ensureContentTypesIsMutable(); - contentTypes_.set(index, value.getNumber()); + public Builder setContentTypeValue(int value) { + contentType_ = value; onChanged(); return this; } /** * 
-     * A list of asset content types. If specified, only matching content will be
-     * returned. Otherwise, no content but the asset name will be returned.
+     * Asset content type. If not specified, no content but the asset name will be
+     * returned.
      *
* - * repeated .google.cloud.asset.v1beta1.ContentType content_types = 4; + * .google.cloud.asset.v1beta1.ContentType content_type = 4; */ - public Builder addContentTypes(com.google.cloud.asset.v1beta1.ContentType value) { - if (value == null) { - throw new NullPointerException(); - } - ensureContentTypesIsMutable(); - contentTypes_.add(value.getNumber()); - onChanged(); - return this; + public com.google.cloud.asset.v1beta1.ContentType getContentType() { + com.google.cloud.asset.v1beta1.ContentType result = com.google.cloud.asset.v1beta1.ContentType.valueOf(contentType_); + return result == null ? com.google.cloud.asset.v1beta1.ContentType.UNRECOGNIZED : result; } /** * 
-     * A list of asset content types. If specified, only matching content will be
-     * returned. Otherwise, no content but the asset name will be returned.
+     * Asset content type. If not specified, no content but the asset name will be
+     * returned.
      *
* - * repeated .google.cloud.asset.v1beta1.ContentType content_types = 4; + * .google.cloud.asset.v1beta1.ContentType content_type = 4; */ - public Builder addAllContentTypes( - java.lang.Iterable values) { - ensureContentTypesIsMutable(); - for (com.google.cloud.asset.v1beta1.ContentType value : values) { - contentTypes_.add(value.getNumber()); + public Builder setContentType(com.google.cloud.asset.v1beta1.ContentType value) { + if (value == null) { + throw new NullPointerException(); } + + contentType_ = value.getNumber(); onChanged(); return this; } /** * 
-     * A list of asset content types. If specified, only matching content will be
-     * returned. Otherwise, no content but the asset name will be returned.
-     *
- * - * repeated .google.cloud.asset.v1beta1.ContentType content_types = 4; - */ - public Builder clearContentTypes() { - contentTypes_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000008); - onChanged(); - return this; - } - /** - * 
-     * A list of asset content types. If specified, only matching content will be
-     * returned. Otherwise, no content but the asset name will be returned.
-     *
- * - * repeated .google.cloud.asset.v1beta1.ContentType content_types = 4; - */ - public java.util.List - getContentTypesValueList() { - return java.util.Collections.unmodifiableList(contentTypes_); - } - /** - * 
-     * A list of asset content types. If specified, only matching content will be
-     * returned. Otherwise, no content but the asset name will be returned.
-     *
- * - * repeated .google.cloud.asset.v1beta1.ContentType content_types = 4; - */ - public int getContentTypesValue(int index) { - return contentTypes_.get(index); - } - /** - * 
-     * A list of asset content types. If specified, only matching content will be
-     * returned. Otherwise, no content but the asset name will be returned.
-     *
- * - * repeated .google.cloud.asset.v1beta1.ContentType content_types = 4; - */ - public Builder setContentTypesValue( - int index, int value) { - ensureContentTypesIsMutable(); - contentTypes_.set(index, value); - onChanged(); - return this; - } - /** - * 
-     * A list of asset content types. If specified, only matching content will be
-     * returned. Otherwise, no content but the asset name will be returned.
-     *
- * - * repeated .google.cloud.asset.v1beta1.ContentType content_types = 4; - */ - public Builder addContentTypesValue(int value) { - ensureContentTypesIsMutable(); - contentTypes_.add(value); - onChanged(); - return this; - } - /** - * 
-     * A list of asset content types. If specified, only matching content will be
-     * returned. Otherwise, no content but the asset name will be returned.
+     * Asset content type. If not specified, no content but the asset name will be
+     * returned.
      *
* - * repeated .google.cloud.asset.v1beta1.ContentType content_types = 4; + * .google.cloud.asset.v1beta1.ContentType content_type = 4; */ - public Builder addAllContentTypesValue( - java.lang.Iterable values) { - ensureContentTypesIsMutable(); - for (int value : values) { - contentTypes_.add(value); - } + public Builder clearContentType() { + + contentType_ = 0; onChanged(); return this; } @@ -1600,13 +1388,11 @@ public com.google.cloud.asset.v1beta1.OutputConfigOrBuilder getOutputConfigOrBui } return outputConfigBuilder_; } - @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFieldsProto3(unknownFields); } - @java.lang.Override public final Builder mergeUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); @@ -1628,12 +1414,11 @@ public static com.google.cloud.asset.v1beta1.ExportAssetsRequest getDefaultInsta private static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override public ExportAssetsRequest parsePartialFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - return new ExportAssetsRequest(input, extensionRegistry); + return new ExportAssetsRequest(input, extensionRegistry); } }; @@ -1646,7 +1431,6 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } - @java.lang.Override public com.google.cloud.asset.v1beta1.ExportAssetsRequest getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsRequestOrBuilder.java index 30938f081f29..2a6d2bd02c2c 100644 --- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsRequestOrBuilder.java +++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsRequestOrBuilder.java @@ -9,9 +9,9 @@ public interface ExportAssetsRequestOrBuilder extends /** * 
-   * Required. The relative name of the root asset. It can only be an
-   * organization number (e.g. "organizations/123") or a project number
-   * (e.g. "projects/12345").
+   * Required. The relative name of the root asset. Can only be an organization
+   * number (such as "organizations/123"), or a project id (such as
+   * "projects/my-project-id") or a project number (such as "projects/12345").
    *
* * string parent = 1; @@ -19,9 +19,9 @@ public interface ExportAssetsRequestOrBuilder extends java.lang.String getParent(); /** * 
-   * Required. The relative name of the root asset. It can only be an
-   * organization number (e.g. "organizations/123") or a project number
-   * (e.g. "projects/12345").
+   * Required. The relative name of the root asset. Can only be an organization
+   * number (such as "organizations/123"), or a project id (such as
+   * "projects/my-project-id") or a project number (such as "projects/12345").
    *
* * string parent = 1; @@ -31,10 +31,11 @@ public interface ExportAssetsRequestOrBuilder extends /** * 
-   * Timestamp to take an asset snapshot. This can only be current or past
-   * time. If not specified, the current time will be used. Due to delays in
-   * resource data collection and indexing, there is a volatile window during
-   * which running the same query may get different results.
+   * Timestamp to take an asset snapshot. This can only be set to a timestamp in
+   * the past or of the current time. If not specified, the current time will be
+   * used. Due to delays in resource data collection and indexing, there is a
+   * volatile window during which running the same query may get different
+   * results.
    *
* * .google.protobuf.Timestamp read_time = 2; @@ -42,10 +43,11 @@ public interface ExportAssetsRequestOrBuilder extends boolean hasReadTime(); /** * 
-   * Timestamp to take an asset snapshot. This can only be current or past
-   * time. If not specified, the current time will be used. Due to delays in
-   * resource data collection and indexing, there is a volatile window during
-   * which running the same query may get different results.
+   * Timestamp to take an asset snapshot. This can only be set to a timestamp in
+   * the past or of the current time. If not specified, the current time will be
+   * used. Due to delays in resource data collection and indexing, there is a
+   * volatile window during which running the same query may get different
+   * results.
    *
* * .google.protobuf.Timestamp read_time = 2; @@ -53,10 +55,11 @@ public interface ExportAssetsRequestOrBuilder extends com.google.protobuf.Timestamp getReadTime(); /** * 
-   * Timestamp to take an asset snapshot. This can only be current or past
-   * time. If not specified, the current time will be used. Due to delays in
-   * resource data collection and indexing, there is a volatile window during
-   * which running the same query may get different results.
+   * Timestamp to take an asset snapshot. This can only be set to a timestamp in
+   * the past or of the current time. If not specified, the current time will be
+   * used. Due to delays in resource data collection and indexing, there is a
+   * volatile window during which running the same query may get different
+   * results.
    *
* * .google.protobuf.Timestamp read_time = 2; @@ -65,7 +68,7 @@ public interface ExportAssetsRequestOrBuilder extends /** * 
-   * A list of asset types to take a snapshot for. Example:
+   * A list of asset types of which to take a snapshot for. Example:
    * "google.compute.disk". If specified, only matching assets will be returned.
    *
* @@ -75,7 +78,7 @@ public interface ExportAssetsRequestOrBuilder extends getAssetTypesList(); /** * 
-   * A list of asset types to take a snapshot for. Example:
+   * A list of asset types of which to take a snapshot for. Example:
    * "google.compute.disk". If specified, only matching assets will be returned.
    *
* @@ -84,7 +87,7 @@ public interface ExportAssetsRequestOrBuilder extends int getAssetTypesCount(); /** * 
-   * A list of asset types to take a snapshot for. Example:
+   * A list of asset types of which to take a snapshot for. Example:
    * "google.compute.disk". If specified, only matching assets will be returned.
    *
* @@ -93,7 +96,7 @@ public interface ExportAssetsRequestOrBuilder extends java.lang.String getAssetTypes(int index); /** * 
-   * A list of asset types to take a snapshot for. Example:
+   * A list of asset types of which to take a snapshot for. Example:
    * "google.compute.disk". If specified, only matching assets will be returned.
    *
* @@ -104,50 +107,22 @@ public interface ExportAssetsRequestOrBuilder extends /** * 
-   * A list of asset content types. If specified, only matching content will be
-   * returned. Otherwise, no content but the asset name will be returned.
+   * Asset content type. If not specified, no content but the asset name will be
+   * returned.
    *
* - * repeated .google.cloud.asset.v1beta1.ContentType content_types = 4; + * .google.cloud.asset.v1beta1.ContentType content_type = 4; */ - java.util.List getContentTypesList(); + int getContentTypeValue(); /** * 
-   * A list of asset content types. If specified, only matching content will be
-   * returned. Otherwise, no content but the asset name will be returned.
+   * Asset content type. If not specified, no content but the asset name will be
+   * returned.
    *
* - * repeated .google.cloud.asset.v1beta1.ContentType content_types = 4; + * .google.cloud.asset.v1beta1.ContentType content_type = 4; */ - int getContentTypesCount(); - /** - * 
-   * A list of asset content types. If specified, only matching content will be
-   * returned. Otherwise, no content but the asset name will be returned.
-   *
- * - * repeated .google.cloud.asset.v1beta1.ContentType content_types = 4; - */ - com.google.cloud.asset.v1beta1.ContentType getContentTypes(int index); - /** - * 
-   * A list of asset content types. If specified, only matching content will be
-   * returned. Otherwise, no content but the asset name will be returned.
-   *
- * - * repeated .google.cloud.asset.v1beta1.ContentType content_types = 4; - */ - java.util.List - getContentTypesValueList(); - /** - * 
-   * A list of asset content types. If specified, only matching content will be
-   * returned. Otherwise, no content but the asset name will be returned.
-   *
- * - * repeated .google.cloud.asset.v1beta1.ContentType content_types = 4; - */ - int getContentTypesValue(int index); + com.google.cloud.asset.v1beta1.ContentType getContentType(); /** * 
diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsResponse.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsResponse.java
index 04ebf64bcc05..ed3d84e6a982 100644
--- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsResponse.java
+++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsResponse.java
@@ -34,9 +34,6 @@ private ExportAssetsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ExportAssetsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.protobuf.Timestamp.Builder subBuilder = null;
             if (readTime_ != null) {
@@ -74,13 +78,6 @@ private ExportAssetsResponse(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -98,7 +95,6 @@ private ExportAssetsResponse(
     return com.google.cloud.asset.v1beta1.AssetServiceProto.internal_static_google_cloud_asset_v1beta1_ExportAssetsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.asset.v1beta1.AssetServiceProto.internal_static_google_cloud_asset_v1beta1_ExportAssetsResponse_fieldAccessorTable
@@ -110,7 +106,7 @@ private ExportAssetsResponse(
   private com.google.protobuf.Timestamp readTime_;
   /**
    * 
-   * Required. Time the snapshot was taken.
+   * Time the snapshot was taken.
    * 

    *
    * .google.protobuf.Timestamp read_time = 1;
@@ -120,7 +116,7 @@ public boolean hasReadTime() {
   }
   /**
    * 
-   * Required. Time the snapshot was taken.
+   * Time the snapshot was taken.
    * 

    *
    * .google.protobuf.Timestamp read_time = 1;
@@ -130,7 +126,7 @@ public com.google.protobuf.Timestamp getReadTime() {
   }
   /**
    * 
-   * Required. Time the snapshot was taken.
+   * Time the snapshot was taken.
    * 

    *
    * .google.protobuf.Timestamp read_time = 1;
@@ -143,7 +139,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
   private com.google.cloud.asset.v1beta1.OutputConfig outputConfig_;
   /**
    * 
-   * Required. Output configuration indicating where the results were output to.
+   * Output configuration indicating where the results were output to.
    * All results are in JSON format.
    * 

    *
@@ -154,7 +150,7 @@ public boolean hasOutputConfig() {
   }
   /**
    * 
-   * Required. Output configuration indicating where the results were output to.
+   * Output configuration indicating where the results were output to.
    * All results are in JSON format.
    * 

    *
@@ -165,7 +161,7 @@ public com.google.cloud.asset.v1beta1.OutputConfig getOutputConfig() {
   }
   /**
    * 
-   * Required. Output configuration indicating where the results were output to.
+   * Output configuration indicating where the results were output to.
    * All results are in JSON format.
    * 

    *
@@ -176,7 +172,6 @@ public com.google.cloud.asset.v1beta1.OutputConfigOrBuilder getOutputConfigOrBui
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -186,7 +181,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (readTime_ != null) {
@@ -198,7 +192,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -332,7 +325,6 @@ public static com.google.cloud.asset.v1beta1.ExportAssetsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -340,7 +332,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.asset.v1beta1.ExportAssetsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -370,7 +361,6 @@ public static final class Builder extends
       return com.google.cloud.asset.v1beta1.AssetServiceProto.internal_static_google_cloud_asset_v1beta1_ExportAssetsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.asset.v1beta1.AssetServiceProto.internal_static_google_cloud_asset_v1beta1_ExportAssetsResponse_fieldAccessorTable
@@ -393,7 +383,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (readTimeBuilder_ == null) {
@@ -411,18 +400,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.asset.v1beta1.AssetServiceProto.internal_static_google_cloud_asset_v1beta1_ExportAssetsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.asset.v1beta1.ExportAssetsResponse getDefaultInstanceForType() {
       return com.google.cloud.asset.v1beta1.ExportAssetsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.asset.v1beta1.ExportAssetsResponse build() {
       com.google.cloud.asset.v1beta1.ExportAssetsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -431,7 +417,6 @@ public com.google.cloud.asset.v1beta1.ExportAssetsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.asset.v1beta1.ExportAssetsResponse buildPartial() {
       com.google.cloud.asset.v1beta1.ExportAssetsResponse result = new com.google.cloud.asset.v1beta1.ExportAssetsResponse(this);
       if (readTimeBuilder_ == null) {
@@ -448,39 +433,32 @@ public com.google.cloud.asset.v1beta1.ExportAssetsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.asset.v1beta1.ExportAssetsResponse) {
         return mergeFrom((com.google.cloud.asset.v1beta1.ExportAssetsResponse)other);
@@ -503,12 +481,10 @@ public Builder mergeFrom(com.google.cloud.asset.v1beta1.ExportAssetsResponse oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -532,7 +508,7 @@ public Builder mergeFrom(
         com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> readTimeBuilder_;
     /**
      * 
-     * Required. Time the snapshot was taken.
+     * Time the snapshot was taken.
      * 

      *
      * .google.protobuf.Timestamp read_time = 1;
@@ -542,7 +518,7 @@ public boolean hasReadTime() {
     }
     /**
      * 
-     * Required. Time the snapshot was taken.
+     * Time the snapshot was taken.
      * 

      *
      * .google.protobuf.Timestamp read_time = 1;
@@ -556,7 +532,7 @@ public com.google.protobuf.Timestamp getReadTime() {
     }
     /**
      * 
-     * Required. Time the snapshot was taken.
+     * Time the snapshot was taken.
      * 

      *
      * .google.protobuf.Timestamp read_time = 1;
@@ -576,7 +552,7 @@ public Builder setReadTime(com.google.protobuf.Timestamp value) {
     }
     /**
      * 
-     * Required. Time the snapshot was taken.
+     * Time the snapshot was taken.
      * 

      *
      * .google.protobuf.Timestamp read_time = 1;
@@ -594,7 +570,7 @@ public Builder setReadTime(
     }
     /**
      * 
-     * Required. Time the snapshot was taken.
+     * Time the snapshot was taken.
      * 

      *
      * .google.protobuf.Timestamp read_time = 1;
@@ -616,7 +592,7 @@ public Builder mergeReadTime(com.google.protobuf.Timestamp value) {
     }
     /**
      * 
-     * Required. Time the snapshot was taken.
+     * Time the snapshot was taken.
      * 

      *
      * .google.protobuf.Timestamp read_time = 1;
@@ -634,7 +610,7 @@ public Builder clearReadTime() {
     }
     /**
      * 
-     * Required. Time the snapshot was taken.
+     * Time the snapshot was taken.
      * 

      *
      * .google.protobuf.Timestamp read_time = 1;
@@ -646,7 +622,7 @@ public com.google.protobuf.Timestamp.Builder getReadTimeBuilder() {
     }
     /**
      * 
-     * Required. Time the snapshot was taken.
+     * Time the snapshot was taken.
      * 

      *
      * .google.protobuf.Timestamp read_time = 1;
@@ -661,7 +637,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
     }
     /**
      * 
-     * Required. Time the snapshot was taken.
+     * Time the snapshot was taken.
      * 

      *
      * .google.protobuf.Timestamp read_time = 1;
@@ -685,7 +661,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
         com.google.cloud.asset.v1beta1.OutputConfig, com.google.cloud.asset.v1beta1.OutputConfig.Builder, com.google.cloud.asset.v1beta1.OutputConfigOrBuilder> outputConfigBuilder_;
     /**
      * 
-     * Required. Output configuration indicating where the results were output to.
+     * Output configuration indicating where the results were output to.
      * All results are in JSON format.
      * 

      *
@@ -696,7 +672,7 @@ public boolean hasOutputConfig() {
     }
     /**
      * 
-     * Required. Output configuration indicating where the results were output to.
+     * Output configuration indicating where the results were output to.
      * All results are in JSON format.
      * 

      *
@@ -711,7 +687,7 @@ public com.google.cloud.asset.v1beta1.OutputConfig getOutputConfig() {
     }
     /**
      * 
-     * Required. Output configuration indicating where the results were output to.
+     * Output configuration indicating where the results were output to.
      * All results are in JSON format.
      * 

      *
@@ -732,7 +708,7 @@ public Builder setOutputConfig(com.google.cloud.asset.v1beta1.OutputConfig value
     }
     /**
      * 
-     * Required. Output configuration indicating where the results were output to.
+     * Output configuration indicating where the results were output to.
      * All results are in JSON format.
      * 

      *
@@ -751,7 +727,7 @@ public Builder setOutputConfig(
     }
     /**
      * 
-     * Required. Output configuration indicating where the results were output to.
+     * Output configuration indicating where the results were output to.
      * All results are in JSON format.
      * 

      *
@@ -774,7 +750,7 @@ public Builder mergeOutputConfig(com.google.cloud.asset.v1beta1.OutputConfig val
     }
     /**
      * 
-     * Required. Output configuration indicating where the results were output to.
+     * Output configuration indicating where the results were output to.
      * All results are in JSON format.
      * 

      *
@@ -793,7 +769,7 @@ public Builder clearOutputConfig() {
     }
     /**
      * 
-     * Required. Output configuration indicating where the results were output to.
+     * Output configuration indicating where the results were output to.
      * All results are in JSON format.
      * 

      *
@@ -806,7 +782,7 @@ public com.google.cloud.asset.v1beta1.OutputConfig.Builder getOutputConfigBuilde
     }
     /**
      * 
-     * Required. Output configuration indicating where the results were output to.
+     * Output configuration indicating where the results were output to.
      * All results are in JSON format.
      * 

      *
@@ -822,7 +798,7 @@ public com.google.cloud.asset.v1beta1.OutputConfigOrBuilder getOutputConfigOrBui
     }
     /**
      * 
-     * Required. Output configuration indicating where the results were output to.
+     * Output configuration indicating where the results were output to.
      * All results are in JSON format.
      * 

      *
@@ -841,13 +817,11 @@ public com.google.cloud.asset.v1beta1.OutputConfigOrBuilder getOutputConfigOrBui
       }
       return outputConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -869,12 +843,11 @@ public static com.google.cloud.asset.v1beta1.ExportAssetsResponse getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ExportAssetsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ExportAssetsResponse(input, extensionRegistry);
+        return new ExportAssetsResponse(input, extensionRegistry);
     }
   };
 
@@ -887,7 +860,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.asset.v1beta1.ExportAssetsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsResponseOrBuilder.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsResponseOrBuilder.java
index 273a1d9e89e7..ac4d355e6c05 100644
--- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsResponseOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/ExportAssetsResponseOrBuilder.java
@@ -9,7 +9,7 @@ public interface ExportAssetsResponseOrBuilder extends
 
   /**
    * 
-   * Required. Time the snapshot was taken.
+   * Time the snapshot was taken.
    * 

    *
    * .google.protobuf.Timestamp read_time = 1;
@@ -17,7 +17,7 @@ public interface ExportAssetsResponseOrBuilder extends
   boolean hasReadTime();
   /**
    * 
-   * Required. Time the snapshot was taken.
+   * Time the snapshot was taken.
    * 

    *
    * .google.protobuf.Timestamp read_time = 1;
@@ -25,7 +25,7 @@ public interface ExportAssetsResponseOrBuilder extends
   com.google.protobuf.Timestamp getReadTime();
   /**
    * 
-   * Required. Time the snapshot was taken.
+   * Time the snapshot was taken.
    * 

    *
    * .google.protobuf.Timestamp read_time = 1;
@@ -34,7 +34,7 @@ public interface ExportAssetsResponseOrBuilder extends
 
   /**
    * 
-   * Required. Output configuration indicating where the results were output to.
+   * Output configuration indicating where the results were output to.
    * All results are in JSON format.
    * 

    *
@@ -43,7 +43,7 @@ public interface ExportAssetsResponseOrBuilder extends
   boolean hasOutputConfig();
   /**
    * 
-   * Required. Output configuration indicating where the results were output to.
+   * Output configuration indicating where the results were output to.
    * All results are in JSON format.
    * 

    *
@@ -52,7 +52,7 @@ public interface ExportAssetsResponseOrBuilder extends
   com.google.cloud.asset.v1beta1.OutputConfig getOutputConfig();
   /**
    * 
-   * Required. Output configuration indicating where the results were output to.
+   * Output configuration indicating where the results were output to.
    * All results are in JSON format.
    * 

    *
diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/GcsDestination.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/GcsDestination.java
index 213c84e267d4..ba6b29a17806 100644
--- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/GcsDestination.java
+++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/GcsDestination.java
@@ -33,9 +33,6 @@ private GcsDestination(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GcsDestination(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            uri_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GcsDestination(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            uri_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GcsDestination(
     return com.google.cloud.asset.v1beta1.AssetServiceProto.internal_static_google_cloud_asset_v1beta1_GcsDestination_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.asset.v1beta1.AssetServiceProto.internal_static_google_cloud_asset_v1beta1_GcsDestination_fieldAccessorTable
@@ -134,7 +130,6 @@ public java.lang.String getUri() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -144,7 +139,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getUriBytes().isEmpty()) {
@@ -153,7 +147,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -268,7 +261,6 @@ public static com.google.cloud.asset.v1beta1.GcsDestination parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -276,7 +268,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.asset.v1beta1.GcsDestination prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -304,7 +295,6 @@ public static final class Builder extends
       return com.google.cloud.asset.v1beta1.AssetServiceProto.internal_static_google_cloud_asset_v1beta1_GcsDestination_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.asset.v1beta1.AssetServiceProto.internal_static_google_cloud_asset_v1beta1_GcsDestination_fieldAccessorTable
@@ -327,7 +317,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       uri_ = "";
@@ -335,18 +324,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.asset.v1beta1.AssetServiceProto.internal_static_google_cloud_asset_v1beta1_GcsDestination_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.asset.v1beta1.GcsDestination getDefaultInstanceForType() {
       return com.google.cloud.asset.v1beta1.GcsDestination.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.asset.v1beta1.GcsDestination build() {
       com.google.cloud.asset.v1beta1.GcsDestination result = buildPartial();
       if (!result.isInitialized()) {
@@ -355,7 +341,6 @@ public com.google.cloud.asset.v1beta1.GcsDestination build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.asset.v1beta1.GcsDestination buildPartial() {
       com.google.cloud.asset.v1beta1.GcsDestination result = new com.google.cloud.asset.v1beta1.GcsDestination(this);
       result.uri_ = uri_;
@@ -363,39 +348,32 @@ public com.google.cloud.asset.v1beta1.GcsDestination buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.asset.v1beta1.GcsDestination) {
         return mergeFrom((com.google.cloud.asset.v1beta1.GcsDestination)other);
@@ -416,12 +394,10 @@ public Builder mergeFrom(com.google.cloud.asset.v1beta1.GcsDestination other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -543,13 +519,11 @@ public Builder setUriBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -571,12 +545,11 @@ public static com.google.cloud.asset.v1beta1.GcsDestination getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GcsDestination parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GcsDestination(input, extensionRegistry);
+        return new GcsDestination(input, extensionRegistry);
     }
   };
 
@@ -589,7 +562,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.asset.v1beta1.GcsDestination getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/OutputConfig.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/OutputConfig.java
index b034f0192a89..fc65c32fd39d 100644
--- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/OutputConfig.java
+++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/OutputConfig.java
@@ -32,9 +32,6 @@ private OutputConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private OutputConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.asset.v1beta1.GcsDestination.Builder subBuilder = null;
             if (destinationCase_ == 1) {
@@ -60,13 +64,6 @@ private OutputConfig(
             destinationCase_ = 1;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private OutputConfig(
     return com.google.cloud.asset.v1beta1.AssetServiceProto.internal_static_google_cloud_asset_v1beta1_OutputConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.asset.v1beta1.AssetServiceProto.internal_static_google_cloud_asset_v1beta1_OutputConfig_fieldAccessorTable
@@ -167,7 +163,6 @@ public com.google.cloud.asset.v1beta1.GcsDestinationOrBuilder getGcsDestinationO
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -177,7 +172,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (destinationCase_ == 1) {
@@ -186,7 +180,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -317,7 +310,6 @@ public static com.google.cloud.asset.v1beta1.OutputConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -325,7 +317,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.asset.v1beta1.OutputConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -353,7 +344,6 @@ public static final class Builder extends
       return com.google.cloud.asset.v1beta1.AssetServiceProto.internal_static_google_cloud_asset_v1beta1_OutputConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.asset.v1beta1.AssetServiceProto.internal_static_google_cloud_asset_v1beta1_OutputConfig_fieldAccessorTable
@@ -376,7 +366,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       destinationCase_ = 0;
@@ -384,18 +373,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.asset.v1beta1.AssetServiceProto.internal_static_google_cloud_asset_v1beta1_OutputConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.asset.v1beta1.OutputConfig getDefaultInstanceForType() {
       return com.google.cloud.asset.v1beta1.OutputConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.asset.v1beta1.OutputConfig build() {
       com.google.cloud.asset.v1beta1.OutputConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -404,7 +390,6 @@ public com.google.cloud.asset.v1beta1.OutputConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.asset.v1beta1.OutputConfig buildPartial() {
       com.google.cloud.asset.v1beta1.OutputConfig result = new com.google.cloud.asset.v1beta1.OutputConfig(this);
       if (destinationCase_ == 1) {
@@ -419,39 +404,32 @@ public com.google.cloud.asset.v1beta1.OutputConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.asset.v1beta1.OutputConfig) {
         return mergeFrom((com.google.cloud.asset.v1beta1.OutputConfig)other);
@@ -477,12 +455,10 @@ public Builder mergeFrom(com.google.cloud.asset.v1beta1.OutputConfig other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -687,13 +663,11 @@ public com.google.cloud.asset.v1beta1.GcsDestinationOrBuilder getGcsDestinationO
       onChanged();;
       return gcsDestinationBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -715,12 +689,11 @@ public static com.google.cloud.asset.v1beta1.OutputConfig getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public OutputConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new OutputConfig(input, extensionRegistry);
+        return new OutputConfig(input, extensionRegistry);
     }
   };
 
@@ -733,7 +706,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.asset.v1beta1.OutputConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/Resource.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/Resource.java
index fdddfefe18f6..465771c7a156 100644
--- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/Resource.java
+++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/Resource.java
@@ -37,9 +37,6 @@ private Resource(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private Resource(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -94,13 +98,6 @@ private Resource(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -118,7 +115,6 @@ private Resource(
     return com.google.cloud.asset.v1beta1.AssetProto.internal_static_google_cloud_asset_v1beta1_Resource_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.asset.v1beta1.AssetProto.internal_static_google_cloud_asset_v1beta1_Resource_fieldAccessorTable
@@ -403,7 +399,6 @@ public com.google.protobuf.StructOrBuilder getDataOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -413,7 +408,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getVersionBytes().isEmpty()) {
@@ -437,7 +431,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -593,7 +586,6 @@ public static com.google.cloud.asset.v1beta1.Resource parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -601,7 +593,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.asset.v1beta1.Resource prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -629,7 +620,6 @@ public static final class Builder extends
       return com.google.cloud.asset.v1beta1.AssetProto.internal_static_google_cloud_asset_v1beta1_Resource_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.asset.v1beta1.AssetProto.internal_static_google_cloud_asset_v1beta1_Resource_fieldAccessorTable
@@ -652,7 +642,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       version_ = "";
@@ -674,18 +663,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.asset.v1beta1.AssetProto.internal_static_google_cloud_asset_v1beta1_Resource_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.asset.v1beta1.Resource getDefaultInstanceForType() {
       return com.google.cloud.asset.v1beta1.Resource.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.asset.v1beta1.Resource build() {
       com.google.cloud.asset.v1beta1.Resource result = buildPartial();
       if (!result.isInitialized()) {
@@ -694,7 +680,6 @@ public com.google.cloud.asset.v1beta1.Resource build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.asset.v1beta1.Resource buildPartial() {
       com.google.cloud.asset.v1beta1.Resource result = new com.google.cloud.asset.v1beta1.Resource(this);
       result.version_ = version_;
@@ -711,39 +696,32 @@ public com.google.cloud.asset.v1beta1.Resource buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.asset.v1beta1.Resource) {
         return mergeFrom((com.google.cloud.asset.v1beta1.Resource)other);
@@ -783,12 +761,10 @@ public Builder mergeFrom(com.google.cloud.asset.v1beta1.Resource other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1488,13 +1464,11 @@ public com.google.protobuf.StructOrBuilder getDataOrBuilder() {
       }
       return dataBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1516,12 +1490,11 @@ public static com.google.cloud.asset.v1beta1.Resource getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Resource parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Resource(input, extensionRegistry);
+        return new Resource(input, extensionRegistry);
     }
   };
 
@@ -1534,7 +1507,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.asset.v1beta1.Resource getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/TemporalAsset.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/TemporalAsset.java
index 517dccf7aa28..1fa19c5ec39b 100644
--- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/TemporalAsset.java
+++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/TemporalAsset.java
@@ -34,9 +34,6 @@ private TemporalAsset(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private TemporalAsset(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.asset.v1beta1.TimeWindow.Builder subBuilder = null;
             if (window_ != null) {
@@ -79,13 +83,6 @@ private TemporalAsset(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private TemporalAsset(
     return com.google.cloud.asset.v1beta1.AssetProto.internal_static_google_cloud_asset_v1beta1_TemporalAsset_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.asset.v1beta1.AssetProto.internal_static_google_cloud_asset_v1beta1_TemporalAsset_fieldAccessorTable
@@ -191,7 +187,6 @@ public com.google.cloud.asset.v1beta1.AssetOrBuilder getAssetOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -201,7 +196,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (window_ != null) {
@@ -216,7 +210,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -359,7 +352,6 @@ public static com.google.cloud.asset.v1beta1.TemporalAsset parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -367,7 +359,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.asset.v1beta1.TemporalAsset prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -396,7 +387,6 @@ public static final class Builder extends
       return com.google.cloud.asset.v1beta1.AssetProto.internal_static_google_cloud_asset_v1beta1_TemporalAsset_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.asset.v1beta1.AssetProto.internal_static_google_cloud_asset_v1beta1_TemporalAsset_fieldAccessorTable
@@ -419,7 +409,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (windowBuilder_ == null) {
@@ -439,18 +428,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.asset.v1beta1.AssetProto.internal_static_google_cloud_asset_v1beta1_TemporalAsset_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.asset.v1beta1.TemporalAsset getDefaultInstanceForType() {
       return com.google.cloud.asset.v1beta1.TemporalAsset.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.asset.v1beta1.TemporalAsset build() {
       com.google.cloud.asset.v1beta1.TemporalAsset result = buildPartial();
       if (!result.isInitialized()) {
@@ -459,7 +445,6 @@ public com.google.cloud.asset.v1beta1.TemporalAsset build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.asset.v1beta1.TemporalAsset buildPartial() {
       com.google.cloud.asset.v1beta1.TemporalAsset result = new com.google.cloud.asset.v1beta1.TemporalAsset(this);
       if (windowBuilder_ == null) {
@@ -477,39 +462,32 @@ public com.google.cloud.asset.v1beta1.TemporalAsset buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.asset.v1beta1.TemporalAsset) {
         return mergeFrom((com.google.cloud.asset.v1beta1.TemporalAsset)other);
@@ -535,12 +513,10 @@ public Builder mergeFrom(com.google.cloud.asset.v1beta1.TemporalAsset other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -902,13 +878,11 @@ public com.google.cloud.asset.v1beta1.AssetOrBuilder getAssetOrBuilder() {
       }
       return assetBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -930,12 +904,11 @@ public static com.google.cloud.asset.v1beta1.TemporalAsset getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TemporalAsset parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TemporalAsset(input, extensionRegistry);
+        return new TemporalAsset(input, extensionRegistry);
     }
   };
 
@@ -948,7 +921,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.asset.v1beta1.TemporalAsset getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/TimeWindow.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/TimeWindow.java
index 796a4681564f..1bc5d2c38b9a 100644
--- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/TimeWindow.java
+++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/TimeWindow.java
@@ -32,9 +32,6 @@ private TimeWindow(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private TimeWindow(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.protobuf.Timestamp.Builder subBuilder = null;
             if (startTime_ != null) {
@@ -72,13 +76,6 @@ private TimeWindow(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private TimeWindow(
     return com.google.cloud.asset.v1beta1.AssetProto.internal_static_google_cloud_asset_v1beta1_TimeWindow_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.asset.v1beta1.AssetProto.internal_static_google_cloud_asset_v1beta1_TimeWindow_fieldAccessorTable
@@ -109,7 +105,6 @@ private TimeWindow(
   /**
    * 
    * Start time of the time window (inclusive).
-   * Infinite past if not specified.
    * 

    *
    * .google.protobuf.Timestamp start_time = 1;
@@ -120,7 +115,6 @@ public boolean hasStartTime() {
   /**
    * 
    * Start time of the time window (inclusive).
-   * Infinite past if not specified.
    * 

    *
    * .google.protobuf.Timestamp start_time = 1;
@@ -131,7 +125,6 @@ public com.google.protobuf.Timestamp getStartTime() {
   /**
    * 
    * Start time of the time window (inclusive).
-   * Infinite past if not specified.
    * 

    *
    * .google.protobuf.Timestamp start_time = 1;
@@ -145,7 +138,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
   /**
    * 
    * End time of the time window (exclusive).
-   * Infinite future if not specified.
+   * Current timestamp if not specified.
    * 

    *
    * .google.protobuf.Timestamp end_time = 2;
@@ -156,7 +149,7 @@ public boolean hasEndTime() {
   /**
    * 
    * End time of the time window (exclusive).
-   * Infinite future if not specified.
+   * Current timestamp if not specified.
    * 

    *
    * .google.protobuf.Timestamp end_time = 2;
@@ -167,7 +160,7 @@ public com.google.protobuf.Timestamp getEndTime() {
   /**
    * 
    * End time of the time window (exclusive).
-   * Infinite future if not specified.
+   * Current timestamp if not specified.
    * 

    *
    * .google.protobuf.Timestamp end_time = 2;
@@ -177,7 +170,6 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -187,7 +179,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (startTime_ != null) {
@@ -199,7 +190,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -333,7 +323,6 @@ public static com.google.cloud.asset.v1beta1.TimeWindow parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -341,7 +330,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.asset.v1beta1.TimeWindow prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -369,7 +357,6 @@ public static final class Builder extends
       return com.google.cloud.asset.v1beta1.AssetProto.internal_static_google_cloud_asset_v1beta1_TimeWindow_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.asset.v1beta1.AssetProto.internal_static_google_cloud_asset_v1beta1_TimeWindow_fieldAccessorTable
@@ -392,7 +379,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (startTimeBuilder_ == null) {
@@ -410,18 +396,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.asset.v1beta1.AssetProto.internal_static_google_cloud_asset_v1beta1_TimeWindow_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.asset.v1beta1.TimeWindow getDefaultInstanceForType() {
       return com.google.cloud.asset.v1beta1.TimeWindow.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.asset.v1beta1.TimeWindow build() {
       com.google.cloud.asset.v1beta1.TimeWindow result = buildPartial();
       if (!result.isInitialized()) {
@@ -430,7 +413,6 @@ public com.google.cloud.asset.v1beta1.TimeWindow build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.asset.v1beta1.TimeWindow buildPartial() {
       com.google.cloud.asset.v1beta1.TimeWindow result = new com.google.cloud.asset.v1beta1.TimeWindow(this);
       if (startTimeBuilder_ == null) {
@@ -447,39 +429,32 @@ public com.google.cloud.asset.v1beta1.TimeWindow buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.asset.v1beta1.TimeWindow) {
         return mergeFrom((com.google.cloud.asset.v1beta1.TimeWindow)other);
@@ -502,12 +477,10 @@ public Builder mergeFrom(com.google.cloud.asset.v1beta1.TimeWindow other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -532,7 +505,6 @@ public Builder mergeFrom(
     /**
      * 
      * Start time of the time window (inclusive).
-     * Infinite past if not specified.
      * 

      *
      * .google.protobuf.Timestamp start_time = 1;
@@ -543,7 +515,6 @@ public boolean hasStartTime() {
     /**
      * 
      * Start time of the time window (inclusive).
-     * Infinite past if not specified.
      * 

      *
      * .google.protobuf.Timestamp start_time = 1;
@@ -558,7 +529,6 @@ public com.google.protobuf.Timestamp getStartTime() {
     /**
      * 
      * Start time of the time window (inclusive).
-     * Infinite past if not specified.
      * 

      *
      * .google.protobuf.Timestamp start_time = 1;
@@ -579,7 +549,6 @@ public Builder setStartTime(com.google.protobuf.Timestamp value) {
     /**
      * 
      * Start time of the time window (inclusive).
-     * Infinite past if not specified.
      * 

      *
      * .google.protobuf.Timestamp start_time = 1;
@@ -598,7 +567,6 @@ public Builder setStartTime(
     /**
      * 
      * Start time of the time window (inclusive).
-     * Infinite past if not specified.
      * 

      *
      * .google.protobuf.Timestamp start_time = 1;
@@ -621,7 +589,6 @@ public Builder mergeStartTime(com.google.protobuf.Timestamp value) {
     /**
      * 
      * Start time of the time window (inclusive).
-     * Infinite past if not specified.
      * 

      *
      * .google.protobuf.Timestamp start_time = 1;
@@ -640,7 +607,6 @@ public Builder clearStartTime() {
     /**
      * 
      * Start time of the time window (inclusive).
-     * Infinite past if not specified.
      * 

      *
      * .google.protobuf.Timestamp start_time = 1;
@@ -653,7 +619,6 @@ public com.google.protobuf.Timestamp.Builder getStartTimeBuilder() {
     /**
      * 
      * Start time of the time window (inclusive).
-     * Infinite past if not specified.
      * 

      *
      * .google.protobuf.Timestamp start_time = 1;
@@ -669,7 +634,6 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
     /**
      * 
      * Start time of the time window (inclusive).
-     * Infinite past if not specified.
      * 

      *
      * .google.protobuf.Timestamp start_time = 1;
@@ -694,7 +658,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
     /**
      * 
      * End time of the time window (exclusive).
-     * Infinite future if not specified.
+     * Current timestamp if not specified.
      * 

      *
      * .google.protobuf.Timestamp end_time = 2;
@@ -705,7 +669,7 @@ public boolean hasEndTime() {
     /**
      * 
      * End time of the time window (exclusive).
-     * Infinite future if not specified.
+     * Current timestamp if not specified.
      * 

      *
      * .google.protobuf.Timestamp end_time = 2;
@@ -720,7 +684,7 @@ public com.google.protobuf.Timestamp getEndTime() {
     /**
      * 
      * End time of the time window (exclusive).
-     * Infinite future if not specified.
+     * Current timestamp if not specified.
      * 

      *
      * .google.protobuf.Timestamp end_time = 2;
@@ -741,7 +705,7 @@ public Builder setEndTime(com.google.protobuf.Timestamp value) {
     /**
      * 
      * End time of the time window (exclusive).
-     * Infinite future if not specified.
+     * Current timestamp if not specified.
      * 

      *
      * .google.protobuf.Timestamp end_time = 2;
@@ -760,7 +724,7 @@ public Builder setEndTime(
     /**
      * 
      * End time of the time window (exclusive).
-     * Infinite future if not specified.
+     * Current timestamp if not specified.
      * 

      *
      * .google.protobuf.Timestamp end_time = 2;
@@ -783,7 +747,7 @@ public Builder mergeEndTime(com.google.protobuf.Timestamp value) {
     /**
      * 
      * End time of the time window (exclusive).
-     * Infinite future if not specified.
+     * Current timestamp if not specified.
      * 

      *
      * .google.protobuf.Timestamp end_time = 2;
@@ -802,7 +766,7 @@ public Builder clearEndTime() {
     /**
      * 
      * End time of the time window (exclusive).
-     * Infinite future if not specified.
+     * Current timestamp if not specified.
      * 

      *
      * .google.protobuf.Timestamp end_time = 2;
@@ -815,7 +779,7 @@ public com.google.protobuf.Timestamp.Builder getEndTimeBuilder() {
     /**
      * 
      * End time of the time window (exclusive).
-     * Infinite future if not specified.
+     * Current timestamp if not specified.
      * 

      *
      * .google.protobuf.Timestamp end_time = 2;
@@ -831,7 +795,7 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
     /**
      * 
      * End time of the time window (exclusive).
-     * Infinite future if not specified.
+     * Current timestamp if not specified.
      * 

      *
      * .google.protobuf.Timestamp end_time = 2;
@@ -849,13 +813,11 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
       }
       return endTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -877,12 +839,11 @@ public static com.google.cloud.asset.v1beta1.TimeWindow getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TimeWindow parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TimeWindow(input, extensionRegistry);
+        return new TimeWindow(input, extensionRegistry);
     }
   };
 
@@ -895,7 +856,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.asset.v1beta1.TimeWindow getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/TimeWindowOrBuilder.java b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/TimeWindowOrBuilder.java
index bdff1bf2e9cb..ed8fb4bc6080 100644
--- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/TimeWindowOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/java/com/google/cloud/asset/v1beta1/TimeWindowOrBuilder.java
@@ -10,7 +10,6 @@ public interface TimeWindowOrBuilder extends
   /**
    * 
    * Start time of the time window (inclusive).
-   * Infinite past if not specified.
    * 

    *
    * .google.protobuf.Timestamp start_time = 1;
@@ -19,7 +18,6 @@ public interface TimeWindowOrBuilder extends
   /**
    * 
    * Start time of the time window (inclusive).
-   * Infinite past if not specified.
    * 

    *
    * .google.protobuf.Timestamp start_time = 1;
@@ -28,7 +26,6 @@ public interface TimeWindowOrBuilder extends
   /**
    * 
    * Start time of the time window (inclusive).
-   * Infinite past if not specified.
    * 

    *
    * .google.protobuf.Timestamp start_time = 1;
@@ -38,7 +35,7 @@ public interface TimeWindowOrBuilder extends
   /**
    * 
    * End time of the time window (exclusive).
-   * Infinite future if not specified.
+   * Current timestamp if not specified.
    * 

    *
    * .google.protobuf.Timestamp end_time = 2;
@@ -47,7 +44,7 @@ public interface TimeWindowOrBuilder extends
   /**
    * 
    * End time of the time window (exclusive).
-   * Infinite future if not specified.
+   * Current timestamp if not specified.
    * 

    *
    * .google.protobuf.Timestamp end_time = 2;
@@ -56,7 +53,7 @@ public interface TimeWindowOrBuilder extends
   /**
    * 
    * End time of the time window (exclusive).
-   * Infinite future if not specified.
+   * Current timestamp if not specified.
    * 

    *
    * .google.protobuf.Timestamp end_time = 2;
diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/proto/google/cloud/asset/v1beta1/asset_service.proto b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/proto/google/cloud/asset/v1beta1/asset_service.proto
index da859d102f3b..b64502f68e42 100644
--- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/proto/google/cloud/asset/v1beta1/asset_service.proto
+++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/proto/google/cloud/asset/v1beta1/asset_service.proto
@@ -1,4 +1,4 @@
-// Copyright 2018 Google LLC
+// Copyright 2018 Google LLC.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//
 
 syntax = "proto3";
 
@@ -32,7 +33,7 @@ option php_namespace = "Google\\Cloud\\Asset\\V1beta1";
 // Asset service definition.
 service AssetService {
   // Exports assets with time and resource types to a given Google Cloud Storage
-  // location. The output format is newline delimited JSON.
+  // location. The output format is newline-delimited JSON.
   // This API implements the [google.longrunning.Operation][google.longrunning.Operation] API allowing users
   // to keep track of the export.
   rpc ExportAssets(ExportAssetsRequest) returns (google.longrunning.Operation) {
@@ -63,24 +64,25 @@ service AssetService {
 
 // Export asset request.
 message ExportAssetsRequest {
-  // Required. The relative name of the root asset. It can only be an
-  // organization number (e.g. "organizations/123") or a project number
-  // (e.g. "projects/12345").
+  // Required. The relative name of the root asset. Can only be an organization
+  // number (such as "organizations/123"), or a project id (such as
+  // "projects/my-project-id") or a project number (such as "projects/12345").
   string parent = 1;
 
-  // Timestamp to take an asset snapshot. This can only be current or past
-  // time. If not specified, the current time will be used. Due to delays in
-  // resource data collection and indexing, there is a volatile window during
-  // which running the same query may get different results.
+  // Timestamp to take an asset snapshot. This can only be set to a timestamp in
+  // the past or of the current time. If not specified, the current time will be
+  // used. Due to delays in resource data collection and indexing, there is a
+  // volatile window during which running the same query may get different
+  // results.
   google.protobuf.Timestamp read_time = 2;
 
-  // A list of asset types to take a snapshot for. Example:
+  // A list of asset types of which to take a snapshot for. Example:
   // "google.compute.disk". If specified, only matching assets will be returned.
   repeated string asset_types = 3;
 
-  // A list of asset content types. If specified, only matching content will be
-  // returned. Otherwise, no content but the asset name will be returned.
-  repeated ContentType content_types = 4;
+  // Asset content type. If not specified, no content but the asset name will be
+  // returned.
+  ContentType content_type = 4;
 
   // Required. Output configuration indicating where the results will be output
   // to. All results will be in newline delimited JSON format.
@@ -91,10 +93,10 @@ message ExportAssetsRequest {
 // [google.longrunning.Operations.GetOperation][google.longrunning.Operations.GetOperation] method in the returned
 // [google.longrunning.Operation.response][google.longrunning.Operation.response] field.
 message ExportAssetsResponse {
-  // Required. Time the snapshot was taken.
+  // Time the snapshot was taken.
   google.protobuf.Timestamp read_time = 1;
 
-  // Required. Output configuration indicating where the results were output to.
+  // Output configuration indicating where the results were output to.
   // All results are in JSON format.
   OutputConfig output_config = 2;
 }
@@ -102,8 +104,8 @@ message ExportAssetsResponse {
 // Batch get assets history request.
 message BatchGetAssetsHistoryRequest {
   // Required. The relative name of the root asset. It can only be an
-  // organization ID (e.g. "organizations/123") or a project ID
-  // (e.g. "projects/12345").
+  // organization number (such as "organizations/123"), or a project id (such as
+  // "projects/my-project-id")"or a project number (such as "projects/12345").
   string parent = 1;
 
   // A list of the full names of the assets. See:
@@ -111,15 +113,16 @@ message BatchGetAssetsHistoryRequest {
   // Example:
   // "//compute.googleapis.com/projects/my_project_123/zones/zone1/instances/instance1".
   //
-  // The request becomes a no-op if the asset name list is empty.
+  // The request becomes a no-op if the asset name list is empty, and the max
+  // size of the asset name list is 100 in one request.
   repeated string asset_names = 2;
 
   // Required. The content type.
   ContentType content_type = 3;
 
-  // Required. The time window for the asset history. The returned results
-  // contain all temporal assets whose time window overlap with
-  // read_time_window.
+  // Required. The time window for the asset history. The start time is
+  // required. The returned results contain all temporal assets whose time
+  // window overlap with read_time_window.
   TimeWindow read_time_window = 4;
 }
 
diff --git a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/proto/google/cloud/asset/v1beta1/assets.proto b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/proto/google/cloud/asset/v1beta1/assets.proto
index ca4f144f08ab..db270b0879fa 100644
--- a/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/proto/google/cloud/asset/v1beta1/assets.proto
+++ b/google-api-grpc/proto-google-cloud-asset-v1beta1/src/main/proto/google/cloud/asset/v1beta1/assets.proto
@@ -1,4 +1,4 @@
-// Copyright 2018 Google LLC
+// Copyright 2018 Google LLC.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//
 
 syntax = "proto3";
 
@@ -46,11 +47,10 @@ message TemporalAsset {
 // A time window of [start_time, end_time).
 message TimeWindow {
   // Start time of the time window (inclusive).
-  // Infinite past if not specified.
   google.protobuf.Timestamp start_time = 1;
 
   // End time of the time window (exclusive).
-  // Infinite future if not specified.
+  // Current timestamp if not specified.
   google.protobuf.Timestamp end_time = 2;
 }
 
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/AnnotationPayload.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/AnnotationPayload.java
index 39376e0c6f04..7df820d2d8a4 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/AnnotationPayload.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/AnnotationPayload.java
@@ -34,9 +34,6 @@ private AnnotationPayload(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private AnnotationPayload(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -88,13 +92,6 @@ private AnnotationPayload(
             displayName_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -112,7 +109,6 @@ private AnnotationPayload(
     return com.google.cloud.automl.v1beta1.AnnotationPayloadOuterClass.internal_static_google_cloud_automl_v1beta1_AnnotationPayload_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.AnnotationPayloadOuterClass.internal_static_google_cloud_automl_v1beta1_AnnotationPayload_fieldAccessorTable
@@ -331,7 +327,6 @@ public java.lang.String getDisplayName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -341,7 +336,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getAnnotationSpecIdBytes().isEmpty()) {
@@ -359,7 +353,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -516,7 +509,6 @@ public static com.google.cloud.automl.v1beta1.AnnotationPayload parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -524,7 +516,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.AnnotationPayload prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -552,7 +543,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.AnnotationPayloadOuterClass.internal_static_google_cloud_automl_v1beta1_AnnotationPayload_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.AnnotationPayloadOuterClass.internal_static_google_cloud_automl_v1beta1_AnnotationPayload_fieldAccessorTable
@@ -575,7 +565,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       annotationSpecId_ = "";
@@ -587,18 +576,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.AnnotationPayloadOuterClass.internal_static_google_cloud_automl_v1beta1_AnnotationPayload_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.AnnotationPayload getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.AnnotationPayload.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.AnnotationPayload build() {
       com.google.cloud.automl.v1beta1.AnnotationPayload result = buildPartial();
       if (!result.isInitialized()) {
@@ -607,7 +593,6 @@ public com.google.cloud.automl.v1beta1.AnnotationPayload build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.AnnotationPayload buildPartial() {
       com.google.cloud.automl.v1beta1.AnnotationPayload result = new com.google.cloud.automl.v1beta1.AnnotationPayload(this);
       if (detailCase_ == 2) {
@@ -631,39 +616,32 @@ public com.google.cloud.automl.v1beta1.AnnotationPayload buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.AnnotationPayload) {
         return mergeFrom((com.google.cloud.automl.v1beta1.AnnotationPayload)other);
@@ -701,12 +679,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.AnnotationPayload other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1291,13 +1267,11 @@ public Builder setDisplayNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1319,12 +1293,11 @@ public static com.google.cloud.automl.v1beta1.AnnotationPayload getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnnotationPayload parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotationPayload(input, extensionRegistry);
+        return new AnnotationPayload(input, extensionRegistry);
     }
   };
 
@@ -1337,7 +1310,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.AnnotationPayload getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/AnnotationPayloadOuterClass.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/AnnotationPayloadOuterClass.java
index 25a3487d2f9b..8385f6815ec2 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/AnnotationPayloadOuterClass.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/AnnotationPayloadOuterClass.java
@@ -37,7 +37,7 @@ public static void registerAllExtensions(
       "slation\030\002 \001(\01322.google.cloud.automl.v1be" +
       "ta1.TranslationAnnotationH\000\022O\n\016classific" +
       "ation\030\003 \001(\01325.google.cloud.automl.v1beta" +
-      "1.ClassificationAnnotationH\000\022\032\n\022annotati" +
+      "1.ClassificationAnnotationH\000\022\032\n\022annotati",
       "on_spec_id\030\001 \001(\t\022\024\n\014display_name\030\005 \001(\tB\010" +
       "\n\006detailBf\n\037com.google.cloud.automl.v1be" +
       "ta1P\001ZAgoogle.golang.org/genproto/google" +
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/AutoMlProto.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/AutoMlProto.java
index bcf6df796576..5b8584508667 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/AutoMlProto.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/AutoMlProto.java
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       "oogle/cloud/automl/v1beta1/model.proto\0322" +
       "google/cloud/automl/v1beta1/model_evalua" +
       "tion.proto\032,google/cloud/automl/v1beta1/" +
-      "operations.proto\032#google/longrunning/ope" +
+      "operations.proto\032#google/longrunning/ope",
       "rations.proto\032 google/protobuf/field_mas" +
       "k.proto\"]\n\024CreateDatasetRequest\022\016\n\006paren" +
       "t\030\001 \001(\t\0225\n\007dataset\030\002 \001(\0132$.google.cloud." +
@@ -127,7 +127,7 @@ public static void registerAllExtensions(
       "_size\030\004 \001(\005\022\022\n\npage_token\030\006 \001(\t\"g\n\024ListD" +
       "atasetsResponse\0226\n\010datasets\030\001 \003(\0132$.goog" +
       "le.cloud.automl.v1beta1.Dataset\022\027\n\017next_" +
-      "page_token\030\002 \001(\t\"$\n\024DeleteDatasetRequest" +
+      "page_token\030\002 \001(\t\"$\n\024DeleteDatasetRequest",
       "\022\014\n\004name\030\001 \001(\t\"a\n\021ImportDataRequest\022\014\n\004n" +
       "ame\030\001 \001(\t\022>\n\014input_config\030\003 \001(\0132(.google" +
       ".cloud.automl.v1beta1.InputConfig\"c\n\021Exp" +
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       "parent\030\001 \001(\t\0221\n\005model\030\004 \001(\0132\".google.clo" +
       "ud.automl.v1beta1.Model\"\037\n\017GetModelReque" +
       "st\022\014\n\004name\030\001 \001(\t\"Z\n\021ListModelsRequest\022\016\n" +
-      "\006parent\030\001 \001(\t\022\016\n\006filter\030\003 \001(\t\022\021\n\tpage_si" +
+      "\006parent\030\001 \001(\t\022\016\n\006filter\030\003 \001(\t\022\021\n\tpage_si",
       "ze\030\004 \001(\005\022\022\n\npage_token\030\006 \001(\t\"`\n\022ListMode" +
       "lsResponse\0221\n\005model\030\001 \003(\0132\".google.cloud" +
       ".automl.v1beta1.Model\022\027\n\017next_page_token" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "GetModelEvaluationRequest\022\014\n\004name\030\001 \001(\t\"" +
       "d\n\033ListModelEvaluationsRequest\022\016\n\006parent" +
       "\030\001 \001(\t\022\016\n\006filter\030\003 \001(\t\022\021\n\tpage_size\030\004 \001(" +
-      "\005\022\022\n\npage_token\030\006 \001(\t\"\177\n\034ListModelEvalua" +
+      "\005\022\022\n\npage_token\030\006 \001(\t\"\177\n\034ListModelEvalua",
       "tionsResponse\022F\n\020model_evaluation\030\001 \003(\0132" +
       ",.google.cloud.automl.v1beta1.ModelEvalu" +
       "ation\022\027\n\017next_page_token\030\002 \001(\t2\336\022\n\006AutoM" +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       "1beta1/{parent=projects/*/locations/*}/d" +
       "atasets:\007dataset\022\235\001\n\nGetDataset\022..google" +
       ".cloud.automl.v1beta1.GetDatasetRequest\032" +
-      "$.google.cloud.automl.v1beta1.Dataset\"9\202" +
+      "$.google.cloud.automl.v1beta1.Dataset\"9\202",
       "\323\344\223\0023\0221/v1beta1/{name=projects/*/locatio" +
       "ns/*/datasets/*}\022\256\001\n\014ListDatasets\0220.goog" +
       "le.cloud.automl.v1beta1.ListDatasetsRequ" +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       "leteDataset\0221.google.cloud.automl.v1beta" +
       "1.DeleteDatasetRequest\032\035.google.longrunn" +
       "ing.Operation\"9\202\323\344\223\0023*1/v1beta1/{name=pr" +
-      "ojects/*/locations/*/datasets/*}\022\244\001\n\nImp" +
+      "ojects/*/locations/*/datasets/*}\022\244\001\n\nImp",
       "ortData\022..google.cloud.automl.v1beta1.Im" +
       "portDataRequest\032\035.google.longrunning.Ope" +
       "ration\"G\202\323\344\223\002A\"\202\323\344\223\0028\"//v1beta1" +
       "/{parent=projects/*/locations/*}/models:" +
       "\005model\022\225\001\n\010GetModel\022,.google.cloud.autom" +
@@ -187,7 +187,7 @@ public static void registerAllExtensions(
       "\001\n\nListModels\022..google.cloud.automl.v1be" +
       "ta1.ListModelsRequest\032/.google.cloud.aut" +
       "oml.v1beta1.ListModelsResponse\"7\202\323\344\223\0021\022/" +
-      "/v1beta1/{parent=projects/*/locations/*}" +
+      "/v1beta1/{parent=projects/*/locations/*}",
       "/models\022\226\001\n\013DeleteModel\022/.google.cloud.a" +
       "utoml.v1beta1.DeleteModelRequest\032\035.googl" +
       "e.longrunning.Operation\"7\202\323\344\223\0021*//v1beta" +
@@ -197,7 +197,7 @@ public static void registerAllExtensions(
       "unning.Operation\"A\202\323\344\223\002;\"6/v1beta1/{name" +
       "=projects/*/locations/*/models/*}:deploy" +
       ":\001*\022\246\001\n\rUndeployModel\0221.google.cloud.aut" +
-      "oml.v1beta1.UndeployModelRequest\032\035.googl" +
+      "oml.v1beta1.UndeployModelRequest\032\035.googl",
       "e.longrunning.Operation\"C\202\323\344\223\002=\"8/v1beta" +
       "1/{name=projects/*/locations/*/models/*}" +
       ":undeploy:\001*\022\306\001\n\022GetModelEvaluation\0226.go" +
@@ -207,7 +207,7 @@ public static void registerAllExtensions(
       "e=projects/*/locations/*/models/*/modelE" +
       "valuations/*}\022\327\001\n\024ListModelEvaluations\0228" +
       ".google.cloud.automl.v1beta1.ListModelEv" +
-      "aluationsRequest\0329.google.cloud.automl.v" +
+      "aluationsRequest\0329.google.cloud.automl.v",
       "1beta1.ListModelEvaluationsResponse\"J\202\323\344" +
       "\223\002D\022B/v1beta1/{parent=projects/*/locatio" +
       "ns/*/models/*}/modelEvaluationsBs\n\037com.g" +
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ClassificationProto.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ClassificationProto.java
index 2243f89db585..f878e0ca3c0f 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ClassificationProto.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ClassificationProto.java
@@ -196,9 +196,6 @@ private ClassificationAnnotation(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -210,11 +207,6 @@ private ClassificationAnnotation(
             case 0:
               done = true;
               break;
-            case 13: {
-
-              score_ = input.readFloat();
-              break;
-            }
             default: {
               if (!parseUnknownFieldProto3(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -222,6 +214,11 @@ private ClassificationAnnotation(
               }
               break;
             }
+            case 13: {
+
+              score_ = input.readFloat();
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -239,7 +236,6 @@ private ClassificationAnnotation(
       return com.google.cloud.automl.v1beta1.ClassificationProto.internal_static_google_cloud_automl_v1beta1_ClassificationAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.ClassificationProto.internal_static_google_cloud_automl_v1beta1_ClassificationAnnotation_fieldAccessorTable
@@ -265,7 +261,6 @@ public float getScore() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -275,7 +270,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (score_ != 0F) {
@@ -284,7 +278,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -403,7 +396,6 @@ public static com.google.cloud.automl.v1beta1.ClassificationProto.Classification
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -411,7 +403,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationAnnotation prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -439,7 +430,6 @@ public static final class Builder extends
         return com.google.cloud.automl.v1beta1.ClassificationProto.internal_static_google_cloud_automl_v1beta1_ClassificationAnnotation_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.automl.v1beta1.ClassificationProto.internal_static_google_cloud_automl_v1beta1_ClassificationAnnotation_fieldAccessorTable
@@ -462,7 +452,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         score_ = 0F;
@@ -470,18 +459,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.automl.v1beta1.ClassificationProto.internal_static_google_cloud_automl_v1beta1_ClassificationAnnotation_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationAnnotation getDefaultInstanceForType() {
         return com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationAnnotation.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationAnnotation build() {
         com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationAnnotation result = buildPartial();
         if (!result.isInitialized()) {
@@ -490,7 +476,6 @@ public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationAnnotat
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationAnnotation buildPartial() {
         com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationAnnotation result = new com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationAnnotation(this);
         result.score_ = score_;
@@ -498,39 +483,32 @@ public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationAnnotat
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationAnnotation) {
           return mergeFrom((com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationAnnotation)other);
@@ -550,12 +528,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.ClassificationProto.Cla
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -623,13 +599,11 @@ public Builder clearScore() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -651,12 +625,11 @@ public static com.google.cloud.automl.v1beta1.ClassificationProto.Classification
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public ClassificationAnnotation parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ClassificationAnnotation(input, extensionRegistry);
+          return new ClassificationAnnotation(input, extensionRegistry);
       }
     };
 
@@ -669,7 +642,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationAnnotation getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -850,9 +822,6 @@ private ClassificationEvaluationMetrics(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -864,6 +833,13 @@ private ClassificationEvaluationMetrics(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 13: {
 
               auPrc_ = input.readFloat();
@@ -905,13 +881,6 @@ private ClassificationEvaluationMetrics(
               annotationSpecId_.add(s);
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -935,7 +904,6 @@ private ClassificationEvaluationMetrics(
       return com.google.cloud.automl.v1beta1.ClassificationProto.internal_static_google_cloud_automl_v1beta1_ClassificationEvaluationMetrics_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.ClassificationProto.internal_static_google_cloud_automl_v1beta1_ClassificationEvaluationMetrics_fieldAccessorTable
@@ -1050,9 +1018,6 @@ private ConfidenceMetricsEntry(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1064,6 +1029,13 @@ private ConfidenceMetricsEntry(
               case 0:
                 done = true;
                 break;
+              default: {
+                if (!parseUnknownFieldProto3(
+                    input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
               case 13: {
 
                 confidenceThreshold_ = input.readFloat();
@@ -1099,13 +1071,6 @@ private ConfidenceMetricsEntry(
                 f1ScoreAt1_ = input.readFloat();
                 break;
               }
-              default: {
-                if (!parseUnknownFieldProto3(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
             }
           }
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1123,7 +1088,6 @@ private ConfidenceMetricsEntry(
         return com.google.cloud.automl.v1beta1.ClassificationProto.internal_static_google_cloud_automl_v1beta1_ClassificationEvaluationMetrics_ConfidenceMetricsEntry_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.automl.v1beta1.ClassificationProto.internal_static_google_cloud_automl_v1beta1_ClassificationEvaluationMetrics_ConfidenceMetricsEntry_fieldAccessorTable
@@ -1227,7 +1191,6 @@ public float getF1ScoreAt1() {
       }
 
       private byte memoizedIsInitialized = -1;
-      @java.lang.Override
       public final boolean isInitialized() {
         byte isInitialized = memoizedIsInitialized;
         if (isInitialized == 1) return true;
@@ -1237,7 +1200,6 @@ public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public void writeTo(com.google.protobuf.CodedOutputStream output)
                           throws java.io.IOException {
         if (confidenceThreshold_ != 0F) {
@@ -1264,7 +1226,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         unknownFields.writeTo(output);
       }
 
-      @java.lang.Override
       public int getSerializedSize() {
         int size = memoizedSize;
         if (size != -1) return size;
@@ -1449,7 +1410,6 @@ public static com.google.cloud.automl.v1beta1.ClassificationProto.Classification
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
-      @java.lang.Override
       public Builder newBuilderForType() { return newBuilder(); }
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
@@ -1457,7 +1417,6 @@ public static Builder newBuilder() {
       public static Builder newBuilder(com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfidenceMetricsEntry prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
-      @java.lang.Override
       public Builder toBuilder() {
         return this == DEFAULT_INSTANCE
             ? new Builder() : new Builder().mergeFrom(this);
@@ -1485,7 +1444,6 @@ public static final class Builder extends
           return com.google.cloud.automl.v1beta1.ClassificationProto.internal_static_google_cloud_automl_v1beta1_ClassificationEvaluationMetrics_ConfidenceMetricsEntry_descriptor;
         }
 
-        @java.lang.Override
         protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
           return com.google.cloud.automl.v1beta1.ClassificationProto.internal_static_google_cloud_automl_v1beta1_ClassificationEvaluationMetrics_ConfidenceMetricsEntry_fieldAccessorTable
@@ -1508,7 +1466,6 @@ private void maybeForceBuilderInitialization() {
                   .alwaysUseFieldBuilders) {
           }
         }
-        @java.lang.Override
         public Builder clear() {
           super.clear();
           confidenceThreshold_ = 0F;
@@ -1528,18 +1485,15 @@ public Builder clear() {
           return this;
         }
 
-        @java.lang.Override
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
           return com.google.cloud.automl.v1beta1.ClassificationProto.internal_static_google_cloud_automl_v1beta1_ClassificationEvaluationMetrics_ConfidenceMetricsEntry_descriptor;
         }
 
-        @java.lang.Override
         public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfidenceMetricsEntry getDefaultInstanceForType() {
           return com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfidenceMetricsEntry.getDefaultInstance();
         }
 
-        @java.lang.Override
         public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfidenceMetricsEntry build() {
           com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfidenceMetricsEntry result = buildPartial();
           if (!result.isInitialized()) {
@@ -1548,7 +1502,6 @@ public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluat
           return result;
         }
 
-        @java.lang.Override
         public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfidenceMetricsEntry buildPartial() {
           com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfidenceMetricsEntry result = new com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfidenceMetricsEntry(this);
           result.confidenceThreshold_ = confidenceThreshold_;
@@ -1562,39 +1515,32 @@ public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluat
           return result;
         }
 
-        @java.lang.Override
         public Builder clone() {
           return (Builder) super.clone();
         }
-        @java.lang.Override
         public Builder setField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.setField(field, value);
         }
-        @java.lang.Override
         public Builder clearField(
             com.google.protobuf.Descriptors.FieldDescriptor field) {
           return (Builder) super.clearField(field);
         }
-        @java.lang.Override
         public Builder clearOneof(
             com.google.protobuf.Descriptors.OneofDescriptor oneof) {
           return (Builder) super.clearOneof(oneof);
         }
-        @java.lang.Override
         public Builder setRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return (Builder) super.setRepeatedField(field, index, value);
         }
-        @java.lang.Override
         public Builder addRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.addRepeatedField(field, value);
         }
-        @java.lang.Override
         public Builder mergeFrom(com.google.protobuf.Message other) {
           if (other instanceof com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfidenceMetricsEntry) {
             return mergeFrom((com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfidenceMetricsEntry)other);
@@ -1632,12 +1578,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.ClassificationProto.Cla
           return this;
         }
 
-        @java.lang.Override
         public final boolean isInitialized() {
           return true;
         }
 
-        @java.lang.Override
         public Builder mergeFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1933,13 +1877,11 @@ public Builder clearF1ScoreAt1() {
           onChanged();
           return this;
         }
-        @java.lang.Override
         public final Builder setUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.setUnknownFieldsProto3(unknownFields);
         }
 
-        @java.lang.Override
         public final Builder mergeUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
@@ -1961,12 +1903,11 @@ public static com.google.cloud.automl.v1beta1.ClassificationProto.Classification
 
       private static final com.google.protobuf.Parser
           PARSER = new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
         public ConfidenceMetricsEntry parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ConfidenceMetricsEntry(input, extensionRegistry);
+            return new ConfidenceMetricsEntry(input, extensionRegistry);
         }
       };
 
@@ -1979,7 +1920,6 @@ public com.google.protobuf.Parser getParserForType() {
         return PARSER;
       }
 
-      @java.lang.Override
       public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfidenceMetricsEntry getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
@@ -2120,9 +2060,6 @@ private ConfusionMatrix(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2134,6 +2071,13 @@ private ConfusionMatrix(
               case 0:
                 done = true;
                 break;
+              default: {
+                if (!parseUnknownFieldProto3(
+                    input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
               case 10: {
                 java.lang.String s = input.readStringRequireUtf8();
                 if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -2152,13 +2096,6 @@ private ConfusionMatrix(
                     input.readMessage(com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfusionMatrix.Row.parser(), extensionRegistry));
                 break;
               }
-              default: {
-                if (!parseUnknownFieldProto3(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
             }
           }
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -2182,7 +2119,6 @@ private ConfusionMatrix(
         return com.google.cloud.automl.v1beta1.ClassificationProto.internal_static_google_cloud_automl_v1beta1_ClassificationEvaluationMetrics_ConfusionMatrix_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.automl.v1beta1.ClassificationProto.internal_static_google_cloud_automl_v1beta1_ClassificationEvaluationMetrics_ConfusionMatrix_fieldAccessorTable
@@ -2255,9 +2191,6 @@ private Row(
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
           this();
-          if (extensionRegistry == null) {
-            throw new java.lang.NullPointerException();
-          }
           int mutable_bitField0_ = 0;
           com.google.protobuf.UnknownFieldSet.Builder unknownFields =
               com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2269,6 +2202,13 @@ private Row(
                 case 0:
                   done = true;
                   break;
+                default: {
+                  if (!parseUnknownFieldProto3(
+                      input, unknownFields, extensionRegistry, tag)) {
+                    done = true;
+                  }
+                  break;
+                }
                 case 8: {
                   if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
                     exampleCount_ = new java.util.ArrayList();
@@ -2290,13 +2230,6 @@ private Row(
                   input.popLimit(limit);
                   break;
                 }
-                default: {
-                  if (!parseUnknownFieldProto3(
-                      input, unknownFields, extensionRegistry, tag)) {
-                    done = true;
-                  }
-                  break;
-                }
               }
             }
           } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -2317,7 +2250,6 @@ private Row(
           return com.google.cloud.automl.v1beta1.ClassificationProto.internal_static_google_cloud_automl_v1beta1_ClassificationEvaluationMetrics_ConfusionMatrix_Row_descriptor;
         }
 
-        @java.lang.Override
         protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
           return com.google.cloud.automl.v1beta1.ClassificationProto.internal_static_google_cloud_automl_v1beta1_ClassificationEvaluationMetrics_ConfusionMatrix_Row_fieldAccessorTable
@@ -2367,7 +2299,6 @@ public int getExampleCount(int index) {
         private int exampleCountMemoizedSerializedSize = -1;
 
         private byte memoizedIsInitialized = -1;
-        @java.lang.Override
         public final boolean isInitialized() {
           byte isInitialized = memoizedIsInitialized;
           if (isInitialized == 1) return true;
@@ -2377,7 +2308,6 @@ public final boolean isInitialized() {
           return true;
         }
 
-        @java.lang.Override
         public void writeTo(com.google.protobuf.CodedOutputStream output)
                             throws java.io.IOException {
           getSerializedSize();
@@ -2391,7 +2321,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
           unknownFields.writeTo(output);
         }
 
-        @java.lang.Override
         public int getSerializedSize() {
           int size = memoizedSize;
           if (size != -1) return size;
@@ -2519,7 +2448,6 @@ public static com.google.cloud.automl.v1beta1.ClassificationProto.Classification
               .parseWithIOException(PARSER, input, extensionRegistry);
         }
 
-        @java.lang.Override
         public Builder newBuilderForType() { return newBuilder(); }
         public static Builder newBuilder() {
           return DEFAULT_INSTANCE.toBuilder();
@@ -2527,7 +2455,6 @@ public static Builder newBuilder() {
         public static Builder newBuilder(com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfusionMatrix.Row prototype) {
           return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
         }
-        @java.lang.Override
         public Builder toBuilder() {
           return this == DEFAULT_INSTANCE
               ? new Builder() : new Builder().mergeFrom(this);
@@ -2555,7 +2482,6 @@ public static final class Builder extends
             return com.google.cloud.automl.v1beta1.ClassificationProto.internal_static_google_cloud_automl_v1beta1_ClassificationEvaluationMetrics_ConfusionMatrix_Row_descriptor;
           }
 
-          @java.lang.Override
           protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
               internalGetFieldAccessorTable() {
             return com.google.cloud.automl.v1beta1.ClassificationProto.internal_static_google_cloud_automl_v1beta1_ClassificationEvaluationMetrics_ConfusionMatrix_Row_fieldAccessorTable
@@ -2578,7 +2504,6 @@ private void maybeForceBuilderInitialization() {
                     .alwaysUseFieldBuilders) {
             }
           }
-          @java.lang.Override
           public Builder clear() {
             super.clear();
             exampleCount_ = java.util.Collections.emptyList();
@@ -2586,18 +2511,15 @@ public Builder clear() {
             return this;
           }
 
-          @java.lang.Override
           public com.google.protobuf.Descriptors.Descriptor
               getDescriptorForType() {
             return com.google.cloud.automl.v1beta1.ClassificationProto.internal_static_google_cloud_automl_v1beta1_ClassificationEvaluationMetrics_ConfusionMatrix_Row_descriptor;
           }
 
-          @java.lang.Override
           public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfusionMatrix.Row getDefaultInstanceForType() {
             return com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfusionMatrix.Row.getDefaultInstance();
           }
 
-          @java.lang.Override
           public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfusionMatrix.Row build() {
             com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfusionMatrix.Row result = buildPartial();
             if (!result.isInitialized()) {
@@ -2606,7 +2528,6 @@ public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluat
             return result;
           }
 
-          @java.lang.Override
           public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfusionMatrix.Row buildPartial() {
             com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfusionMatrix.Row result = new com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfusionMatrix.Row(this);
             int from_bitField0_ = bitField0_;
@@ -2619,39 +2540,32 @@ public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluat
             return result;
           }
 
-          @java.lang.Override
           public Builder clone() {
             return (Builder) super.clone();
           }
-          @java.lang.Override
           public Builder setField(
               com.google.protobuf.Descriptors.FieldDescriptor field,
               java.lang.Object value) {
             return (Builder) super.setField(field, value);
           }
-          @java.lang.Override
           public Builder clearField(
               com.google.protobuf.Descriptors.FieldDescriptor field) {
             return (Builder) super.clearField(field);
           }
-          @java.lang.Override
           public Builder clearOneof(
               com.google.protobuf.Descriptors.OneofDescriptor oneof) {
             return (Builder) super.clearOneof(oneof);
           }
-          @java.lang.Override
           public Builder setRepeatedField(
               com.google.protobuf.Descriptors.FieldDescriptor field,
               int index, java.lang.Object value) {
             return (Builder) super.setRepeatedField(field, index, value);
           }
-          @java.lang.Override
           public Builder addRepeatedField(
               com.google.protobuf.Descriptors.FieldDescriptor field,
               java.lang.Object value) {
             return (Builder) super.addRepeatedField(field, value);
           }
-          @java.lang.Override
           public Builder mergeFrom(com.google.protobuf.Message other) {
             if (other instanceof com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfusionMatrix.Row) {
               return mergeFrom((com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfusionMatrix.Row)other);
@@ -2678,12 +2592,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.ClassificationProto.Cla
             return this;
           }
 
-          @java.lang.Override
           public final boolean isInitialized() {
             return true;
           }
 
-          @java.lang.Override
           public Builder mergeFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2810,13 +2722,11 @@ public Builder clearExampleCount() {
             onChanged();
             return this;
           }
-          @java.lang.Override
           public final Builder setUnknownFields(
               final com.google.protobuf.UnknownFieldSet unknownFields) {
             return super.setUnknownFieldsProto3(unknownFields);
           }
 
-          @java.lang.Override
           public final Builder mergeUnknownFields(
               final com.google.protobuf.UnknownFieldSet unknownFields) {
             return super.mergeUnknownFields(unknownFields);
@@ -2838,12 +2748,11 @@ public static com.google.cloud.automl.v1beta1.ClassificationProto.Classification
 
         private static final com.google.protobuf.Parser
             PARSER = new com.google.protobuf.AbstractParser() {
-          @java.lang.Override
           public Row parsePartialFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
               throws com.google.protobuf.InvalidProtocolBufferException {
-            return new Row(input, extensionRegistry);
+              return new Row(input, extensionRegistry);
           }
         };
 
@@ -2856,7 +2765,6 @@ public com.google.protobuf.Parser getParserForType() {
           return PARSER;
         }
 
-        @java.lang.Override
         public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfusionMatrix.Row getDefaultInstanceForType() {
           return DEFAULT_INSTANCE;
         }
@@ -2984,7 +2892,6 @@ public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluat
       }
 
       private byte memoizedIsInitialized = -1;
-      @java.lang.Override
       public final boolean isInitialized() {
         byte isInitialized = memoizedIsInitialized;
         if (isInitialized == 1) return true;
@@ -2994,7 +2901,6 @@ public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public void writeTo(com.google.protobuf.CodedOutputStream output)
                           throws java.io.IOException {
         for (int i = 0; i < annotationSpecId_.size(); i++) {
@@ -3006,7 +2912,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         unknownFields.writeTo(output);
       }
 
-      @java.lang.Override
       public int getSerializedSize() {
         int size = memoizedSize;
         if (size != -1) return size;
@@ -3138,7 +3043,6 @@ public static com.google.cloud.automl.v1beta1.ClassificationProto.Classification
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
-      @java.lang.Override
       public Builder newBuilderForType() { return newBuilder(); }
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
@@ -3146,7 +3050,6 @@ public static Builder newBuilder() {
       public static Builder newBuilder(com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfusionMatrix prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
-      @java.lang.Override
       public Builder toBuilder() {
         return this == DEFAULT_INSTANCE
             ? new Builder() : new Builder().mergeFrom(this);
@@ -3174,7 +3077,6 @@ public static final class Builder extends
           return com.google.cloud.automl.v1beta1.ClassificationProto.internal_static_google_cloud_automl_v1beta1_ClassificationEvaluationMetrics_ConfusionMatrix_descriptor;
         }
 
-        @java.lang.Override
         protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
           return com.google.cloud.automl.v1beta1.ClassificationProto.internal_static_google_cloud_automl_v1beta1_ClassificationEvaluationMetrics_ConfusionMatrix_fieldAccessorTable
@@ -3198,7 +3100,6 @@ private void maybeForceBuilderInitialization() {
             getRowFieldBuilder();
           }
         }
-        @java.lang.Override
         public Builder clear() {
           super.clear();
           annotationSpecId_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -3212,18 +3113,15 @@ public Builder clear() {
           return this;
         }
 
-        @java.lang.Override
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
           return com.google.cloud.automl.v1beta1.ClassificationProto.internal_static_google_cloud_automl_v1beta1_ClassificationEvaluationMetrics_ConfusionMatrix_descriptor;
         }
 
-        @java.lang.Override
         public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfusionMatrix getDefaultInstanceForType() {
           return com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfusionMatrix.getDefaultInstance();
         }
 
-        @java.lang.Override
         public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfusionMatrix build() {
           com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfusionMatrix result = buildPartial();
           if (!result.isInitialized()) {
@@ -3232,7 +3130,6 @@ public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluat
           return result;
         }
 
-        @java.lang.Override
         public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfusionMatrix buildPartial() {
           com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfusionMatrix result = new com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfusionMatrix(this);
           int from_bitField0_ = bitField0_;
@@ -3254,39 +3151,32 @@ public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluat
           return result;
         }
 
-        @java.lang.Override
         public Builder clone() {
           return (Builder) super.clone();
         }
-        @java.lang.Override
         public Builder setField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.setField(field, value);
         }
-        @java.lang.Override
         public Builder clearField(
             com.google.protobuf.Descriptors.FieldDescriptor field) {
           return (Builder) super.clearField(field);
         }
-        @java.lang.Override
         public Builder clearOneof(
             com.google.protobuf.Descriptors.OneofDescriptor oneof) {
           return (Builder) super.clearOneof(oneof);
         }
-        @java.lang.Override
         public Builder setRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return (Builder) super.setRepeatedField(field, index, value);
         }
-        @java.lang.Override
         public Builder addRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.addRepeatedField(field, value);
         }
-        @java.lang.Override
         public Builder mergeFrom(com.google.protobuf.Message other) {
           if (other instanceof com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfusionMatrix) {
             return mergeFrom((com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfusionMatrix)other);
@@ -3339,12 +3229,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.ClassificationProto.Cla
           return this;
         }
 
-        @java.lang.Override
         public final boolean isInitialized() {
           return true;
         }
 
-        @java.lang.Override
         public Builder mergeFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3877,13 +3765,11 @@ public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluat
           }
           return rowBuilder_;
         }
-        @java.lang.Override
         public final Builder setUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.setUnknownFieldsProto3(unknownFields);
         }
 
-        @java.lang.Override
         public final Builder mergeUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
@@ -3905,12 +3791,11 @@ public static com.google.cloud.automl.v1beta1.ClassificationProto.Classification
 
       private static final com.google.protobuf.Parser
           PARSER = new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
         public ConfusionMatrix parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new ConfusionMatrix(input, extensionRegistry);
+            return new ConfusionMatrix(input, extensionRegistry);
         }
       };
 
@@ -3923,7 +3808,6 @@ public com.google.protobuf.Parser getParserForType() {
         return PARSER;
       }
 
-      @java.lang.Override
       public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.ConfusionMatrix getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
@@ -4105,7 +3989,6 @@ public java.lang.String getAnnotationSpecId(int index) {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -4115,7 +3998,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (auPrc_ != 0F) {
@@ -4136,7 +4018,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -4303,7 +4184,6 @@ public static com.google.cloud.automl.v1beta1.ClassificationProto.Classification
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -4311,7 +4191,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -4340,7 +4219,6 @@ public static final class Builder extends
         return com.google.cloud.automl.v1beta1.ClassificationProto.internal_static_google_cloud_automl_v1beta1_ClassificationEvaluationMetrics_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.automl.v1beta1.ClassificationProto.internal_static_google_cloud_automl_v1beta1_ClassificationEvaluationMetrics_fieldAccessorTable
@@ -4364,7 +4242,6 @@ private void maybeForceBuilderInitialization() {
           getConfidenceMetricsEntryFieldBuilder();
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         auPrc_ = 0F;
@@ -4388,18 +4265,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.automl.v1beta1.ClassificationProto.internal_static_google_cloud_automl_v1beta1_ClassificationEvaluationMetrics_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics getDefaultInstanceForType() {
         return com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics build() {
         com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics result = buildPartial();
         if (!result.isInitialized()) {
@@ -4408,7 +4282,6 @@ public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluat
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics buildPartial() {
         com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics result = new com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics(this);
         int from_bitField0_ = bitField0_;
@@ -4439,39 +4312,32 @@ public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluat
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics) {
           return mergeFrom((com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics)other);
@@ -4533,12 +4399,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.ClassificationProto.Cla
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -5273,13 +5137,11 @@ public Builder addAnnotationSpecIdBytes(
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -5301,12 +5163,11 @@ public static com.google.cloud.automl.v1beta1.ClassificationProto.Classification
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public ClassificationEvaluationMetrics parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ClassificationEvaluationMetrics(input, extensionRegistry);
+          return new ClassificationEvaluationMetrics(input, extensionRegistry);
       }
     };
 
@@ -5319,7 +5180,6 @@ public com.google.protobuf.Parser getParserForT
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluationMetrics getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -5369,7 +5229,7 @@ public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluat
       "metrics_entry\030\003 \003(\0132S.google.cloud.autom" +
       "l.v1beta1.ClassificationEvaluationMetric" +
       "s.ConfidenceMetricsEntry\022f\n\020confusion_ma" +
-      "trix\030\004 \001(\0132L.google.cloud.automl.v1beta1" +
+      "trix\030\004 \001(\0132L.google.cloud.automl.v1beta1",
       ".ClassificationEvaluationMetrics.Confusi" +
       "onMatrix\022\032\n\022annotation_spec_id\030\005 \003(\t\032\254\001\n" +
       "\026ConfidenceMetricsEntry\022\034\n\024confidence_th" +
@@ -5379,7 +5239,7 @@ public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationEvaluat
       "e_at1\030\007 \001(\002\032\252\001\n\017ConfusionMatrix\022\032\n\022annot" +
       "ation_spec_id\030\001 \003(\t\022]\n\003row\030\002 \003(\0132P.googl" +
       "e.cloud.automl.v1beta1.ClassificationEva" +
-      "luationMetrics.ConfusionMatrix.Row\032\034\n\003Ro" +
+      "luationMetrics.ConfusionMatrix.Row\032\034\n\003Ro",
       "w\022\025\n\rexample_count\030\001 \003(\005*Y\n\022Classificati" +
       "onType\022#\n\037CLASSIFICATION_TYPE_UNSPECIFIE" +
       "D\020\000\022\016\n\nMULTICLASS\020\001\022\016\n\nMULTILABEL\020\002By\n\037c" +
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/CreateDatasetRequest.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/CreateDatasetRequest.java
index 5883ece7e2b1..5057fda97784 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/CreateDatasetRequest.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/CreateDatasetRequest.java
@@ -33,9 +33,6 @@ private CreateDatasetRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private CreateDatasetRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private CreateDatasetRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private CreateDatasetRequest(
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_CreateDatasetRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_CreateDatasetRequest_fieldAccessorTable
@@ -174,7 +170,6 @@ public com.google.cloud.automl.v1beta1.DatasetOrBuilder getDatasetOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -184,7 +179,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -196,7 +190,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -324,7 +317,6 @@ public static com.google.cloud.automl.v1beta1.CreateDatasetRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -332,7 +324,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.CreateDatasetRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -360,7 +351,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_CreateDatasetRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_CreateDatasetRequest_fieldAccessorTable
@@ -383,7 +373,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -397,18 +386,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_CreateDatasetRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.CreateDatasetRequest getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.CreateDatasetRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.CreateDatasetRequest build() {
       com.google.cloud.automl.v1beta1.CreateDatasetRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -417,7 +403,6 @@ public com.google.cloud.automl.v1beta1.CreateDatasetRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.CreateDatasetRequest buildPartial() {
       com.google.cloud.automl.v1beta1.CreateDatasetRequest result = new com.google.cloud.automl.v1beta1.CreateDatasetRequest(this);
       result.parent_ = parent_;
@@ -430,39 +415,32 @@ public com.google.cloud.automl.v1beta1.CreateDatasetRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.CreateDatasetRequest) {
         return mergeFrom((com.google.cloud.automl.v1beta1.CreateDatasetRequest)other);
@@ -486,12 +464,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.CreateDatasetRequest ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -751,13 +727,11 @@ public com.google.cloud.automl.v1beta1.DatasetOrBuilder getDatasetOrBuilder() {
       }
       return datasetBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -779,12 +753,11 @@ public static com.google.cloud.automl.v1beta1.CreateDatasetRequest getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateDatasetRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateDatasetRequest(input, extensionRegistry);
+        return new CreateDatasetRequest(input, extensionRegistry);
     }
   };
 
@@ -797,7 +770,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.CreateDatasetRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/CreateModelOperationMetadata.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/CreateModelOperationMetadata.java
index c29a1dcafa16..65ae98f46036 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/CreateModelOperationMetadata.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/CreateModelOperationMetadata.java
@@ -32,9 +32,6 @@ private CreateModelOperationMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -69,7 +66,6 @@ private CreateModelOperationMetadata(
     return com.google.cloud.automl.v1beta1.Operations.internal_static_google_cloud_automl_v1beta1_CreateModelOperationMetadata_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.Operations.internal_static_google_cloud_automl_v1beta1_CreateModelOperationMetadata_fieldAccessorTable
@@ -78,7 +74,6 @@ private CreateModelOperationMetadata(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -88,13 +83,11 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -202,7 +195,6 @@ public static com.google.cloud.automl.v1beta1.CreateModelOperationMetadata parse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -210,7 +202,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.CreateModelOperationMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -238,7 +229,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.Operations.internal_static_google_cloud_automl_v1beta1_CreateModelOperationMetadata_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.Operations.internal_static_google_cloud_automl_v1beta1_CreateModelOperationMetadata_fieldAccessorTable
@@ -261,24 +251,20 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.Operations.internal_static_google_cloud_automl_v1beta1_CreateModelOperationMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.CreateModelOperationMetadata getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.CreateModelOperationMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.CreateModelOperationMetadata build() {
       com.google.cloud.automl.v1beta1.CreateModelOperationMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -287,46 +273,38 @@ public com.google.cloud.automl.v1beta1.CreateModelOperationMetadata build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.CreateModelOperationMetadata buildPartial() {
       com.google.cloud.automl.v1beta1.CreateModelOperationMetadata result = new com.google.cloud.automl.v1beta1.CreateModelOperationMetadata(this);
       onBuilt();
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.CreateModelOperationMetadata) {
         return mergeFrom((com.google.cloud.automl.v1beta1.CreateModelOperationMetadata)other);
@@ -343,12 +321,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.CreateModelOperationMet
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -366,13 +342,11 @@ public Builder mergeFrom(
       }
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -394,12 +368,11 @@ public static com.google.cloud.automl.v1beta1.CreateModelOperationMetadata getDe
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateModelOperationMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateModelOperationMetadata(input, extensionRegistry);
+        return new CreateModelOperationMetadata(input, extensionRegistry);
     }
   };
 
@@ -412,7 +385,6 @@ public com.google.protobuf.Parser getParserForType
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.CreateModelOperationMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/CreateModelRequest.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/CreateModelRequest.java
index e06ce9da62c1..c07f882e740f 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/CreateModelRequest.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/CreateModelRequest.java
@@ -33,9 +33,6 @@ private CreateModelRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private CreateModelRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private CreateModelRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private CreateModelRequest(
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_CreateModelRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_CreateModelRequest_fieldAccessorTable
@@ -174,7 +170,6 @@ public com.google.cloud.automl.v1beta1.ModelOrBuilder getModelOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -184,7 +179,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -196,7 +190,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -324,7 +317,6 @@ public static com.google.cloud.automl.v1beta1.CreateModelRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -332,7 +324,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.CreateModelRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -360,7 +351,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_CreateModelRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_CreateModelRequest_fieldAccessorTable
@@ -383,7 +373,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -397,18 +386,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_CreateModelRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.CreateModelRequest getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.CreateModelRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.CreateModelRequest build() {
       com.google.cloud.automl.v1beta1.CreateModelRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -417,7 +403,6 @@ public com.google.cloud.automl.v1beta1.CreateModelRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.CreateModelRequest buildPartial() {
       com.google.cloud.automl.v1beta1.CreateModelRequest result = new com.google.cloud.automl.v1beta1.CreateModelRequest(this);
       result.parent_ = parent_;
@@ -430,39 +415,32 @@ public com.google.cloud.automl.v1beta1.CreateModelRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.CreateModelRequest) {
         return mergeFrom((com.google.cloud.automl.v1beta1.CreateModelRequest)other);
@@ -486,12 +464,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.CreateModelRequest othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -751,13 +727,11 @@ public com.google.cloud.automl.v1beta1.ModelOrBuilder getModelOrBuilder() {
       }
       return modelBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -779,12 +753,11 @@ public static com.google.cloud.automl.v1beta1.CreateModelRequest getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateModelRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateModelRequest(input, extensionRegistry);
+        return new CreateModelRequest(input, extensionRegistry);
     }
   };
 
@@ -797,7 +770,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.CreateModelRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DataItems.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DataItems.java
index 848003d0ba68..8cf1085cd32d 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DataItems.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DataItems.java
@@ -47,7 +47,7 @@ public static void registerAllExtensions(
       "\000\022\025\n\rthumbnail_uri\030\004 \001(\tB\006\n\004data\"F\n\013Text" +
       "Snippet\022\017\n\007content\030\001 \001(\t\022\021\n\tmime_type\030\002 " +
       "\001(\t\022\023\n\013content_uri\030\004 \001(\t\"\222\001\n\016ExamplePayl" +
-      "oad\0223\n\005image\030\001 \001(\0132\".google.cloud.automl" +
+      "oad\0223\n\005image\030\001 \001(\0132\".google.cloud.automl",
       ".v1beta1.ImageH\000\022@\n\014text_snippet\030\002 \001(\0132(" +
       ".google.cloud.automl.v1beta1.TextSnippet" +
       "H\000B\t\n\007payloadBf\n\037com.google.cloud.automl" +
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Dataset.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Dataset.java
index f7d5beefea1f..4e563d7a5b00 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Dataset.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Dataset.java
@@ -36,9 +36,6 @@ private Dataset(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private Dataset(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -122,13 +126,6 @@ private Dataset(
             datasetMetadataCase_ = 25;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -146,7 +143,6 @@ private Dataset(
     return com.google.cloud.automl.v1beta1.DatasetOuterClass.internal_static_google_cloud_automl_v1beta1_Dataset_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.DatasetOuterClass.internal_static_google_cloud_automl_v1beta1_Dataset_fieldAccessorTable
@@ -447,7 +443,6 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -457,7 +452,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -484,7 +478,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -674,7 +667,6 @@ public static com.google.cloud.automl.v1beta1.Dataset parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -682,7 +674,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.Dataset prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -711,7 +702,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.DatasetOuterClass.internal_static_google_cloud_automl_v1beta1_Dataset_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.DatasetOuterClass.internal_static_google_cloud_automl_v1beta1_Dataset_fieldAccessorTable
@@ -734,7 +724,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -754,18 +743,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.DatasetOuterClass.internal_static_google_cloud_automl_v1beta1_Dataset_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.Dataset getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.Dataset.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.Dataset build() {
       com.google.cloud.automl.v1beta1.Dataset result = buildPartial();
       if (!result.isInitialized()) {
@@ -774,7 +760,6 @@ public com.google.cloud.automl.v1beta1.Dataset build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.Dataset buildPartial() {
       com.google.cloud.automl.v1beta1.Dataset result = new com.google.cloud.automl.v1beta1.Dataset(this);
       if (datasetMetadataCase_ == 23) {
@@ -811,39 +796,32 @@ public com.google.cloud.automl.v1beta1.Dataset buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.Dataset) {
         return mergeFrom((com.google.cloud.automl.v1beta1.Dataset)other);
@@ -891,12 +869,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.Dataset other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1834,13 +1810,11 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
       }
       return createTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1862,12 +1836,11 @@ public static com.google.cloud.automl.v1beta1.Dataset getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Dataset parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Dataset(input, extensionRegistry);
+        return new Dataset(input, extensionRegistry);
     }
   };
 
@@ -1880,7 +1853,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.Dataset getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DatasetOuterClass.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DatasetOuterClass.java
index 92df1adf3912..fd9f12739aac 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DatasetOuterClass.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DatasetOuterClass.java
@@ -37,7 +37,7 @@ public static void registerAllExtensions(
       "oto\032&google/cloud/automl/v1beta1/text.pr" +
       "oto\032-google/cloud/automl/v1beta1/transla" +
       "tion.proto\032\037google/protobuf/timestamp.pr" +
-      "oto\"\314\003\n\007Dataset\022_\n\034translation_dataset_m" +
+      "oto\"\314\003\n\007Dataset\022_\n\034translation_dataset_m",
       "etadata\030\027 \001(\01327.google.cloud.automl.v1be" +
       "ta1.TranslationDatasetMetadataH\000\022p\n%imag" +
       "e_classification_dataset_metadata\030\030 \001(\0132" +
@@ -47,7 +47,7 @@ public static void registerAllExtensions(
       "e.cloud.automl.v1beta1.TextClassificatio" +
       "nDatasetMetadataH\000\022\014\n\004name\030\001 \001(\t\022\024\n\014disp" +
       "lay_name\030\002 \001(\t\022\025\n\rexample_count\030\025 \001(\005\022/\n" +
-      "\013create_time\030\016 \001(\0132\032.google.protobuf.Tim" +
+      "\013create_time\030\016 \001(\0132\032.google.protobuf.Tim",
       "estampB\022\n\020dataset_metadataBf\n\037com.google" +
       ".cloud.automl.v1beta1P\001ZAgoogle.golang.o" +
       "rg/genproto/googleapis/cloud/automl/v1be" +
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DeleteDatasetRequest.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DeleteDatasetRequest.java
index d2e054df4971..c34b0ce841e2 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DeleteDatasetRequest.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DeleteDatasetRequest.java
@@ -33,9 +33,6 @@ private DeleteDatasetRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteDatasetRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteDatasetRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteDatasetRequest(
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_DeleteDatasetRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_DeleteDatasetRequest_fieldAccessorTable
@@ -128,7 +124,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -138,7 +133,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -147,7 +141,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -262,7 +255,6 @@ public static com.google.cloud.automl.v1beta1.DeleteDatasetRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -270,7 +262,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.DeleteDatasetRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -298,7 +289,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_DeleteDatasetRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_DeleteDatasetRequest_fieldAccessorTable
@@ -321,7 +311,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -329,18 +318,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_DeleteDatasetRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.DeleteDatasetRequest getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.DeleteDatasetRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.DeleteDatasetRequest build() {
       com.google.cloud.automl.v1beta1.DeleteDatasetRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -349,7 +335,6 @@ public com.google.cloud.automl.v1beta1.DeleteDatasetRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.DeleteDatasetRequest buildPartial() {
       com.google.cloud.automl.v1beta1.DeleteDatasetRequest result = new com.google.cloud.automl.v1beta1.DeleteDatasetRequest(this);
       result.name_ = name_;
@@ -357,39 +342,32 @@ public com.google.cloud.automl.v1beta1.DeleteDatasetRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.DeleteDatasetRequest) {
         return mergeFrom((com.google.cloud.automl.v1beta1.DeleteDatasetRequest)other);
@@ -410,12 +388,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.DeleteDatasetRequest ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -522,13 +498,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -550,12 +524,11 @@ public static com.google.cloud.automl.v1beta1.DeleteDatasetRequest getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteDatasetRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteDatasetRequest(input, extensionRegistry);
+        return new DeleteDatasetRequest(input, extensionRegistry);
     }
   };
 
@@ -568,7 +541,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.DeleteDatasetRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DeleteModelRequest.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DeleteModelRequest.java
index 522715397cb9..4ff1556700ef 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DeleteModelRequest.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DeleteModelRequest.java
@@ -33,9 +33,6 @@ private DeleteModelRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteModelRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteModelRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteModelRequest(
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_DeleteModelRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_DeleteModelRequest_fieldAccessorTable
@@ -128,7 +124,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -138,7 +133,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -147,7 +141,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -262,7 +255,6 @@ public static com.google.cloud.automl.v1beta1.DeleteModelRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -270,7 +262,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.DeleteModelRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -298,7 +289,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_DeleteModelRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_DeleteModelRequest_fieldAccessorTable
@@ -321,7 +311,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -329,18 +318,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_DeleteModelRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.DeleteModelRequest getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.DeleteModelRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.DeleteModelRequest build() {
       com.google.cloud.automl.v1beta1.DeleteModelRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -349,7 +335,6 @@ public com.google.cloud.automl.v1beta1.DeleteModelRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.DeleteModelRequest buildPartial() {
       com.google.cloud.automl.v1beta1.DeleteModelRequest result = new com.google.cloud.automl.v1beta1.DeleteModelRequest(this);
       result.name_ = name_;
@@ -357,39 +342,32 @@ public com.google.cloud.automl.v1beta1.DeleteModelRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.DeleteModelRequest) {
         return mergeFrom((com.google.cloud.automl.v1beta1.DeleteModelRequest)other);
@@ -410,12 +388,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.DeleteModelRequest othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -522,13 +498,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -550,12 +524,11 @@ public static com.google.cloud.automl.v1beta1.DeleteModelRequest getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteModelRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteModelRequest(input, extensionRegistry);
+        return new DeleteModelRequest(input, extensionRegistry);
     }
   };
 
@@ -568,7 +541,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.DeleteModelRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DeployModelRequest.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DeployModelRequest.java
index 839904468f2c..eb81d48bd6c4 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DeployModelRequest.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/DeployModelRequest.java
@@ -33,9 +33,6 @@ private DeployModelRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeployModelRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeployModelRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeployModelRequest(
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_DeployModelRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_DeployModelRequest_fieldAccessorTable
@@ -128,7 +124,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -138,7 +133,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -147,7 +141,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -262,7 +255,6 @@ public static com.google.cloud.automl.v1beta1.DeployModelRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -270,7 +262,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.DeployModelRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -298,7 +289,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_DeployModelRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_DeployModelRequest_fieldAccessorTable
@@ -321,7 +311,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -329,18 +318,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_DeployModelRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.DeployModelRequest getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.DeployModelRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.DeployModelRequest build() {
       com.google.cloud.automl.v1beta1.DeployModelRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -349,7 +335,6 @@ public com.google.cloud.automl.v1beta1.DeployModelRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.DeployModelRequest buildPartial() {
       com.google.cloud.automl.v1beta1.DeployModelRequest result = new com.google.cloud.automl.v1beta1.DeployModelRequest(this);
       result.name_ = name_;
@@ -357,39 +342,32 @@ public com.google.cloud.automl.v1beta1.DeployModelRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.DeployModelRequest) {
         return mergeFrom((com.google.cloud.automl.v1beta1.DeployModelRequest)other);
@@ -410,12 +388,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.DeployModelRequest othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -522,13 +498,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -550,12 +524,11 @@ public static com.google.cloud.automl.v1beta1.DeployModelRequest getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeployModelRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeployModelRequest(input, extensionRegistry);
+        return new DeployModelRequest(input, extensionRegistry);
     }
   };
 
@@ -568,7 +541,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.DeployModelRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ExamplePayload.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ExamplePayload.java
index e7b5ca4d2558..94309b8540f3 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ExamplePayload.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ExamplePayload.java
@@ -32,9 +32,6 @@ private ExamplePayload(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private ExamplePayload(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.automl.v1beta1.Image.Builder subBuilder = null;
             if (payloadCase_ == 1) {
@@ -74,13 +78,6 @@ private ExamplePayload(
             payloadCase_ = 2;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -98,7 +95,6 @@ private ExamplePayload(
     return com.google.cloud.automl.v1beta1.DataItems.internal_static_google_cloud_automl_v1beta1_ExamplePayload_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.DataItems.internal_static_google_cloud_automl_v1beta1_ExamplePayload_fieldAccessorTable
@@ -221,7 +217,6 @@ public com.google.cloud.automl.v1beta1.TextSnippetOrBuilder getTextSnippetOrBuil
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -231,7 +226,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (payloadCase_ == 1) {
@@ -243,7 +237,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -386,7 +379,6 @@ public static com.google.cloud.automl.v1beta1.ExamplePayload parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -394,7 +386,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.ExamplePayload prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -422,7 +413,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.DataItems.internal_static_google_cloud_automl_v1beta1_ExamplePayload_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.DataItems.internal_static_google_cloud_automl_v1beta1_ExamplePayload_fieldAccessorTable
@@ -445,7 +435,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       payloadCase_ = 0;
@@ -453,18 +442,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.DataItems.internal_static_google_cloud_automl_v1beta1_ExamplePayload_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ExamplePayload getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.ExamplePayload.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ExamplePayload build() {
       com.google.cloud.automl.v1beta1.ExamplePayload result = buildPartial();
       if (!result.isInitialized()) {
@@ -473,7 +459,6 @@ public com.google.cloud.automl.v1beta1.ExamplePayload build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ExamplePayload buildPartial() {
       com.google.cloud.automl.v1beta1.ExamplePayload result = new com.google.cloud.automl.v1beta1.ExamplePayload(this);
       if (payloadCase_ == 1) {
@@ -495,39 +480,32 @@ public com.google.cloud.automl.v1beta1.ExamplePayload buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.ExamplePayload) {
         return mergeFrom((com.google.cloud.automl.v1beta1.ExamplePayload)other);
@@ -557,12 +535,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.ExamplePayload other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -939,13 +915,11 @@ public com.google.cloud.automl.v1beta1.TextSnippetOrBuilder getTextSnippetOrBuil
       onChanged();;
       return textSnippetBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -967,12 +941,11 @@ public static com.google.cloud.automl.v1beta1.ExamplePayload getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ExamplePayload parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ExamplePayload(input, extensionRegistry);
+        return new ExamplePayload(input, extensionRegistry);
     }
   };
 
@@ -985,7 +958,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.ExamplePayload getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ExportDataRequest.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ExportDataRequest.java
index cfce354503ae..1a0ff7107a2a 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ExportDataRequest.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ExportDataRequest.java
@@ -33,9 +33,6 @@ private ExportDataRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ExportDataRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ExportDataRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ExportDataRequest(
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ExportDataRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ExportDataRequest_fieldAccessorTable
@@ -174,7 +170,6 @@ public com.google.cloud.automl.v1beta1.OutputConfigOrBuilder getOutputConfigOrBu
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -184,7 +179,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -196,7 +190,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -324,7 +317,6 @@ public static com.google.cloud.automl.v1beta1.ExportDataRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -332,7 +324,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.ExportDataRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -360,7 +351,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ExportDataRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ExportDataRequest_fieldAccessorTable
@@ -383,7 +373,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -397,18 +386,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ExportDataRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ExportDataRequest getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.ExportDataRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ExportDataRequest build() {
       com.google.cloud.automl.v1beta1.ExportDataRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -417,7 +403,6 @@ public com.google.cloud.automl.v1beta1.ExportDataRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ExportDataRequest buildPartial() {
       com.google.cloud.automl.v1beta1.ExportDataRequest result = new com.google.cloud.automl.v1beta1.ExportDataRequest(this);
       result.name_ = name_;
@@ -430,39 +415,32 @@ public com.google.cloud.automl.v1beta1.ExportDataRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.ExportDataRequest) {
         return mergeFrom((com.google.cloud.automl.v1beta1.ExportDataRequest)other);
@@ -486,12 +464,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.ExportDataRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -751,13 +727,11 @@ public com.google.cloud.automl.v1beta1.OutputConfigOrBuilder getOutputConfigOrBu
       }
       return outputConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -779,12 +753,11 @@ public static com.google.cloud.automl.v1beta1.ExportDataRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ExportDataRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ExportDataRequest(input, extensionRegistry);
+        return new ExportDataRequest(input, extensionRegistry);
     }
   };
 
@@ -797,7 +770,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.ExportDataRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GcsDestination.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GcsDestination.java
index 4f44c04ba45e..92c61603f975 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GcsDestination.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GcsDestination.java
@@ -33,9 +33,6 @@ private GcsDestination(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GcsDestination(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            outputUriPrefix_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GcsDestination(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            outputUriPrefix_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GcsDestination(
     return com.google.cloud.automl.v1beta1.Io.internal_static_google_cloud_automl_v1beta1_GcsDestination_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.Io.internal_static_google_cloud_automl_v1beta1_GcsDestination_fieldAccessorTable
@@ -138,7 +134,6 @@ public java.lang.String getOutputUriPrefix() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -148,7 +143,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getOutputUriPrefixBytes().isEmpty()) {
@@ -157,7 +151,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -272,7 +265,6 @@ public static com.google.cloud.automl.v1beta1.GcsDestination parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -280,7 +272,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.GcsDestination prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -308,7 +299,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.Io.internal_static_google_cloud_automl_v1beta1_GcsDestination_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.Io.internal_static_google_cloud_automl_v1beta1_GcsDestination_fieldAccessorTable
@@ -331,7 +321,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       outputUriPrefix_ = "";
@@ -339,18 +328,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.Io.internal_static_google_cloud_automl_v1beta1_GcsDestination_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.GcsDestination getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.GcsDestination.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.GcsDestination build() {
       com.google.cloud.automl.v1beta1.GcsDestination result = buildPartial();
       if (!result.isInitialized()) {
@@ -359,7 +345,6 @@ public com.google.cloud.automl.v1beta1.GcsDestination build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.GcsDestination buildPartial() {
       com.google.cloud.automl.v1beta1.GcsDestination result = new com.google.cloud.automl.v1beta1.GcsDestination(this);
       result.outputUriPrefix_ = outputUriPrefix_;
@@ -367,39 +352,32 @@ public com.google.cloud.automl.v1beta1.GcsDestination buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.GcsDestination) {
         return mergeFrom((com.google.cloud.automl.v1beta1.GcsDestination)other);
@@ -420,12 +398,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.GcsDestination other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -557,13 +533,11 @@ public Builder setOutputUriPrefixBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -585,12 +559,11 @@ public static com.google.cloud.automl.v1beta1.GcsDestination getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GcsDestination parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GcsDestination(input, extensionRegistry);
+        return new GcsDestination(input, extensionRegistry);
     }
   };
 
@@ -603,7 +576,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.GcsDestination getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GcsSource.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GcsSource.java
index cf114ebcad35..11a2b9dc5b1c 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GcsSource.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GcsSource.java
@@ -33,9 +33,6 @@ private GcsSource(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private GcsSource(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -56,13 +60,6 @@ private GcsSource(
             inputUris_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private GcsSource(
     return com.google.cloud.automl.v1beta1.Io.internal_static_google_cloud_automl_v1beta1_GcsSource_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.Io.internal_static_google_cloud_automl_v1beta1_GcsSource_fieldAccessorTable
@@ -145,7 +141,6 @@ public java.lang.String getInputUris(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -155,7 +150,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < inputUris_.size(); i++) {
@@ -164,7 +158,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -286,7 +279,6 @@ public static com.google.cloud.automl.v1beta1.GcsSource parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -294,7 +286,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.GcsSource prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -322,7 +313,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.Io.internal_static_google_cloud_automl_v1beta1_GcsSource_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.Io.internal_static_google_cloud_automl_v1beta1_GcsSource_fieldAccessorTable
@@ -345,7 +335,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       inputUris_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -353,18 +342,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.Io.internal_static_google_cloud_automl_v1beta1_GcsSource_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.GcsSource getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.GcsSource.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.GcsSource build() {
       com.google.cloud.automl.v1beta1.GcsSource result = buildPartial();
       if (!result.isInitialized()) {
@@ -373,7 +359,6 @@ public com.google.cloud.automl.v1beta1.GcsSource build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.GcsSource buildPartial() {
       com.google.cloud.automl.v1beta1.GcsSource result = new com.google.cloud.automl.v1beta1.GcsSource(this);
       int from_bitField0_ = bitField0_;
@@ -386,39 +371,32 @@ public com.google.cloud.automl.v1beta1.GcsSource buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.GcsSource) {
         return mergeFrom((com.google.cloud.automl.v1beta1.GcsSource)other);
@@ -445,12 +423,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.GcsSource other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -617,13 +593,11 @@ public Builder addInputUrisBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -645,12 +619,11 @@ public static com.google.cloud.automl.v1beta1.GcsSource getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GcsSource parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GcsSource(input, extensionRegistry);
+        return new GcsSource(input, extensionRegistry);
     }
   };
 
@@ -663,7 +636,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.GcsSource getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GetDatasetRequest.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GetDatasetRequest.java
index ff492ff8baba..9e910969e490 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GetDatasetRequest.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GetDatasetRequest.java
@@ -33,9 +33,6 @@ private GetDatasetRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetDatasetRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetDatasetRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetDatasetRequest(
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_GetDatasetRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_GetDatasetRequest_fieldAccessorTable
@@ -128,7 +124,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -138,7 +133,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -147,7 +141,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -262,7 +255,6 @@ public static com.google.cloud.automl.v1beta1.GetDatasetRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -270,7 +262,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.GetDatasetRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -298,7 +289,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_GetDatasetRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_GetDatasetRequest_fieldAccessorTable
@@ -321,7 +311,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -329,18 +318,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_GetDatasetRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.GetDatasetRequest getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.GetDatasetRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.GetDatasetRequest build() {
       com.google.cloud.automl.v1beta1.GetDatasetRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -349,7 +335,6 @@ public com.google.cloud.automl.v1beta1.GetDatasetRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.GetDatasetRequest buildPartial() {
       com.google.cloud.automl.v1beta1.GetDatasetRequest result = new com.google.cloud.automl.v1beta1.GetDatasetRequest(this);
       result.name_ = name_;
@@ -357,39 +342,32 @@ public com.google.cloud.automl.v1beta1.GetDatasetRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.GetDatasetRequest) {
         return mergeFrom((com.google.cloud.automl.v1beta1.GetDatasetRequest)other);
@@ -410,12 +388,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.GetDatasetRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -522,13 +498,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -550,12 +524,11 @@ public static com.google.cloud.automl.v1beta1.GetDatasetRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetDatasetRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetDatasetRequest(input, extensionRegistry);
+        return new GetDatasetRequest(input, extensionRegistry);
     }
   };
 
@@ -568,7 +541,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.GetDatasetRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GetModelEvaluationRequest.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GetModelEvaluationRequest.java
index 89485147c257..17d5be1a3b9a 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GetModelEvaluationRequest.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GetModelEvaluationRequest.java
@@ -33,9 +33,6 @@ private GetModelEvaluationRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetModelEvaluationRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetModelEvaluationRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetModelEvaluationRequest(
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_GetModelEvaluationRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_GetModelEvaluationRequest_fieldAccessorTable
@@ -128,7 +124,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -138,7 +133,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -147,7 +141,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -262,7 +255,6 @@ public static com.google.cloud.automl.v1beta1.GetModelEvaluationRequest parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -270,7 +262,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.GetModelEvaluationRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -298,7 +289,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_GetModelEvaluationRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_GetModelEvaluationRequest_fieldAccessorTable
@@ -321,7 +311,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -329,18 +318,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_GetModelEvaluationRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.GetModelEvaluationRequest getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.GetModelEvaluationRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.GetModelEvaluationRequest build() {
       com.google.cloud.automl.v1beta1.GetModelEvaluationRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -349,7 +335,6 @@ public com.google.cloud.automl.v1beta1.GetModelEvaluationRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.GetModelEvaluationRequest buildPartial() {
       com.google.cloud.automl.v1beta1.GetModelEvaluationRequest result = new com.google.cloud.automl.v1beta1.GetModelEvaluationRequest(this);
       result.name_ = name_;
@@ -357,39 +342,32 @@ public com.google.cloud.automl.v1beta1.GetModelEvaluationRequest buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.GetModelEvaluationRequest) {
         return mergeFrom((com.google.cloud.automl.v1beta1.GetModelEvaluationRequest)other);
@@ -410,12 +388,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.GetModelEvaluationReque
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -522,13 +498,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -550,12 +524,11 @@ public static com.google.cloud.automl.v1beta1.GetModelEvaluationRequest getDefau
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetModelEvaluationRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetModelEvaluationRequest(input, extensionRegistry);
+        return new GetModelEvaluationRequest(input, extensionRegistry);
     }
   };
 
@@ -568,7 +541,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.GetModelEvaluationRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GetModelRequest.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GetModelRequest.java
index 4070e95dbc95..789674bf003f 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GetModelRequest.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/GetModelRequest.java
@@ -33,9 +33,6 @@ private GetModelRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetModelRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetModelRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetModelRequest(
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_GetModelRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_GetModelRequest_fieldAccessorTable
@@ -128,7 +124,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -138,7 +133,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -147,7 +141,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -262,7 +255,6 @@ public static com.google.cloud.automl.v1beta1.GetModelRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -270,7 +262,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.GetModelRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -298,7 +289,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_GetModelRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_GetModelRequest_fieldAccessorTable
@@ -321,7 +311,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -329,18 +318,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_GetModelRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.GetModelRequest getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.GetModelRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.GetModelRequest build() {
       com.google.cloud.automl.v1beta1.GetModelRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -349,7 +335,6 @@ public com.google.cloud.automl.v1beta1.GetModelRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.GetModelRequest buildPartial() {
       com.google.cloud.automl.v1beta1.GetModelRequest result = new com.google.cloud.automl.v1beta1.GetModelRequest(this);
       result.name_ = name_;
@@ -357,39 +342,32 @@ public com.google.cloud.automl.v1beta1.GetModelRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.GetModelRequest) {
         return mergeFrom((com.google.cloud.automl.v1beta1.GetModelRequest)other);
@@ -410,12 +388,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.GetModelRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -522,13 +498,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -550,12 +524,11 @@ public static com.google.cloud.automl.v1beta1.GetModelRequest getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetModelRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetModelRequest(input, extensionRegistry);
+        return new GetModelRequest(input, extensionRegistry);
     }
   };
 
@@ -568,7 +541,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.GetModelRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Image.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Image.java
index d799d9e315ca..cf1baa33f705 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Image.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Image.java
@@ -33,9 +33,6 @@ private Image(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private Image(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             dataCase_ = 1;
             data_ = input.readBytes();
@@ -72,13 +76,6 @@ private Image(
             dataCase_ = 6;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private Image(
     return com.google.cloud.automl.v1beta1.DataItems.internal_static_google_cloud_automl_v1beta1_Image_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.DataItems.internal_static_google_cloud_automl_v1beta1_Image_fieldAccessorTable
@@ -240,7 +236,6 @@ public java.lang.String getThumbnailUri() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -250,7 +245,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (dataCase_ == 1) {
@@ -266,7 +260,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -417,7 +410,6 @@ public static com.google.cloud.automl.v1beta1.Image parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -425,7 +417,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.Image prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -453,7 +444,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.DataItems.internal_static_google_cloud_automl_v1beta1_Image_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.DataItems.internal_static_google_cloud_automl_v1beta1_Image_fieldAccessorTable
@@ -476,7 +466,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       thumbnailUri_ = "";
@@ -486,18 +475,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.DataItems.internal_static_google_cloud_automl_v1beta1_Image_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.Image getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.Image.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.Image build() {
       com.google.cloud.automl.v1beta1.Image result = buildPartial();
       if (!result.isInitialized()) {
@@ -506,7 +492,6 @@ public com.google.cloud.automl.v1beta1.Image build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.Image buildPartial() {
       com.google.cloud.automl.v1beta1.Image result = new com.google.cloud.automl.v1beta1.Image(this);
       if (dataCase_ == 1) {
@@ -525,39 +510,32 @@ public com.google.cloud.automl.v1beta1.Image buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.Image) {
         return mergeFrom((com.google.cloud.automl.v1beta1.Image)other);
@@ -591,12 +569,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.Image other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -941,13 +917,11 @@ public Builder setThumbnailUriBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -969,12 +943,11 @@ public static com.google.cloud.automl.v1beta1.Image getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Image parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Image(input, extensionRegistry);
+        return new Image(input, extensionRegistry);
     }
   };
 
@@ -987,7 +960,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.Image getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ImageClassificationDatasetMetadata.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ImageClassificationDatasetMetadata.java
index 95b975cf98f0..71c41121b622 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ImageClassificationDatasetMetadata.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ImageClassificationDatasetMetadata.java
@@ -33,9 +33,6 @@ private ImageClassificationDatasetMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private ImageClassificationDatasetMetadata(
           case 0:
             done = true;
             break;
-          case 8: {
-            int rawValue = input.readEnum();
-
-            classificationType_ = rawValue;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private ImageClassificationDatasetMetadata(
             }
             break;
           }
+          case 8: {
+            int rawValue = input.readEnum();
+
+            classificationType_ = rawValue;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private ImageClassificationDatasetMetadata(
     return com.google.cloud.automl.v1beta1.ImageProto.internal_static_google_cloud_automl_v1beta1_ImageClassificationDatasetMetadata_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.ImageProto.internal_static_google_cloud_automl_v1beta1_ImageClassificationDatasetMetadata_fieldAccessorTable
@@ -107,13 +103,11 @@ public int getClassificationTypeValue() {
    * .google.cloud.automl.v1beta1.ClassificationType classification_type = 1;
    */
   public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationType getClassificationType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationType result = com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationType.valueOf(classificationType_);
     return result == null ? com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationType.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -123,7 +117,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (classificationType_ != com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationType.CLASSIFICATION_TYPE_UNSPECIFIED.getNumber()) {
@@ -132,7 +125,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -247,7 +239,6 @@ public static com.google.cloud.automl.v1beta1.ImageClassificationDatasetMetadata
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -255,7 +246,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.ImageClassificationDatasetMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -283,7 +273,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.ImageProto.internal_static_google_cloud_automl_v1beta1_ImageClassificationDatasetMetadata_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.ImageProto.internal_static_google_cloud_automl_v1beta1_ImageClassificationDatasetMetadata_fieldAccessorTable
@@ -306,7 +295,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       classificationType_ = 0;
@@ -314,18 +302,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.ImageProto.internal_static_google_cloud_automl_v1beta1_ImageClassificationDatasetMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ImageClassificationDatasetMetadata getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.ImageClassificationDatasetMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ImageClassificationDatasetMetadata build() {
       com.google.cloud.automl.v1beta1.ImageClassificationDatasetMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -334,7 +319,6 @@ public com.google.cloud.automl.v1beta1.ImageClassificationDatasetMetadata build(
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ImageClassificationDatasetMetadata buildPartial() {
       com.google.cloud.automl.v1beta1.ImageClassificationDatasetMetadata result = new com.google.cloud.automl.v1beta1.ImageClassificationDatasetMetadata(this);
       result.classificationType_ = classificationType_;
@@ -342,39 +326,32 @@ public com.google.cloud.automl.v1beta1.ImageClassificationDatasetMetadata buildP
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.ImageClassificationDatasetMetadata) {
         return mergeFrom((com.google.cloud.automl.v1beta1.ImageClassificationDatasetMetadata)other);
@@ -394,12 +371,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.ImageClassificationData
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -452,7 +427,6 @@ public Builder setClassificationTypeValue(int value) {
      * .google.cloud.automl.v1beta1.ClassificationType classification_type = 1;
      */
     public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationType getClassificationType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationType result = com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationType.valueOf(classificationType_);
       return result == null ? com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationType.UNRECOGNIZED : result;
     }
@@ -487,13 +461,11 @@ public Builder clearClassificationType() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -515,12 +487,11 @@ public static com.google.cloud.automl.v1beta1.ImageClassificationDatasetMetadata
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ImageClassificationDatasetMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImageClassificationDatasetMetadata(input, extensionRegistry);
+        return new ImageClassificationDatasetMetadata(input, extensionRegistry);
     }
   };
 
@@ -533,7 +504,6 @@ public com.google.protobuf.Parser getParserF
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.ImageClassificationDatasetMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ImageClassificationModelMetadata.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ImageClassificationModelMetadata.java
index 31e180b4c0b9..d90df8bbb7ea 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ImageClassificationModelMetadata.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ImageClassificationModelMetadata.java
@@ -36,9 +36,6 @@ private ImageClassificationModelMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private ImageClassificationModelMetadata(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -72,13 +76,6 @@ private ImageClassificationModelMetadata(
             stopReason_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private ImageClassificationModelMetadata(
     return com.google.cloud.automl.v1beta1.ImageProto.internal_static_google_cloud_automl_v1beta1_ImageClassificationModelMetadata_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.ImageProto.internal_static_google_cloud_automl_v1beta1_ImageClassificationModelMetadata_fieldAccessorTable
@@ -226,7 +222,6 @@ public java.lang.String getStopReason() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -236,7 +231,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getBaseModelIdBytes().isEmpty()) {
@@ -254,7 +248,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -394,7 +387,6 @@ public static com.google.cloud.automl.v1beta1.ImageClassificationModelMetadata p
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -402,7 +394,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.ImageClassificationModelMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -430,7 +421,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.ImageProto.internal_static_google_cloud_automl_v1beta1_ImageClassificationModelMetadata_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.ImageProto.internal_static_google_cloud_automl_v1beta1_ImageClassificationModelMetadata_fieldAccessorTable
@@ -453,7 +443,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       baseModelId_ = "";
@@ -467,18 +456,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.ImageProto.internal_static_google_cloud_automl_v1beta1_ImageClassificationModelMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ImageClassificationModelMetadata getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.ImageClassificationModelMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ImageClassificationModelMetadata build() {
       com.google.cloud.automl.v1beta1.ImageClassificationModelMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -487,7 +473,6 @@ public com.google.cloud.automl.v1beta1.ImageClassificationModelMetadata build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ImageClassificationModelMetadata buildPartial() {
       com.google.cloud.automl.v1beta1.ImageClassificationModelMetadata result = new com.google.cloud.automl.v1beta1.ImageClassificationModelMetadata(this);
       result.baseModelId_ = baseModelId_;
@@ -498,39 +483,32 @@ public com.google.cloud.automl.v1beta1.ImageClassificationModelMetadata buildPar
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.ImageClassificationModelMetadata) {
         return mergeFrom((com.google.cloud.automl.v1beta1.ImageClassificationModelMetadata)other);
@@ -561,12 +539,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.ImageClassificationMode
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -867,13 +843,11 @@ public Builder setStopReasonBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -895,12 +869,11 @@ public static com.google.cloud.automl.v1beta1.ImageClassificationModelMetadata g
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ImageClassificationModelMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImageClassificationModelMetadata(input, extensionRegistry);
+        return new ImageClassificationModelMetadata(input, extensionRegistry);
     }
   };
 
@@ -913,7 +886,6 @@ public com.google.protobuf.Parser getParserFor
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.ImageClassificationModelMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ImageProto.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ImageProto.java
index c7f91c5ae280..e4599db1bede 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ImageProto.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ImageProto.java
@@ -42,7 +42,7 @@ public static void registerAllExtensions(
       "type\030\001 \001(\0162/.google.cloud.automl.v1beta1" +
       ".ClassificationType\"x\n ImageClassificati" +
       "onModelMetadata\022\025\n\rbase_model_id\030\001 \001(\t\022\024" +
-      "\n\014train_budget\030\002 \001(\003\022\022\n\ntrain_cost\030\003 \001(\003" +
+      "\n\014train_budget\030\002 \001(\003\022\022\n\ntrain_cost\030\003 \001(\003",
       "\022\023\n\013stop_reason\030\005 \001(\tBr\n\037com.google.clou" +
       "d.automl.v1beta1B\nImageProtoP\001ZAgoogle.g" +
       "olang.org/genproto/googleapis/cloud/auto" +
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ImportDataRequest.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ImportDataRequest.java
index 1d27bb0fa36e..8376f0e62a66 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ImportDataRequest.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ImportDataRequest.java
@@ -33,9 +33,6 @@ private ImportDataRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ImportDataRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ImportDataRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ImportDataRequest(
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ImportDataRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ImportDataRequest_fieldAccessorTable
@@ -176,7 +172,6 @@ public com.google.cloud.automl.v1beta1.InputConfigOrBuilder getInputConfigOrBuil
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -186,7 +181,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -198,7 +192,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -326,7 +319,6 @@ public static com.google.cloud.automl.v1beta1.ImportDataRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -334,7 +326,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.ImportDataRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -362,7 +353,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ImportDataRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ImportDataRequest_fieldAccessorTable
@@ -385,7 +375,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -399,18 +388,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ImportDataRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ImportDataRequest getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.ImportDataRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ImportDataRequest build() {
       com.google.cloud.automl.v1beta1.ImportDataRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -419,7 +405,6 @@ public com.google.cloud.automl.v1beta1.ImportDataRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ImportDataRequest buildPartial() {
       com.google.cloud.automl.v1beta1.ImportDataRequest result = new com.google.cloud.automl.v1beta1.ImportDataRequest(this);
       result.name_ = name_;
@@ -432,39 +417,32 @@ public com.google.cloud.automl.v1beta1.ImportDataRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.ImportDataRequest) {
         return mergeFrom((com.google.cloud.automl.v1beta1.ImportDataRequest)other);
@@ -488,12 +466,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.ImportDataRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -758,13 +734,11 @@ public com.google.cloud.automl.v1beta1.InputConfigOrBuilder getInputConfigOrBuil
       }
       return inputConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -786,12 +760,11 @@ public static com.google.cloud.automl.v1beta1.ImportDataRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ImportDataRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImportDataRequest(input, extensionRegistry);
+        return new ImportDataRequest(input, extensionRegistry);
     }
   };
 
@@ -804,7 +777,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.ImportDataRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/InputConfig.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/InputConfig.java
index 0912f06ada50..f118e89e83b7 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/InputConfig.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/InputConfig.java
@@ -32,9 +32,6 @@ private InputConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private InputConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.automl.v1beta1.GcsSource.Builder subBuilder = null;
             if (sourceCase_ == 1) {
@@ -60,13 +64,6 @@ private InputConfig(
             sourceCase_ = 1;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private InputConfig(
     return com.google.cloud.automl.v1beta1.Io.internal_static_google_cloud_automl_v1beta1_InputConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.Io.internal_static_google_cloud_automl_v1beta1_InputConfig_fieldAccessorTable
@@ -167,7 +163,6 @@ public com.google.cloud.automl.v1beta1.GcsSourceOrBuilder getGcsSourceOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -177,7 +172,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (sourceCase_ == 1) {
@@ -186,7 +180,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -317,7 +310,6 @@ public static com.google.cloud.automl.v1beta1.InputConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -325,7 +317,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.InputConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -353,7 +344,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.Io.internal_static_google_cloud_automl_v1beta1_InputConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.Io.internal_static_google_cloud_automl_v1beta1_InputConfig_fieldAccessorTable
@@ -376,7 +366,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       sourceCase_ = 0;
@@ -384,18 +373,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.Io.internal_static_google_cloud_automl_v1beta1_InputConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.InputConfig getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.InputConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.InputConfig build() {
       com.google.cloud.automl.v1beta1.InputConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -404,7 +390,6 @@ public com.google.cloud.automl.v1beta1.InputConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.InputConfig buildPartial() {
       com.google.cloud.automl.v1beta1.InputConfig result = new com.google.cloud.automl.v1beta1.InputConfig(this);
       if (sourceCase_ == 1) {
@@ -419,39 +404,32 @@ public com.google.cloud.automl.v1beta1.InputConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.InputConfig) {
         return mergeFrom((com.google.cloud.automl.v1beta1.InputConfig)other);
@@ -477,12 +455,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.InputConfig other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -687,13 +663,11 @@ public com.google.cloud.automl.v1beta1.GcsSourceOrBuilder getGcsSourceOrBuilder(
       onChanged();;
       return gcsSourceBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -715,12 +689,11 @@ public static com.google.cloud.automl.v1beta1.InputConfig getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public InputConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InputConfig(input, extensionRegistry);
+        return new InputConfig(input, extensionRegistry);
     }
   };
 
@@ -733,7 +706,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.InputConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Io.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Io.java
index 07f7cf34db64..0bd872f9f64e 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Io.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Io.java
@@ -52,7 +52,7 @@ public static void registerAllExtensions(
       ".automl.v1beta1.GcsDestinationH\000B\r\n\013dest" +
       "ination\"\037\n\tGcsSource\022\022\n\ninput_uris\030\001 \003(\t" +
       "\"+\n\016GcsDestination\022\031\n\021output_uri_prefix\030" +
-      "\001 \001(\tBf\n\037com.google.cloud.automl.v1beta1" +
+      "\001 \001(\tBf\n\037com.google.cloud.automl.v1beta1",
       "P\001ZAgoogle.golang.org/genproto/googleapi" +
       "s/cloud/automl/v1beta1;automlb\006proto3"
     };
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListDatasetsRequest.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListDatasetsRequest.java
index 9d5e7a6d7089..6d7554d4b87e 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListDatasetsRequest.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListDatasetsRequest.java
@@ -36,9 +36,6 @@ private ListDatasetsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private ListDatasetsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private ListDatasetsRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private ListDatasetsRequest(
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ListDatasetsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ListDatasetsRequest_fieldAccessorTable
@@ -260,7 +256,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -270,7 +265,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -288,7 +282,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -425,7 +418,6 @@ public static com.google.cloud.automl.v1beta1.ListDatasetsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -433,7 +425,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.ListDatasetsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -461,7 +452,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ListDatasetsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ListDatasetsRequest_fieldAccessorTable
@@ -484,7 +474,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -498,18 +487,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ListDatasetsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ListDatasetsRequest getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.ListDatasetsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ListDatasetsRequest build() {
       com.google.cloud.automl.v1beta1.ListDatasetsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -518,7 +504,6 @@ public com.google.cloud.automl.v1beta1.ListDatasetsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ListDatasetsRequest buildPartial() {
       com.google.cloud.automl.v1beta1.ListDatasetsRequest result = new com.google.cloud.automl.v1beta1.ListDatasetsRequest(this);
       result.parent_ = parent_;
@@ -529,39 +514,32 @@ public com.google.cloud.automl.v1beta1.ListDatasetsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.ListDatasetsRequest) {
         return mergeFrom((com.google.cloud.automl.v1beta1.ListDatasetsRequest)other);
@@ -593,12 +571,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.ListDatasetsRequest oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -959,13 +935,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -987,12 +961,11 @@ public static com.google.cloud.automl.v1beta1.ListDatasetsRequest getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListDatasetsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDatasetsRequest(input, extensionRegistry);
+        return new ListDatasetsRequest(input, extensionRegistry);
     }
   };
 
@@ -1005,7 +978,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.ListDatasetsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListDatasetsResponse.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListDatasetsResponse.java
index ef17be1f6726..d2f36feba47a 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListDatasetsResponse.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListDatasetsResponse.java
@@ -34,9 +34,6 @@ private ListDatasetsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListDatasetsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               datasets_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListDatasetsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListDatasetsResponse(
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ListDatasetsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ListDatasetsResponse_fieldAccessorTable
@@ -199,7 +195,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -209,7 +204,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < datasets_.size(); i++) {
@@ -221,7 +215,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -346,7 +339,6 @@ public static com.google.cloud.automl.v1beta1.ListDatasetsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -354,7 +346,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.ListDatasetsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -382,7 +373,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ListDatasetsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ListDatasetsResponse_fieldAccessorTable
@@ -406,7 +396,6 @@ private void maybeForceBuilderInitialization() {
         getDatasetsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (datasetsBuilder_ == null) {
@@ -420,18 +409,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ListDatasetsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ListDatasetsResponse getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.ListDatasetsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ListDatasetsResponse build() {
       com.google.cloud.automl.v1beta1.ListDatasetsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -440,7 +426,6 @@ public com.google.cloud.automl.v1beta1.ListDatasetsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ListDatasetsResponse buildPartial() {
       com.google.cloud.automl.v1beta1.ListDatasetsResponse result = new com.google.cloud.automl.v1beta1.ListDatasetsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -460,39 +445,32 @@ public com.google.cloud.automl.v1beta1.ListDatasetsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.ListDatasetsResponse) {
         return mergeFrom((com.google.cloud.automl.v1beta1.ListDatasetsResponse)other);
@@ -539,12 +517,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.ListDatasetsResponse ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -969,13 +945,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -997,12 +971,11 @@ public static com.google.cloud.automl.v1beta1.ListDatasetsResponse getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListDatasetsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDatasetsResponse(input, extensionRegistry);
+        return new ListDatasetsResponse(input, extensionRegistry);
     }
   };
 
@@ -1015,7 +988,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.ListDatasetsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelEvaluationsRequest.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelEvaluationsRequest.java
index 722687f9e744..99d8e8cd8bff 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelEvaluationsRequest.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelEvaluationsRequest.java
@@ -36,9 +36,6 @@ private ListModelEvaluationsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private ListModelEvaluationsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private ListModelEvaluationsRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private ListModelEvaluationsRequest(
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ListModelEvaluationsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ListModelEvaluationsRequest_fieldAccessorTable
@@ -269,7 +265,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -279,7 +274,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -297,7 +291,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -434,7 +427,6 @@ public static com.google.cloud.automl.v1beta1.ListModelEvaluationsRequest parseF
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -442,7 +434,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.ListModelEvaluationsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -470,7 +461,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ListModelEvaluationsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ListModelEvaluationsRequest_fieldAccessorTable
@@ -493,7 +483,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -507,18 +496,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ListModelEvaluationsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ListModelEvaluationsRequest getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.ListModelEvaluationsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ListModelEvaluationsRequest build() {
       com.google.cloud.automl.v1beta1.ListModelEvaluationsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -527,7 +513,6 @@ public com.google.cloud.automl.v1beta1.ListModelEvaluationsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ListModelEvaluationsRequest buildPartial() {
       com.google.cloud.automl.v1beta1.ListModelEvaluationsRequest result = new com.google.cloud.automl.v1beta1.ListModelEvaluationsRequest(this);
       result.parent_ = parent_;
@@ -538,39 +523,32 @@ public com.google.cloud.automl.v1beta1.ListModelEvaluationsRequest buildPartial(
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.ListModelEvaluationsRequest) {
         return mergeFrom((com.google.cloud.automl.v1beta1.ListModelEvaluationsRequest)other);
@@ -602,12 +580,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.ListModelEvaluationsReq
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -990,13 +966,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1018,12 +992,11 @@ public static com.google.cloud.automl.v1beta1.ListModelEvaluationsRequest getDef
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListModelEvaluationsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListModelEvaluationsRequest(input, extensionRegistry);
+        return new ListModelEvaluationsRequest(input, extensionRegistry);
     }
   };
 
@@ -1036,7 +1009,6 @@ public com.google.protobuf.Parser getParserForType(
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.ListModelEvaluationsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelEvaluationsResponse.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelEvaluationsResponse.java
index 6e15fd1530b2..588359e22225 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelEvaluationsResponse.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelEvaluationsResponse.java
@@ -34,9 +34,6 @@ private ListModelEvaluationsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListModelEvaluationsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               modelEvaluation_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListModelEvaluationsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListModelEvaluationsResponse(
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ListModelEvaluationsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ListModelEvaluationsResponse_fieldAccessorTable
@@ -199,7 +195,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -209,7 +204,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < modelEvaluation_.size(); i++) {
@@ -221,7 +215,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -346,7 +339,6 @@ public static com.google.cloud.automl.v1beta1.ListModelEvaluationsResponse parse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -354,7 +346,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.ListModelEvaluationsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -382,7 +373,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ListModelEvaluationsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ListModelEvaluationsResponse_fieldAccessorTable
@@ -406,7 +396,6 @@ private void maybeForceBuilderInitialization() {
         getModelEvaluationFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (modelEvaluationBuilder_ == null) {
@@ -420,18 +409,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ListModelEvaluationsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ListModelEvaluationsResponse getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.ListModelEvaluationsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ListModelEvaluationsResponse build() {
       com.google.cloud.automl.v1beta1.ListModelEvaluationsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -440,7 +426,6 @@ public com.google.cloud.automl.v1beta1.ListModelEvaluationsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ListModelEvaluationsResponse buildPartial() {
       com.google.cloud.automl.v1beta1.ListModelEvaluationsResponse result = new com.google.cloud.automl.v1beta1.ListModelEvaluationsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -460,39 +445,32 @@ public com.google.cloud.automl.v1beta1.ListModelEvaluationsResponse buildPartial
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.ListModelEvaluationsResponse) {
         return mergeFrom((com.google.cloud.automl.v1beta1.ListModelEvaluationsResponse)other);
@@ -539,12 +517,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.ListModelEvaluationsRes
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -969,13 +945,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -997,12 +971,11 @@ public static com.google.cloud.automl.v1beta1.ListModelEvaluationsResponse getDe
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListModelEvaluationsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListModelEvaluationsResponse(input, extensionRegistry);
+        return new ListModelEvaluationsResponse(input, extensionRegistry);
     }
   };
 
@@ -1015,7 +988,6 @@ public com.google.protobuf.Parser getParserForType
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.ListModelEvaluationsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelsRequest.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelsRequest.java
index 6e06d63b884b..4d99e75027b0 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelsRequest.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelsRequest.java
@@ -36,9 +36,6 @@ private ListModelsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private ListModelsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private ListModelsRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private ListModelsRequest(
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ListModelsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ListModelsRequest_fieldAccessorTable
@@ -265,7 +261,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -275,7 +270,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -293,7 +287,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -430,7 +423,6 @@ public static com.google.cloud.automl.v1beta1.ListModelsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -438,7 +430,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.ListModelsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -466,7 +457,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ListModelsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ListModelsRequest_fieldAccessorTable
@@ -489,7 +479,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -503,18 +492,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ListModelsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ListModelsRequest getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.ListModelsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ListModelsRequest build() {
       com.google.cloud.automl.v1beta1.ListModelsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -523,7 +509,6 @@ public com.google.cloud.automl.v1beta1.ListModelsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ListModelsRequest buildPartial() {
       com.google.cloud.automl.v1beta1.ListModelsRequest result = new com.google.cloud.automl.v1beta1.ListModelsRequest(this);
       result.parent_ = parent_;
@@ -534,39 +519,32 @@ public com.google.cloud.automl.v1beta1.ListModelsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.ListModelsRequest) {
         return mergeFrom((com.google.cloud.automl.v1beta1.ListModelsRequest)other);
@@ -598,12 +576,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.ListModelsRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -976,13 +952,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1004,12 +978,11 @@ public static com.google.cloud.automl.v1beta1.ListModelsRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListModelsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListModelsRequest(input, extensionRegistry);
+        return new ListModelsRequest(input, extensionRegistry);
     }
   };
 
@@ -1022,7 +995,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.ListModelsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelsResponse.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelsResponse.java
index 8a64672f91bf..1ad8154b6965 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelsResponse.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ListModelsResponse.java
@@ -34,9 +34,6 @@ private ListModelsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListModelsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               model_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListModelsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListModelsResponse(
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ListModelsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ListModelsResponse_fieldAccessorTable
@@ -199,7 +195,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -209,7 +204,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < model_.size(); i++) {
@@ -221,7 +215,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -346,7 +339,6 @@ public static com.google.cloud.automl.v1beta1.ListModelsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -354,7 +346,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.ListModelsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -382,7 +373,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ListModelsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ListModelsResponse_fieldAccessorTable
@@ -406,7 +396,6 @@ private void maybeForceBuilderInitialization() {
         getModelFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (modelBuilder_ == null) {
@@ -420,18 +409,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_ListModelsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ListModelsResponse getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.ListModelsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ListModelsResponse build() {
       com.google.cloud.automl.v1beta1.ListModelsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -440,7 +426,6 @@ public com.google.cloud.automl.v1beta1.ListModelsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ListModelsResponse buildPartial() {
       com.google.cloud.automl.v1beta1.ListModelsResponse result = new com.google.cloud.automl.v1beta1.ListModelsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -460,39 +445,32 @@ public com.google.cloud.automl.v1beta1.ListModelsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.ListModelsResponse) {
         return mergeFrom((com.google.cloud.automl.v1beta1.ListModelsResponse)other);
@@ -539,12 +517,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.ListModelsResponse othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -969,13 +945,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -997,12 +971,11 @@ public static com.google.cloud.automl.v1beta1.ListModelsResponse getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListModelsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListModelsResponse(input, extensionRegistry);
+        return new ListModelsResponse(input, extensionRegistry);
     }
   };
 
@@ -1015,7 +988,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.ListModelsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Model.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Model.java
index 63e2e5a34542..60d942627b7d 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Model.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Model.java
@@ -36,9 +36,6 @@ private Model(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private Model(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -142,13 +146,6 @@ private Model(
             modelMetadataCase_ = 15;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -166,7 +163,6 @@ private Model(
     return com.google.cloud.automl.v1beta1.ModelOuterClass.internal_static_google_cloud_automl_v1beta1_Model_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.ModelOuterClass.internal_static_google_cloud_automl_v1beta1_Model_fieldAccessorTable
@@ -697,13 +693,11 @@ public int getDeploymentStateValue() {
    * .google.cloud.automl.v1beta1.Model.DeploymentState deployment_state = 8;
    */
   public com.google.cloud.automl.v1beta1.Model.DeploymentState getDeploymentState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.automl.v1beta1.Model.DeploymentState result = com.google.cloud.automl.v1beta1.Model.DeploymentState.valueOf(deploymentState_);
     return result == null ? com.google.cloud.automl.v1beta1.Model.DeploymentState.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -713,7 +707,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -746,7 +739,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -955,7 +947,6 @@ public static com.google.cloud.automl.v1beta1.Model parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -963,7 +954,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.Model prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -991,7 +981,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.ModelOuterClass.internal_static_google_cloud_automl_v1beta1_Model_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.ModelOuterClass.internal_static_google_cloud_automl_v1beta1_Model_fieldAccessorTable
@@ -1014,7 +1003,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -1042,18 +1030,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.ModelOuterClass.internal_static_google_cloud_automl_v1beta1_Model_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.Model getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.Model.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.Model build() {
       com.google.cloud.automl.v1beta1.Model result = buildPartial();
       if (!result.isInitialized()) {
@@ -1062,7 +1047,6 @@ public com.google.cloud.automl.v1beta1.Model build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.Model buildPartial() {
       com.google.cloud.automl.v1beta1.Model result = new com.google.cloud.automl.v1beta1.Model(this);
       if (modelMetadataCase_ == 13) {
@@ -1105,39 +1089,32 @@ public com.google.cloud.automl.v1beta1.Model buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.Model) {
         return mergeFrom((com.google.cloud.automl.v1beta1.Model)other);
@@ -1192,12 +1169,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.Model other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2409,7 +2384,6 @@ public Builder setDeploymentStateValue(int value) {
      * .google.cloud.automl.v1beta1.Model.DeploymentState deployment_state = 8;
      */
     public com.google.cloud.automl.v1beta1.Model.DeploymentState getDeploymentState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.automl.v1beta1.Model.DeploymentState result = com.google.cloud.automl.v1beta1.Model.DeploymentState.valueOf(deploymentState_);
       return result == null ? com.google.cloud.automl.v1beta1.Model.DeploymentState.UNRECOGNIZED : result;
     }
@@ -2442,13 +2416,11 @@ public Builder clearDeploymentState() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2470,12 +2442,11 @@ public static com.google.cloud.automl.v1beta1.Model getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Model parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Model(input, extensionRegistry);
+        return new Model(input, extensionRegistry);
     }
   };
 
@@ -2488,7 +2459,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.Model getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ModelEvaluation.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ModelEvaluation.java
index 5e250e126561..e46c8ef917f3 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ModelEvaluation.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ModelEvaluation.java
@@ -35,9 +35,6 @@ private ModelEvaluation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ModelEvaluation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -107,13 +111,6 @@ private ModelEvaluation(
             metricsCase_ = 9;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -131,7 +128,6 @@ private ModelEvaluation(
     return com.google.cloud.automl.v1beta1.ModelEvaluationOuterClass.internal_static_google_cloud_automl_v1beta1_ModelEvaluation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.ModelEvaluationOuterClass.internal_static_google_cloud_automl_v1beta1_ModelEvaluation_fieldAccessorTable
@@ -403,7 +399,6 @@ public int getEvaluatedExampleCount() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -413,7 +408,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -437,7 +431,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -615,7 +608,6 @@ public static com.google.cloud.automl.v1beta1.ModelEvaluation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -623,7 +615,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.ModelEvaluation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -651,7 +642,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.ModelEvaluationOuterClass.internal_static_google_cloud_automl_v1beta1_ModelEvaluation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.ModelEvaluationOuterClass.internal_static_google_cloud_automl_v1beta1_ModelEvaluation_fieldAccessorTable
@@ -674,7 +664,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -694,18 +683,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.ModelEvaluationOuterClass.internal_static_google_cloud_automl_v1beta1_ModelEvaluation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ModelEvaluation getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.ModelEvaluation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ModelEvaluation build() {
       com.google.cloud.automl.v1beta1.ModelEvaluation result = buildPartial();
       if (!result.isInitialized()) {
@@ -714,7 +700,6 @@ public com.google.cloud.automl.v1beta1.ModelEvaluation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.ModelEvaluation buildPartial() {
       com.google.cloud.automl.v1beta1.ModelEvaluation result = new com.google.cloud.automl.v1beta1.ModelEvaluation(this);
       if (metricsCase_ == 8) {
@@ -744,39 +729,32 @@ public com.google.cloud.automl.v1beta1.ModelEvaluation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.ModelEvaluation) {
         return mergeFrom((com.google.cloud.automl.v1beta1.ModelEvaluation)other);
@@ -820,12 +798,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.ModelEvaluation other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1620,13 +1596,11 @@ public Builder clearEvaluatedExampleCount() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1648,12 +1622,11 @@ public static com.google.cloud.automl.v1beta1.ModelEvaluation getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ModelEvaluation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ModelEvaluation(input, extensionRegistry);
+        return new ModelEvaluation(input, extensionRegistry);
     }
   };
 
@@ -1666,7 +1639,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.ModelEvaluation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ModelEvaluationOuterClass.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ModelEvaluationOuterClass.java
index d36fe573fb79..f284ab5810e6 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ModelEvaluationOuterClass.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ModelEvaluationOuterClass.java
@@ -37,7 +37,7 @@ public static void registerAllExtensions(
       "o\"\350\002\n\017ModelEvaluation\022i\n!classification_" +
       "evaluation_metrics\030\010 \001(\0132<.google.cloud." +
       "automl.v1beta1.ClassificationEvaluationM" +
-      "etricsH\000\022c\n\036translation_evaluation_metri" +
+      "etricsH\000\022c\n\036translation_evaluation_metri",
       "cs\030\t \001(\01329.google.cloud.automl.v1beta1.T" +
       "ranslationEvaluationMetricsH\000\022\014\n\004name\030\001 " +
       "\001(\t\022\032\n\022annotation_spec_id\030\002 \001(\t\022/\n\013creat" +
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ModelOuterClass.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ModelOuterClass.java
index 177acd4b8df7..b9f77068a488 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ModelOuterClass.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/ModelOuterClass.java
@@ -37,7 +37,7 @@ public static void registerAllExtensions(
       "tobuf/timestamp.proto\"\213\005\n\005Model\022l\n#image" +
       "_classification_model_metadata\030\r \001(\0132=.g" +
       "oogle.cloud.automl.v1beta1.ImageClassifi" +
-      "cationModelMetadataH\000\022j\n\"text_classifica" +
+      "cationModelMetadataH\000\022j\n\"text_classifica",
       "tion_model_metadata\030\016 \001(\0132<.google.cloud" +
       ".automl.v1beta1.TextClassificationModelM" +
       "etadataH\000\022[\n\032translation_model_metadata\030" +
@@ -47,7 +47,7 @@ public static void registerAllExtensions(
       "\n\013create_time\030\007 \001(\0132\032.google.protobuf.Ti" +
       "mestamp\022/\n\013update_time\030\013 \001(\0132\032.google.pr" +
       "otobuf.Timestamp\022L\n\020deployment_state\030\010 \001" +
-      "(\01622.google.cloud.automl.v1beta1.Model.D" +
+      "(\01622.google.cloud.automl.v1beta1.Model.D",
       "eploymentState\"Q\n\017DeploymentState\022 \n\034DEP" +
       "LOYMENT_STATE_UNSPECIFIED\020\000\022\014\n\010DEPLOYED\020" +
       "\001\022\016\n\nUNDEPLOYED\020\002B\020\n\016model_metadataBf\n\037c" +
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/OperationMetadata.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/OperationMetadata.java
index 78f1c1a7f3db..061f4651d9e8 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/OperationMetadata.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/OperationMetadata.java
@@ -34,9 +34,6 @@ private OperationMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private OperationMetadata(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
               partialFailures_ = new java.util.ArrayList();
@@ -102,13 +106,6 @@ private OperationMetadata(
             progressPercent_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -129,7 +126,6 @@ private OperationMetadata(
     return com.google.cloud.automl.v1beta1.Operations.internal_static_google_cloud_automl_v1beta1_OperationMetadata_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.Operations.internal_static_google_cloud_automl_v1beta1_OperationMetadata_fieldAccessorTable
@@ -362,7 +358,6 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -372,7 +367,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < partialFailures_.size(); i++) {
@@ -393,7 +387,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -568,7 +561,6 @@ public static com.google.cloud.automl.v1beta1.OperationMetadata parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -576,7 +568,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.OperationMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -604,7 +595,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.Operations.internal_static_google_cloud_automl_v1beta1_OperationMetadata_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.Operations.internal_static_google_cloud_automl_v1beta1_OperationMetadata_fieldAccessorTable
@@ -628,7 +618,6 @@ private void maybeForceBuilderInitialization() {
         getPartialFailuresFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       progressPercent_ = 0;
@@ -656,18 +645,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.Operations.internal_static_google_cloud_automl_v1beta1_OperationMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.OperationMetadata getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.OperationMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.OperationMetadata build() {
       com.google.cloud.automl.v1beta1.OperationMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -676,7 +662,6 @@ public com.google.cloud.automl.v1beta1.OperationMetadata build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.OperationMetadata buildPartial() {
       com.google.cloud.automl.v1beta1.OperationMetadata result = new com.google.cloud.automl.v1beta1.OperationMetadata(this);
       int from_bitField0_ = bitField0_;
@@ -714,39 +699,32 @@ public com.google.cloud.automl.v1beta1.OperationMetadata buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.OperationMetadata) {
         return mergeFrom((com.google.cloud.automl.v1beta1.OperationMetadata)other);
@@ -807,12 +785,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.OperationMetadata other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1728,13 +1704,11 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
       }
       return updateTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1756,12 +1730,11 @@ public static com.google.cloud.automl.v1beta1.OperationMetadata getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public OperationMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new OperationMetadata(input, extensionRegistry);
+        return new OperationMetadata(input, extensionRegistry);
     }
   };
 
@@ -1774,7 +1747,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.OperationMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Operations.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Operations.java
index d0b6c37e24cf..417dff62874f 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Operations.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/Operations.java
@@ -42,7 +42,7 @@ public static void registerAllExtensions(
       "obuf/timestamp.proto\032\027google/rpc/status." +
       "proto\"\243\002\n\021OperationMetadata\022Y\n\024create_mo" +
       "del_details\030\n \001(\01329.google.cloud.automl." +
-      "v1beta1.CreateModelOperationMetadataH\000\022\030" +
+      "v1beta1.CreateModelOperationMetadataH\000\022\030",
       "\n\020progress_percent\030\r \001(\005\022,\n\020partial_fail" +
       "ures\030\002 \003(\0132\022.google.rpc.Status\022/\n\013create" +
       "_time\030\003 \001(\0132\032.google.protobuf.Timestamp\022" +
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/OutputConfig.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/OutputConfig.java
index c0e95396bc41..00159a4ed9d0 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/OutputConfig.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/OutputConfig.java
@@ -32,9 +32,6 @@ private OutputConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private OutputConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.automl.v1beta1.GcsDestination.Builder subBuilder = null;
             if (destinationCase_ == 1) {
@@ -60,13 +64,6 @@ private OutputConfig(
             destinationCase_ = 1;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private OutputConfig(
     return com.google.cloud.automl.v1beta1.Io.internal_static_google_cloud_automl_v1beta1_OutputConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.Io.internal_static_google_cloud_automl_v1beta1_OutputConfig_fieldAccessorTable
@@ -167,7 +163,6 @@ public com.google.cloud.automl.v1beta1.GcsDestinationOrBuilder getGcsDestination
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -177,7 +172,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (destinationCase_ == 1) {
@@ -186,7 +180,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -317,7 +310,6 @@ public static com.google.cloud.automl.v1beta1.OutputConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -325,7 +317,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.OutputConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -353,7 +344,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.Io.internal_static_google_cloud_automl_v1beta1_OutputConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.Io.internal_static_google_cloud_automl_v1beta1_OutputConfig_fieldAccessorTable
@@ -376,7 +366,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       destinationCase_ = 0;
@@ -384,18 +373,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.Io.internal_static_google_cloud_automl_v1beta1_OutputConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.OutputConfig getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.OutputConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.OutputConfig build() {
       com.google.cloud.automl.v1beta1.OutputConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -404,7 +390,6 @@ public com.google.cloud.automl.v1beta1.OutputConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.OutputConfig buildPartial() {
       com.google.cloud.automl.v1beta1.OutputConfig result = new com.google.cloud.automl.v1beta1.OutputConfig(this);
       if (destinationCase_ == 1) {
@@ -419,39 +404,32 @@ public com.google.cloud.automl.v1beta1.OutputConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.OutputConfig) {
         return mergeFrom((com.google.cloud.automl.v1beta1.OutputConfig)other);
@@ -477,12 +455,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.OutputConfig other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -687,13 +663,11 @@ public com.google.cloud.automl.v1beta1.GcsDestinationOrBuilder getGcsDestination
       onChanged();;
       return gcsDestinationBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -715,12 +689,11 @@ public static com.google.cloud.automl.v1beta1.OutputConfig getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public OutputConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new OutputConfig(input, extensionRegistry);
+        return new OutputConfig(input, extensionRegistry);
     }
   };
 
@@ -733,7 +706,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.OutputConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/PredictRequest.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/PredictRequest.java
index 50fab1a8b17c..6965183b92d7 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/PredictRequest.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/PredictRequest.java
@@ -33,9 +33,6 @@ private PredictRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private PredictRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -79,13 +83,6 @@ private PredictRequest(
                 params__.getKey(), params__.getValue());
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private PredictRequest(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -115,7 +111,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.PredictionServiceProto.internal_static_google_cloud_automl_v1beta1_PredictRequest_fieldAccessorTable
@@ -322,7 +317,6 @@ public java.lang.String getParamsOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -332,7 +326,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -350,7 +343,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -494,7 +486,6 @@ public static com.google.cloud.automl.v1beta1.PredictRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -502,7 +493,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.PredictRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -552,7 +542,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.PredictionServiceProto.internal_static_google_cloud_automl_v1beta1_PredictRequest_fieldAccessorTable
@@ -575,7 +564,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -590,18 +578,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.PredictionServiceProto.internal_static_google_cloud_automl_v1beta1_PredictRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.PredictRequest getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.PredictRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.PredictRequest build() {
       com.google.cloud.automl.v1beta1.PredictRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -610,7 +595,6 @@ public com.google.cloud.automl.v1beta1.PredictRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.PredictRequest buildPartial() {
       com.google.cloud.automl.v1beta1.PredictRequest result = new com.google.cloud.automl.v1beta1.PredictRequest(this);
       int from_bitField0_ = bitField0_;
@@ -628,39 +612,32 @@ public com.google.cloud.automl.v1beta1.PredictRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.PredictRequest) {
         return mergeFrom((com.google.cloud.automl.v1beta1.PredictRequest)other);
@@ -686,12 +663,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.PredictRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1163,13 +1138,11 @@ public Builder putAllParams(
           .putAll(values);
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1191,12 +1164,11 @@ public static com.google.cloud.automl.v1beta1.PredictRequest getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PredictRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PredictRequest(input, extensionRegistry);
+        return new PredictRequest(input, extensionRegistry);
     }
   };
 
@@ -1209,7 +1181,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.PredictRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/PredictResponse.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/PredictResponse.java
index 5fee9ac9a6e3..63a2dcecc6b5 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/PredictResponse.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/PredictResponse.java
@@ -36,9 +36,6 @@ private PredictResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private PredictResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               payload_ = new java.util.ArrayList();
@@ -72,13 +76,6 @@ private PredictResponse(
                 metadata__.getKey(), metadata__.getValue());
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -100,7 +97,6 @@ private PredictResponse(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -111,7 +107,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.PredictionServiceProto.internal_static_google_cloud_automl_v1beta1_PredictResponse_fieldAccessorTable
@@ -267,7 +262,6 @@ public java.lang.String getMetadataOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -277,7 +271,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < payload_.size(); i++) {
@@ -292,7 +285,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -426,7 +418,6 @@ public static com.google.cloud.automl.v1beta1.PredictResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -434,7 +425,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.PredictResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -487,7 +477,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.PredictionServiceProto.internal_static_google_cloud_automl_v1beta1_PredictResponse_fieldAccessorTable
@@ -511,7 +500,6 @@ private void maybeForceBuilderInitialization() {
         getPayloadFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (payloadBuilder_ == null) {
@@ -524,18 +512,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.PredictionServiceProto.internal_static_google_cloud_automl_v1beta1_PredictResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.PredictResponse getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.PredictResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.PredictResponse build() {
       com.google.cloud.automl.v1beta1.PredictResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -544,7 +529,6 @@ public com.google.cloud.automl.v1beta1.PredictResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.PredictResponse buildPartial() {
       com.google.cloud.automl.v1beta1.PredictResponse result = new com.google.cloud.automl.v1beta1.PredictResponse(this);
       int from_bitField0_ = bitField0_;
@@ -563,39 +547,32 @@ public com.google.cloud.automl.v1beta1.PredictResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.PredictResponse) {
         return mergeFrom((com.google.cloud.automl.v1beta1.PredictResponse)other);
@@ -640,12 +617,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.PredictResponse other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1127,13 +1102,11 @@ public Builder putAllMetadata(
           .putAll(values);
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1155,12 +1128,11 @@ public static com.google.cloud.automl.v1beta1.PredictResponse getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PredictResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PredictResponse(input, extensionRegistry);
+        return new PredictResponse(input, extensionRegistry);
     }
   };
 
@@ -1173,7 +1145,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.PredictResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/PredictionServiceProto.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/PredictionServiceProto.java
index fbf07cb5fa8b..e23d1bee7f62 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/PredictionServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/PredictionServiceProto.java
@@ -52,7 +52,7 @@ public static void registerAllExtensions(
       "\030\001 \001(\t\022<\n\007payload\030\002 \001(\0132+.google.cloud.a" +
       "utoml.v1beta1.ExamplePayload\022G\n\006params\030\003" +
       " \003(\01327.google.cloud.automl.v1beta1.Predi" +
-      "ctRequest.ParamsEntry\032-\n\013ParamsEntry\022\013\n\003" +
+      "ctRequest.ParamsEntry\032-\n\013ParamsEntry\022\013\n\003",
       "key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\321\001\n\017Predict" +
       "Response\022?\n\007payload\030\001 \003(\0132..google.cloud" +
       ".automl.v1beta1.AnnotationPayload\022L\n\010met" +
@@ -62,7 +62,7 @@ public static void registerAllExtensions(
       "2\276\001\n\021PredictionService\022\250\001\n\007Predict\022+.goo" +
       "gle.cloud.automl.v1beta1.PredictRequest\032" +
       ",.google.cloud.automl.v1beta1.PredictRes" +
-      "ponse\"B\202\323\344\223\002<\"7/v1beta1/{name=projects/*" +
+      "ponse\"B\202\323\344\223\002<\"7/v1beta1/{name=projects/*",
       "/locations/*/models/*}:predict:\001*B~\n\037com" +
       ".google.cloud.automl.v1beta1B\026Prediction" +
       "ServiceProtoP\001ZAgoogle.golang.org/genpro" +
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextClassificationDatasetMetadata.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextClassificationDatasetMetadata.java
index 8a02fd34a659..560a0557d7aa 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextClassificationDatasetMetadata.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextClassificationDatasetMetadata.java
@@ -33,9 +33,6 @@ private TextClassificationDatasetMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private TextClassificationDatasetMetadata(
           case 0:
             done = true;
             break;
-          case 8: {
-            int rawValue = input.readEnum();
-
-            classificationType_ = rawValue;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private TextClassificationDatasetMetadata(
             }
             break;
           }
+          case 8: {
+            int rawValue = input.readEnum();
+
+            classificationType_ = rawValue;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private TextClassificationDatasetMetadata(
     return com.google.cloud.automl.v1beta1.TextProto.internal_static_google_cloud_automl_v1beta1_TextClassificationDatasetMetadata_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.TextProto.internal_static_google_cloud_automl_v1beta1_TextClassificationDatasetMetadata_fieldAccessorTable
@@ -107,13 +103,11 @@ public int getClassificationTypeValue() {
    * .google.cloud.automl.v1beta1.ClassificationType classification_type = 1;
    */
   public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationType getClassificationType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationType result = com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationType.valueOf(classificationType_);
     return result == null ? com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationType.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -123,7 +117,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (classificationType_ != com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationType.CLASSIFICATION_TYPE_UNSPECIFIED.getNumber()) {
@@ -132,7 +125,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -247,7 +239,6 @@ public static com.google.cloud.automl.v1beta1.TextClassificationDatasetMetadata
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -255,7 +246,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.TextClassificationDatasetMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -283,7 +273,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.TextProto.internal_static_google_cloud_automl_v1beta1_TextClassificationDatasetMetadata_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.TextProto.internal_static_google_cloud_automl_v1beta1_TextClassificationDatasetMetadata_fieldAccessorTable
@@ -306,7 +295,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       classificationType_ = 0;
@@ -314,18 +302,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.TextProto.internal_static_google_cloud_automl_v1beta1_TextClassificationDatasetMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.TextClassificationDatasetMetadata getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.TextClassificationDatasetMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.TextClassificationDatasetMetadata build() {
       com.google.cloud.automl.v1beta1.TextClassificationDatasetMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -334,7 +319,6 @@ public com.google.cloud.automl.v1beta1.TextClassificationDatasetMetadata build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.TextClassificationDatasetMetadata buildPartial() {
       com.google.cloud.automl.v1beta1.TextClassificationDatasetMetadata result = new com.google.cloud.automl.v1beta1.TextClassificationDatasetMetadata(this);
       result.classificationType_ = classificationType_;
@@ -342,39 +326,32 @@ public com.google.cloud.automl.v1beta1.TextClassificationDatasetMetadata buildPa
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.TextClassificationDatasetMetadata) {
         return mergeFrom((com.google.cloud.automl.v1beta1.TextClassificationDatasetMetadata)other);
@@ -394,12 +371,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.TextClassificationDatas
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -452,7 +427,6 @@ public Builder setClassificationTypeValue(int value) {
      * .google.cloud.automl.v1beta1.ClassificationType classification_type = 1;
      */
     public com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationType getClassificationType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationType result = com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationType.valueOf(classificationType_);
       return result == null ? com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationType.UNRECOGNIZED : result;
     }
@@ -487,13 +461,11 @@ public Builder clearClassificationType() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -515,12 +487,11 @@ public static com.google.cloud.automl.v1beta1.TextClassificationDatasetMetadata
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TextClassificationDatasetMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TextClassificationDatasetMetadata(input, extensionRegistry);
+        return new TextClassificationDatasetMetadata(input, extensionRegistry);
     }
   };
 
@@ -533,7 +504,6 @@ public com.google.protobuf.Parser getParserFo
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.TextClassificationDatasetMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextClassificationModelMetadata.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextClassificationModelMetadata.java
index d9518a6f578b..1db52c9d9fab 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextClassificationModelMetadata.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextClassificationModelMetadata.java
@@ -32,9 +32,6 @@ private TextClassificationModelMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -69,7 +66,6 @@ private TextClassificationModelMetadata(
     return com.google.cloud.automl.v1beta1.TextProto.internal_static_google_cloud_automl_v1beta1_TextClassificationModelMetadata_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.TextProto.internal_static_google_cloud_automl_v1beta1_TextClassificationModelMetadata_fieldAccessorTable
@@ -78,7 +74,6 @@ private TextClassificationModelMetadata(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -88,13 +83,11 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -202,7 +195,6 @@ public static com.google.cloud.automl.v1beta1.TextClassificationModelMetadata pa
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -210,7 +202,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.TextClassificationModelMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -238,7 +229,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.TextProto.internal_static_google_cloud_automl_v1beta1_TextClassificationModelMetadata_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.TextProto.internal_static_google_cloud_automl_v1beta1_TextClassificationModelMetadata_fieldAccessorTable
@@ -261,24 +251,20 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.TextProto.internal_static_google_cloud_automl_v1beta1_TextClassificationModelMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.TextClassificationModelMetadata getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.TextClassificationModelMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.TextClassificationModelMetadata build() {
       com.google.cloud.automl.v1beta1.TextClassificationModelMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -287,46 +273,38 @@ public com.google.cloud.automl.v1beta1.TextClassificationModelMetadata build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.TextClassificationModelMetadata buildPartial() {
       com.google.cloud.automl.v1beta1.TextClassificationModelMetadata result = new com.google.cloud.automl.v1beta1.TextClassificationModelMetadata(this);
       onBuilt();
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.TextClassificationModelMetadata) {
         return mergeFrom((com.google.cloud.automl.v1beta1.TextClassificationModelMetadata)other);
@@ -343,12 +321,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.TextClassificationModel
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -366,13 +342,11 @@ public Builder mergeFrom(
       }
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -394,12 +368,11 @@ public static com.google.cloud.automl.v1beta1.TextClassificationModelMetadata ge
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TextClassificationModelMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TextClassificationModelMetadata(input, extensionRegistry);
+        return new TextClassificationModelMetadata(input, extensionRegistry);
     }
   };
 
@@ -412,7 +385,6 @@ public com.google.protobuf.Parser getParserForT
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.TextClassificationModelMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextProto.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextProto.java
index 8c67757d52a9..d1f3cccb524c 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextProto.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextProto.java
@@ -42,7 +42,7 @@ public static void registerAllExtensions(
       "beta1.ClassificationType\"!\n\037TextClassifi" +
       "cationModelMetadataBq\n\037com.google.cloud." +
       "automl.v1beta1B\tTextProtoP\001ZAgoogle.gola" +
-      "ng.org/genproto/googleapis/cloud/automl/" +
+      "ng.org/genproto/googleapis/cloud/automl/",
       "v1beta1;automlb\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextSnippet.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextSnippet.java
index 4da23174dcab..5caddcfdf21e 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextSnippet.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TextSnippet.java
@@ -35,9 +35,6 @@ private TextSnippet(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private TextSnippet(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -67,13 +71,6 @@ private TextSnippet(
             contentUri_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private TextSnippet(
     return com.google.cloud.automl.v1beta1.DataItems.internal_static_google_cloud_automl_v1beta1_TextSnippet_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.DataItems.internal_static_google_cloud_automl_v1beta1_TextSnippet_fieldAccessorTable
@@ -234,7 +230,6 @@ public java.lang.String getContentUri() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -244,7 +239,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getContentBytes().isEmpty()) {
@@ -259,7 +253,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -388,7 +381,6 @@ public static com.google.cloud.automl.v1beta1.TextSnippet parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -396,7 +388,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.TextSnippet prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -424,7 +415,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.DataItems.internal_static_google_cloud_automl_v1beta1_TextSnippet_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.DataItems.internal_static_google_cloud_automl_v1beta1_TextSnippet_fieldAccessorTable
@@ -447,7 +437,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       content_ = "";
@@ -459,18 +448,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.DataItems.internal_static_google_cloud_automl_v1beta1_TextSnippet_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.TextSnippet getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.TextSnippet.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.TextSnippet build() {
       com.google.cloud.automl.v1beta1.TextSnippet result = buildPartial();
       if (!result.isInitialized()) {
@@ -479,7 +465,6 @@ public com.google.cloud.automl.v1beta1.TextSnippet build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.TextSnippet buildPartial() {
       com.google.cloud.automl.v1beta1.TextSnippet result = new com.google.cloud.automl.v1beta1.TextSnippet(this);
       result.content_ = content_;
@@ -489,39 +474,32 @@ public com.google.cloud.automl.v1beta1.TextSnippet buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.TextSnippet) {
         return mergeFrom((com.google.cloud.automl.v1beta1.TextSnippet)other);
@@ -550,12 +528,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.TextSnippet other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -860,13 +836,11 @@ public Builder setContentUriBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -888,12 +862,11 @@ public static com.google.cloud.automl.v1beta1.TextSnippet getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TextSnippet parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TextSnippet(input, extensionRegistry);
+        return new TextSnippet(input, extensionRegistry);
     }
   };
 
@@ -906,7 +879,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.TextSnippet getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationAnnotation.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationAnnotation.java
index 903d591b9638..9a48bc566486 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationAnnotation.java
@@ -32,9 +32,6 @@ private TranslationAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private TranslationAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.automl.v1beta1.TextSnippet.Builder subBuilder = null;
             if (translatedContent_ != null) {
@@ -59,13 +63,6 @@ private TranslationAnnotation(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private TranslationAnnotation(
     return com.google.cloud.automl.v1beta1.TranslationProto.internal_static_google_cloud_automl_v1beta1_TranslationAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.TranslationProto.internal_static_google_cloud_automl_v1beta1_TranslationAnnotation_fieldAccessorTable
@@ -125,7 +121,6 @@ public com.google.cloud.automl.v1beta1.TextSnippetOrBuilder getTranslatedContent
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -135,7 +130,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (translatedContent_ != null) {
@@ -144,7 +138,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static com.google.cloud.automl.v1beta1.TranslationAnnotation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.TranslationAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.TranslationProto.internal_static_google_cloud_automl_v1beta1_TranslationAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.TranslationProto.internal_static_google_cloud_automl_v1beta1_TranslationAnnotation_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (translatedContentBuilder_ == null) {
@@ -336,18 +325,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.TranslationProto.internal_static_google_cloud_automl_v1beta1_TranslationAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.TranslationAnnotation getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.TranslationAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.TranslationAnnotation build() {
       com.google.cloud.automl.v1beta1.TranslationAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -356,7 +342,6 @@ public com.google.cloud.automl.v1beta1.TranslationAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.TranslationAnnotation buildPartial() {
       com.google.cloud.automl.v1beta1.TranslationAnnotation result = new com.google.cloud.automl.v1beta1.TranslationAnnotation(this);
       if (translatedContentBuilder_ == null) {
@@ -368,39 +353,32 @@ public com.google.cloud.automl.v1beta1.TranslationAnnotation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.TranslationAnnotation) {
         return mergeFrom((com.google.cloud.automl.v1beta1.TranslationAnnotation)other);
@@ -420,12 +398,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.TranslationAnnotation o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -596,13 +572,11 @@ public com.google.cloud.automl.v1beta1.TextSnippetOrBuilder getTranslatedContent
       }
       return translatedContentBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -624,12 +598,11 @@ public static com.google.cloud.automl.v1beta1.TranslationAnnotation getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TranslationAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TranslationAnnotation(input, extensionRegistry);
+        return new TranslationAnnotation(input, extensionRegistry);
     }
   };
 
@@ -642,7 +615,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.TranslationAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationDatasetMetadata.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationDatasetMetadata.java
index 85e3fe9c19f7..bde5814bb0de 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationDatasetMetadata.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationDatasetMetadata.java
@@ -34,9 +34,6 @@ private TranslationDatasetMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private TranslationDatasetMetadata(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private TranslationDatasetMetadata(
             targetLanguageCode_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private TranslationDatasetMetadata(
     return com.google.cloud.automl.v1beta1.TranslationProto.internal_static_google_cloud_automl_v1beta1_TranslationDatasetMetadata_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.TranslationProto.internal_static_google_cloud_automl_v1beta1_TranslationDatasetMetadata_fieldAccessorTable
@@ -177,7 +173,6 @@ public java.lang.String getTargetLanguageCode() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -187,7 +182,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getSourceLanguageCodeBytes().isEmpty()) {
@@ -199,7 +193,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -321,7 +314,6 @@ public static com.google.cloud.automl.v1beta1.TranslationDatasetMetadata parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -329,7 +321,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.TranslationDatasetMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -357,7 +348,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.TranslationProto.internal_static_google_cloud_automl_v1beta1_TranslationDatasetMetadata_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.TranslationProto.internal_static_google_cloud_automl_v1beta1_TranslationDatasetMetadata_fieldAccessorTable
@@ -380,7 +370,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       sourceLanguageCode_ = "";
@@ -390,18 +379,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.TranslationProto.internal_static_google_cloud_automl_v1beta1_TranslationDatasetMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.TranslationDatasetMetadata getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.TranslationDatasetMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.TranslationDatasetMetadata build() {
       com.google.cloud.automl.v1beta1.TranslationDatasetMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -410,7 +396,6 @@ public com.google.cloud.automl.v1beta1.TranslationDatasetMetadata build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.TranslationDatasetMetadata buildPartial() {
       com.google.cloud.automl.v1beta1.TranslationDatasetMetadata result = new com.google.cloud.automl.v1beta1.TranslationDatasetMetadata(this);
       result.sourceLanguageCode_ = sourceLanguageCode_;
@@ -419,39 +404,32 @@ public com.google.cloud.automl.v1beta1.TranslationDatasetMetadata buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.TranslationDatasetMetadata) {
         return mergeFrom((com.google.cloud.automl.v1beta1.TranslationDatasetMetadata)other);
@@ -476,12 +454,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.TranslationDatasetMetad
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -677,13 +653,11 @@ public Builder setTargetLanguageCodeBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -705,12 +679,11 @@ public static com.google.cloud.automl.v1beta1.TranslationDatasetMetadata getDefa
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TranslationDatasetMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TranslationDatasetMetadata(input, extensionRegistry);
+        return new TranslationDatasetMetadata(input, extensionRegistry);
     }
   };
 
@@ -723,7 +696,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.TranslationDatasetMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationEvaluationMetrics.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationEvaluationMetrics.java
index 3ae2649af1a0..263ad9d0216d 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationEvaluationMetrics.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationEvaluationMetrics.java
@@ -34,9 +34,6 @@ private TranslationEvaluationMetrics(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private TranslationEvaluationMetrics(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 9: {
 
             bleuScore_ = input.readDouble();
@@ -58,13 +62,6 @@ private TranslationEvaluationMetrics(
             baseBleuScore_ = input.readDouble();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -82,7 +79,6 @@ private TranslationEvaluationMetrics(
     return com.google.cloud.automl.v1beta1.TranslationProto.internal_static_google_cloud_automl_v1beta1_TranslationEvaluationMetrics_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.TranslationProto.internal_static_google_cloud_automl_v1beta1_TranslationEvaluationMetrics_fieldAccessorTable
@@ -117,7 +113,6 @@ public double getBaseBleuScore() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -127,7 +122,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (bleuScore_ != 0D) {
@@ -139,7 +133,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -269,7 +262,6 @@ public static com.google.cloud.automl.v1beta1.TranslationEvaluationMetrics parse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -277,7 +269,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.TranslationEvaluationMetrics prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -305,7 +296,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.TranslationProto.internal_static_google_cloud_automl_v1beta1_TranslationEvaluationMetrics_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.TranslationProto.internal_static_google_cloud_automl_v1beta1_TranslationEvaluationMetrics_fieldAccessorTable
@@ -328,7 +318,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       bleuScore_ = 0D;
@@ -338,18 +327,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.TranslationProto.internal_static_google_cloud_automl_v1beta1_TranslationEvaluationMetrics_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.TranslationEvaluationMetrics getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.TranslationEvaluationMetrics.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.TranslationEvaluationMetrics build() {
       com.google.cloud.automl.v1beta1.TranslationEvaluationMetrics result = buildPartial();
       if (!result.isInitialized()) {
@@ -358,7 +344,6 @@ public com.google.cloud.automl.v1beta1.TranslationEvaluationMetrics build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.TranslationEvaluationMetrics buildPartial() {
       com.google.cloud.automl.v1beta1.TranslationEvaluationMetrics result = new com.google.cloud.automl.v1beta1.TranslationEvaluationMetrics(this);
       result.bleuScore_ = bleuScore_;
@@ -367,39 +352,32 @@ public com.google.cloud.automl.v1beta1.TranslationEvaluationMetrics buildPartial
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.TranslationEvaluationMetrics) {
         return mergeFrom((com.google.cloud.automl.v1beta1.TranslationEvaluationMetrics)other);
@@ -422,12 +400,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.TranslationEvaluationMe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -521,13 +497,11 @@ public Builder clearBaseBleuScore() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -549,12 +523,11 @@ public static com.google.cloud.automl.v1beta1.TranslationEvaluationMetrics getDe
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TranslationEvaluationMetrics parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TranslationEvaluationMetrics(input, extensionRegistry);
+        return new TranslationEvaluationMetrics(input, extensionRegistry);
     }
   };
 
@@ -567,7 +540,6 @@ public com.google.protobuf.Parser getParserForType
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.TranslationEvaluationMetrics getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationModelMetadata.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationModelMetadata.java
index a400fe0fb88b..db2334cc1372 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationModelMetadata.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationModelMetadata.java
@@ -35,9 +35,6 @@ private TranslationModelMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private TranslationModelMetadata(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -67,13 +71,6 @@ private TranslationModelMetadata(
             targetLanguageCode_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private TranslationModelMetadata(
     return com.google.cloud.automl.v1beta1.TranslationProto.internal_static_google_cloud_automl_v1beta1_TranslationModelMetadata_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.TranslationProto.internal_static_google_cloud_automl_v1beta1_TranslationModelMetadata_fieldAccessorTable
@@ -236,7 +232,6 @@ public java.lang.String getTargetLanguageCode() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -246,7 +241,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getBaseModelBytes().isEmpty()) {
@@ -261,7 +255,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -390,7 +383,6 @@ public static com.google.cloud.automl.v1beta1.TranslationModelMetadata parseFrom
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -398,7 +390,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.TranslationModelMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -426,7 +417,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.TranslationProto.internal_static_google_cloud_automl_v1beta1_TranslationModelMetadata_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.TranslationProto.internal_static_google_cloud_automl_v1beta1_TranslationModelMetadata_fieldAccessorTable
@@ -449,7 +439,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       baseModel_ = "";
@@ -461,18 +450,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.TranslationProto.internal_static_google_cloud_automl_v1beta1_TranslationModelMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.TranslationModelMetadata getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.TranslationModelMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.TranslationModelMetadata build() {
       com.google.cloud.automl.v1beta1.TranslationModelMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -481,7 +467,6 @@ public com.google.cloud.automl.v1beta1.TranslationModelMetadata build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.TranslationModelMetadata buildPartial() {
       com.google.cloud.automl.v1beta1.TranslationModelMetadata result = new com.google.cloud.automl.v1beta1.TranslationModelMetadata(this);
       result.baseModel_ = baseModel_;
@@ -491,39 +476,32 @@ public com.google.cloud.automl.v1beta1.TranslationModelMetadata buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.TranslationModelMetadata) {
         return mergeFrom((com.google.cloud.automl.v1beta1.TranslationModelMetadata)other);
@@ -552,12 +530,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.TranslationModelMetadat
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -867,13 +843,11 @@ public Builder setTargetLanguageCodeBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -895,12 +869,11 @@ public static com.google.cloud.automl.v1beta1.TranslationModelMetadata getDefaul
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TranslationModelMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TranslationModelMetadata(input, extensionRegistry);
+        return new TranslationModelMetadata(input, extensionRegistry);
     }
   };
 
@@ -913,7 +886,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.TranslationModelMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationProto.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationProto.java
index f35f92b6a3a0..a1cdc8f50e72 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationProto.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/TranslationProto.java
@@ -52,7 +52,7 @@ public static void registerAllExtensions(
       "(\t\"K\n\034TranslationEvaluationMetrics\022\022\n\nbl" +
       "eu_score\030\001 \001(\001\022\027\n\017base_bleu_score\030\002 \001(\001\"" +
       "j\n\030TranslationModelMetadata\022\022\n\nbase_mode" +
-      "l\030\001 \001(\t\022\034\n\024source_language_code\030\002 \001(\t\022\034\n" +
+      "l\030\001 \001(\t\022\034\n\024source_language_code\030\002 \001(\t\022\034\n",
       "\024target_language_code\030\003 \001(\t\"]\n\025Translati" +
       "onAnnotation\022D\n\022translated_content\030\001 \001(\013" +
       "2(.google.cloud.automl.v1beta1.TextSnipp" +
diff --git a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/UndeployModelRequest.java b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/UndeployModelRequest.java
index 82f098bdcad0..9ed7ca827737 100644
--- a/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/UndeployModelRequest.java
+++ b/google-api-grpc/proto-google-cloud-automl-v1beta1/src/main/java/com/google/cloud/automl/v1beta1/UndeployModelRequest.java
@@ -33,9 +33,6 @@ private UndeployModelRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private UndeployModelRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private UndeployModelRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private UndeployModelRequest(
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_UndeployModelRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_UndeployModelRequest_fieldAccessorTable
@@ -128,7 +124,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -138,7 +133,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -147,7 +141,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -262,7 +255,6 @@ public static com.google.cloud.automl.v1beta1.UndeployModelRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -270,7 +262,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.automl.v1beta1.UndeployModelRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -298,7 +289,6 @@ public static final class Builder extends
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_UndeployModelRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_UndeployModelRequest_fieldAccessorTable
@@ -321,7 +311,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -329,18 +318,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.automl.v1beta1.AutoMlProto.internal_static_google_cloud_automl_v1beta1_UndeployModelRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.UndeployModelRequest getDefaultInstanceForType() {
       return com.google.cloud.automl.v1beta1.UndeployModelRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.UndeployModelRequest build() {
       com.google.cloud.automl.v1beta1.UndeployModelRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -349,7 +335,6 @@ public com.google.cloud.automl.v1beta1.UndeployModelRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.automl.v1beta1.UndeployModelRequest buildPartial() {
       com.google.cloud.automl.v1beta1.UndeployModelRequest result = new com.google.cloud.automl.v1beta1.UndeployModelRequest(this);
       result.name_ = name_;
@@ -357,39 +342,32 @@ public com.google.cloud.automl.v1beta1.UndeployModelRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.automl.v1beta1.UndeployModelRequest) {
         return mergeFrom((com.google.cloud.automl.v1beta1.UndeployModelRequest)other);
@@ -410,12 +388,10 @@ public Builder mergeFrom(com.google.cloud.automl.v1beta1.UndeployModelRequest ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -522,13 +498,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -550,12 +524,11 @@ public static com.google.cloud.automl.v1beta1.UndeployModelRequest getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UndeployModelRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UndeployModelRequest(input, extensionRegistry);
+        return new UndeployModelRequest(input, extensionRegistry);
     }
   };
 
@@ -568,7 +541,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.automl.v1beta1.UndeployModelRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/CheckValidCredsRequest.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/CheckValidCredsRequest.java
index 60b46c322f75..ea85946ffdc4 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/CheckValidCredsRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/CheckValidCredsRequest.java
@@ -38,9 +38,6 @@ private CheckValidCredsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,12 +49,6 @@ private CheckValidCredsRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -65,6 +56,12 @@ private CheckValidCredsRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -82,7 +79,6 @@ private CheckValidCredsRequest(
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_CheckValidCredsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_CheckValidCredsRequest_fieldAccessorTable
@@ -135,7 +131,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -145,7 +140,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -154,7 +148,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -269,7 +262,6 @@ public static com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsRequest p
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -277,7 +269,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -310,7 +301,6 @@ public static final class Builder extends
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_CheckValidCredsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_CheckValidCredsRequest_fieldAccessorTable
@@ -333,7 +323,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -341,18 +330,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_CheckValidCredsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsRequest getDefaultInstanceForType() {
       return com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsRequest build() {
       com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -361,7 +347,6 @@ public com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsRequest build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsRequest buildPartial() {
       com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsRequest result = new com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsRequest(this);
       result.name_ = name_;
@@ -369,39 +354,32 @@ public com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsRequest buildPar
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsRequest) {
         return mergeFrom((com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsRequest)other);
@@ -422,12 +400,10 @@ public Builder mergeFrom(com.google.cloud.bigquery.datatransfer.v1.CheckValidCre
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -539,13 +515,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -567,12 +541,11 @@ public static com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsRequest g
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CheckValidCredsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CheckValidCredsRequest(input, extensionRegistry);
+        return new CheckValidCredsRequest(input, extensionRegistry);
     }
   };
 
@@ -585,7 +558,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/CheckValidCredsResponse.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/CheckValidCredsResponse.java
index d2813d55cbe7..57465fde5e0f 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/CheckValidCredsResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/CheckValidCredsResponse.java
@@ -33,9 +33,6 @@ private CheckValidCredsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,11 +44,6 @@ private CheckValidCredsResponse(
           case 0:
             done = true;
             break;
-          case 8: {
-
-            hasValidCreds_ = input.readBool();
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -59,6 +51,11 @@ private CheckValidCredsResponse(
             }
             break;
           }
+          case 8: {
+
+            hasValidCreds_ = input.readBool();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -76,7 +73,6 @@ private CheckValidCredsResponse(
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_CheckValidCredsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_CheckValidCredsResponse_fieldAccessorTable
@@ -98,7 +94,6 @@ public boolean getHasValidCreds() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -108,7 +103,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (hasValidCreds_ != false) {
@@ -117,7 +111,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -234,7 +227,6 @@ public static com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsResponse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -242,7 +234,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -270,7 +261,6 @@ public static final class Builder extends
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_CheckValidCredsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_CheckValidCredsResponse_fieldAccessorTable
@@ -293,7 +283,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       hasValidCreds_ = false;
@@ -301,18 +290,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_CheckValidCredsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsResponse getDefaultInstanceForType() {
       return com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsResponse build() {
       com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -321,7 +307,6 @@ public com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsResponse build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsResponse buildPartial() {
       com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsResponse result = new com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsResponse(this);
       result.hasValidCreds_ = hasValidCreds_;
@@ -329,39 +314,32 @@ public com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsResponse buildPa
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsResponse) {
         return mergeFrom((com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsResponse)other);
@@ -381,12 +359,10 @@ public Builder mergeFrom(com.google.cloud.bigquery.datatransfer.v1.CheckValidCre
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -442,13 +418,11 @@ public Builder clearHasValidCreds() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -470,12 +444,11 @@ public static com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsResponse
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CheckValidCredsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CheckValidCredsResponse(input, extensionRegistry);
+        return new CheckValidCredsResponse(input, extensionRegistry);
     }
   };
 
@@ -488,7 +461,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.bigquery.datatransfer.v1.CheckValidCredsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/CreateTransferConfigRequest.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/CreateTransferConfigRequest.java
index 8c9293a2e893..924ad6700d08 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/CreateTransferConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/CreateTransferConfigRequest.java
@@ -39,9 +39,6 @@ private CreateTransferConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private CreateTransferConfigRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -78,13 +82,6 @@ private CreateTransferConfigRequest(
             authorizationCode_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -102,7 +99,6 @@ private CreateTransferConfigRequest(
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_CreateTransferConfigRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_CreateTransferConfigRequest_fieldAccessorTable
@@ -262,7 +258,6 @@ public java.lang.String getAuthorizationCode() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -272,7 +267,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -287,7 +281,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -422,7 +415,6 @@ public static com.google.cloud.bigquery.datatransfer.v1.CreateTransferConfigRequ
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -430,7 +422,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.bigquery.datatransfer.v1.CreateTransferConfigRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -463,7 +454,6 @@ public static final class Builder extends
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_CreateTransferConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_CreateTransferConfigRequest_fieldAccessorTable
@@ -486,7 +476,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -502,18 +491,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_CreateTransferConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.CreateTransferConfigRequest getDefaultInstanceForType() {
       return com.google.cloud.bigquery.datatransfer.v1.CreateTransferConfigRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.CreateTransferConfigRequest build() {
       com.google.cloud.bigquery.datatransfer.v1.CreateTransferConfigRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -522,7 +508,6 @@ public com.google.cloud.bigquery.datatransfer.v1.CreateTransferConfigRequest bui
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.CreateTransferConfigRequest buildPartial() {
       com.google.cloud.bigquery.datatransfer.v1.CreateTransferConfigRequest result = new com.google.cloud.bigquery.datatransfer.v1.CreateTransferConfigRequest(this);
       result.parent_ = parent_;
@@ -536,39 +521,32 @@ public com.google.cloud.bigquery.datatransfer.v1.CreateTransferConfigRequest bui
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.bigquery.datatransfer.v1.CreateTransferConfigRequest) {
         return mergeFrom((com.google.cloud.bigquery.datatransfer.v1.CreateTransferConfigRequest)other);
@@ -596,12 +574,10 @@ public Builder mergeFrom(com.google.cloud.bigquery.datatransfer.v1.CreateTransfe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1035,13 +1011,11 @@ public Builder setAuthorizationCodeBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1063,12 +1037,11 @@ public static com.google.cloud.bigquery.datatransfer.v1.CreateTransferConfigRequ
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateTransferConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateTransferConfigRequest(input, extensionRegistry);
+        return new CreateTransferConfigRequest(input, extensionRegistry);
     }
   };
 
@@ -1081,7 +1054,6 @@ public com.google.protobuf.Parser getParserForType(
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.bigquery.datatransfer.v1.CreateTransferConfigRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataSource.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataSource.java
index 49a16785c16b..6c6fb120e785 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataSource.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataSource.java
@@ -50,9 +50,6 @@ private DataSource(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -64,6 +61,13 @@ private DataSource(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -180,13 +184,6 @@ private DataSource(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -210,7 +207,6 @@ private DataSource(
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_DataSource_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_DataSource_fieldAccessorTable
@@ -790,7 +786,6 @@ public int getTransferTypeValue() {
    * .google.cloud.bigquery.datatransfer.v1.TransferType transfer_type = 7;
    */
   public com.google.cloud.bigquery.datatransfer.v1.TransferType getTransferType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.bigquery.datatransfer.v1.TransferType result = com.google.cloud.bigquery.datatransfer.v1.TransferType.valueOf(transferType_);
     return result == null ? com.google.cloud.bigquery.datatransfer.v1.TransferType.UNRECOGNIZED : result;
   }
@@ -1005,7 +1000,6 @@ public int getAuthorizationTypeValue() {
    * .google.cloud.bigquery.datatransfer.v1.DataSource.AuthorizationType authorization_type = 14;
    */
   public com.google.cloud.bigquery.datatransfer.v1.DataSource.AuthorizationType getAuthorizationType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.bigquery.datatransfer.v1.DataSource.AuthorizationType result = com.google.cloud.bigquery.datatransfer.v1.DataSource.AuthorizationType.valueOf(authorizationType_);
     return result == null ? com.google.cloud.bigquery.datatransfer.v1.DataSource.AuthorizationType.UNRECOGNIZED : result;
   }
@@ -1036,7 +1030,6 @@ public int getDataRefreshTypeValue() {
    * .google.cloud.bigquery.datatransfer.v1.DataSource.DataRefreshType data_refresh_type = 15;
    */
   public com.google.cloud.bigquery.datatransfer.v1.DataSource.DataRefreshType getDataRefreshType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.bigquery.datatransfer.v1.DataSource.DataRefreshType result = com.google.cloud.bigquery.datatransfer.v1.DataSource.DataRefreshType.valueOf(dataRefreshType_);
     return result == null ? com.google.cloud.bigquery.datatransfer.v1.DataSource.DataRefreshType.UNRECOGNIZED : result;
   }
@@ -1103,7 +1096,6 @@ public com.google.protobuf.DurationOrBuilder getMinimumScheduleIntervalOrBuilder
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1113,7 +1105,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -1173,7 +1164,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1431,7 +1421,6 @@ public static com.google.cloud.bigquery.datatransfer.v1.DataSource parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1439,7 +1428,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.bigquery.datatransfer.v1.DataSource prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1468,7 +1456,6 @@ public static final class Builder extends
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_DataSource_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_DataSource_fieldAccessorTable
@@ -1492,7 +1479,6 @@ private void maybeForceBuilderInitialization() {
         getParametersFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -1542,18 +1528,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_DataSource_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.DataSource getDefaultInstanceForType() {
       return com.google.cloud.bigquery.datatransfer.v1.DataSource.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.DataSource build() {
       com.google.cloud.bigquery.datatransfer.v1.DataSource result = buildPartial();
       if (!result.isInitialized()) {
@@ -1562,7 +1545,6 @@ public com.google.cloud.bigquery.datatransfer.v1.DataSource build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.DataSource buildPartial() {
       com.google.cloud.bigquery.datatransfer.v1.DataSource result = new com.google.cloud.bigquery.datatransfer.v1.DataSource(this);
       int from_bitField0_ = bitField0_;
@@ -1606,39 +1588,32 @@ public com.google.cloud.bigquery.datatransfer.v1.DataSource buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.bigquery.datatransfer.v1.DataSource) {
         return mergeFrom((com.google.cloud.bigquery.datatransfer.v1.DataSource)other);
@@ -1746,12 +1721,10 @@ public Builder mergeFrom(com.google.cloud.bigquery.datatransfer.v1.DataSource ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2409,7 +2382,6 @@ public Builder setTransferTypeValue(int value) {
      * .google.cloud.bigquery.datatransfer.v1.TransferType transfer_type = 7;
      */
     public com.google.cloud.bigquery.datatransfer.v1.TransferType getTransferType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.bigquery.datatransfer.v1.TransferType result = com.google.cloud.bigquery.datatransfer.v1.TransferType.valueOf(transferType_);
       return result == null ? com.google.cloud.bigquery.datatransfer.v1.TransferType.UNRECOGNIZED : result;
     }
@@ -3110,7 +3082,6 @@ public Builder setAuthorizationTypeValue(int value) {
      * .google.cloud.bigquery.datatransfer.v1.DataSource.AuthorizationType authorization_type = 14;
      */
     public com.google.cloud.bigquery.datatransfer.v1.DataSource.AuthorizationType getAuthorizationType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.bigquery.datatransfer.v1.DataSource.AuthorizationType result = com.google.cloud.bigquery.datatransfer.v1.DataSource.AuthorizationType.valueOf(authorizationType_);
       return result == null ? com.google.cloud.bigquery.datatransfer.v1.DataSource.AuthorizationType.UNRECOGNIZED : result;
     }
@@ -3184,7 +3155,6 @@ public Builder setDataRefreshTypeValue(int value) {
      * .google.cloud.bigquery.datatransfer.v1.DataSource.DataRefreshType data_refresh_type = 15;
      */
     public com.google.cloud.bigquery.datatransfer.v1.DataSource.DataRefreshType getDataRefreshType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.bigquery.datatransfer.v1.DataSource.DataRefreshType result = com.google.cloud.bigquery.datatransfer.v1.DataSource.DataRefreshType.valueOf(dataRefreshType_);
       return result == null ? com.google.cloud.bigquery.datatransfer.v1.DataSource.DataRefreshType.UNRECOGNIZED : result;
     }
@@ -3458,13 +3428,11 @@ public com.google.protobuf.DurationOrBuilder getMinimumScheduleIntervalOrBuilder
       }
       return minimumScheduleIntervalBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -3486,12 +3454,11 @@ public static com.google.cloud.bigquery.datatransfer.v1.DataSource getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DataSource parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DataSource(input, extensionRegistry);
+        return new DataSource(input, extensionRegistry);
     }
   };
 
@@ -3504,7 +3471,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.bigquery.datatransfer.v1.DataSource getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataSourceParameter.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataSourceParameter.java
index e99dd1a9ab4f..588b6f0f85b4 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataSourceParameter.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataSourceParameter.java
@@ -50,9 +50,6 @@ private DataSourceParameter(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -64,6 +61,13 @@ private DataSourceParameter(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -170,13 +174,6 @@ private DataSourceParameter(
             recurse_ = input.readBool();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -200,7 +197,6 @@ private DataSourceParameter(
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_DataSourceParameter_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_DataSourceParameter_fieldAccessorTable
@@ -560,7 +556,6 @@ public int getTypeValue() {
    * .google.cloud.bigquery.datatransfer.v1.DataSourceParameter.Type type = 4;
    */
   public com.google.cloud.bigquery.datatransfer.v1.DataSourceParameter.Type getType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.bigquery.datatransfer.v1.DataSourceParameter.Type result = com.google.cloud.bigquery.datatransfer.v1.DataSourceParameter.Type.valueOf(type_);
     return result == null ? com.google.cloud.bigquery.datatransfer.v1.DataSourceParameter.Type.UNRECOGNIZED : result;
   }
@@ -913,7 +908,6 @@ public boolean getRecurse() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -923,7 +917,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParamIdBytes().isEmpty()) {
@@ -974,7 +967,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1217,7 +1209,6 @@ public static com.google.cloud.bigquery.datatransfer.v1.DataSourceParameter pars
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1225,7 +1216,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.bigquery.datatransfer.v1.DataSourceParameter prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1258,7 +1248,6 @@ public static final class Builder extends
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_DataSourceParameter_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_DataSourceParameter_fieldAccessorTable
@@ -1282,7 +1271,6 @@ private void maybeForceBuilderInitialization() {
         getFieldsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       paramId_ = "";
@@ -1330,18 +1318,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_DataSourceParameter_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.DataSourceParameter getDefaultInstanceForType() {
       return com.google.cloud.bigquery.datatransfer.v1.DataSourceParameter.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.DataSourceParameter build() {
       com.google.cloud.bigquery.datatransfer.v1.DataSourceParameter result = buildPartial();
       if (!result.isInitialized()) {
@@ -1350,7 +1335,6 @@ public com.google.cloud.bigquery.datatransfer.v1.DataSourceParameter build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.DataSourceParameter buildPartial() {
       com.google.cloud.bigquery.datatransfer.v1.DataSourceParameter result = new com.google.cloud.bigquery.datatransfer.v1.DataSourceParameter(this);
       int from_bitField0_ = bitField0_;
@@ -1395,39 +1379,32 @@ public com.google.cloud.bigquery.datatransfer.v1.DataSourceParameter buildPartia
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.bigquery.datatransfer.v1.DataSourceParameter) {
         return mergeFrom((com.google.cloud.bigquery.datatransfer.v1.DataSourceParameter)other);
@@ -1525,12 +1502,10 @@ public Builder mergeFrom(com.google.cloud.bigquery.datatransfer.v1.DataSourcePar
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1848,7 +1823,6 @@ public Builder setTypeValue(int value) {
      * .google.cloud.bigquery.datatransfer.v1.DataSourceParameter.Type type = 4;
      */
     public com.google.cloud.bigquery.datatransfer.v1.DataSourceParameter.Type getType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.bigquery.datatransfer.v1.DataSourceParameter.Type result = com.google.cloud.bigquery.datatransfer.v1.DataSourceParameter.Type.valueOf(type_);
       return result == null ? com.google.cloud.bigquery.datatransfer.v1.DataSourceParameter.Type.UNRECOGNIZED : result;
     }
@@ -3056,13 +3030,11 @@ public Builder clearRecurse() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -3084,12 +3056,11 @@ public static com.google.cloud.bigquery.datatransfer.v1.DataSourceParameter getD
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DataSourceParameter parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DataSourceParameter(input, extensionRegistry);
+        return new DataSourceParameter(input, extensionRegistry);
     }
   };
 
@@ -3102,7 +3073,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.bigquery.datatransfer.v1.DataSourceParameter getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferProto.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferProto.java
index 1b546165dc7e..44ccbc538f84 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferProto.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DataTransferProto.java
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       "to\032 google/protobuf/field_mask.proto\032\037go" +
       "ogle/protobuf/timestamp.proto\032\036google/pr" +
       "otobuf/wrappers.proto\"\361\004\n\023DataSourcePara" +
-      "meter\022\020\n\010param_id\030\001 \001(\t\022\024\n\014display_name\030" +
+      "meter\022\020\n\010param_id\030\001 \001(\t\022\024\n\014display_name\030",
       "\002 \001(\t\022\023\n\013description\030\003 \001(\t\022M\n\004type\030\004 \001(\016" +
       "2?.google.cloud.bigquery.datatransfer.v1" +
       ".DataSourceParameter.Type\022\020\n\010required\030\005 " +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "\022/\n\tmax_value\030\n \001(\0132\034.google.protobuf.Do" +
       "ubleValue\022J\n\006fields\030\013 \003(\0132:.google.cloud" +
       ".bigquery.datatransfer.v1.DataSourcePara" +
-      "meter\022\036\n\026validation_description\030\014 \001(\t\022\033\n" +
+      "meter\022\036\n\026validation_description\030\014 \001(\t\022\033\n",
       "\023validation_help_url\030\r \001(\t\022\021\n\timmutable\030" +
       "\016 \001(\010\022\017\n\007recurse\030\017 \001(\010\"i\n\004Type\022\024\n\020TYPE_U" +
       "NSPECIFIED\020\000\022\n\n\006STRING\020\001\022\013\n\007INTEGER\020\002\022\n\n" +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       " \001(\t\022\023\n\013description\030\004 \001(\t\022\021\n\tclient_id\030\005" +
       " \001(\t\022\016\n\006scopes\030\006 \003(\t\022J\n\rtransfer_type\030\007 " +
       "\001(\01623.google.cloud.bigquery.datatransfer" +
-      ".v1.TransferType\022#\n\033supports_multiple_tr" +
+      ".v1.TransferType\022#\n\033supports_multiple_tr",
       "ansfers\030\010 \001(\010\022\037\n\027update_deadline_seconds" +
       "\030\t \001(\005\022\030\n\020default_schedule\030\n \001(\t\022 \n\030supp" +
       "orts_custom_schedule\030\013 \001(\010\022N\n\nparameters" +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       "e.cloud.bigquery.datatransfer.v1.DataSou" +
       "rce.AuthorizationType\022\\\n\021data_refresh_ty" +
       "pe\030\017 \001(\0162A.google.cloud.bigquery.datatra" +
-      "nsfer.v1.DataSource.DataRefreshType\022(\n d" +
+      "nsfer.v1.DataSource.DataRefreshType\022(\n d",
       "efault_data_refresh_window_days\030\020 \001(\005\022\034\n" +
       "\024manual_runs_disabled\030\021 \001(\010\022<\n\031minimum_s" +
       "chedule_interval\030\022 \001(\0132\031.google.protobuf" +
@@ -177,7 +177,7 @@ public static void registerAllExtensions(
       "CODE\020\002\"c\n\017DataRefreshType\022!\n\035DATA_REFRES" +
       "H_TYPE_UNSPECIFIED\020\000\022\022\n\016SLIDING_WINDOW\020\001" +
       "\022\031\n\025CUSTOM_SLIDING_WINDOW\020\002\"$\n\024GetDataSo" +
-      "urceRequest\022\014\n\004name\030\001 \001(\t\"O\n\026ListDataSou" +
+      "urceRequest\022\014\n\004name\030\001 \001(\t\"O\n\026ListDataSou",
       "rcesRequest\022\016\n\006parent\030\001 \001(\t\022\022\n\npage_toke" +
       "n\030\003 \001(\t\022\021\n\tpage_size\030\004 \001(\005\"{\n\027ListDataSo" +
       "urcesResponse\022G\n\014data_sources\030\001 \003(\01321.go" +
@@ -187,7 +187,7 @@ public static void registerAllExtensions(
       "N\n\017transfer_config\030\002 \001(\01325.google.cloud." +
       "bigquery.datatransfer.v1.TransferConfig\022" +
       "\032\n\022authorization_code\030\003 \001(\t\"\272\001\n\033UpdateTr" +
-      "ansferConfigRequest\022N\n\017transfer_config\030\001" +
+      "ansferConfigRequest\022N\n\017transfer_config\030\001",
       " \001(\01325.google.cloud.bigquery.datatransfe" +
       "r.v1.TransferConfig\022\032\n\022authorization_cod" +
       "e\030\003 \001(\t\022/\n\013update_mask\030\004 \001(\0132\032.google.pr" +
@@ -197,7 +197,7 @@ public static void registerAllExtensions(
       "nRequest\022\014\n\004name\030\001 \001(\t\"(\n\030DeleteTransfer" +
       "RunRequest\022\014\n\004name\030\001 \001(\t\"l\n\032ListTransfer" +
       "ConfigsRequest\022\016\n\006parent\030\001 \001(\t\022\027\n\017data_s" +
-      "ource_ids\030\002 \003(\t\022\022\n\npage_token\030\003 \001(\t\022\021\n\tp" +
+      "ource_ids\030\002 \003(\t\022\022\n\npage_token\030\003 \001(\t\022\021\n\tp",
       "age_size\030\004 \001(\005\"\207\001\n\033ListTransferConfigsRe" +
       "sponse\022O\n\020transfer_configs\030\001 \003(\01325.googl" +
       "e.cloud.bigquery.datatransfer.v1.Transfe" +
@@ -207,7 +207,7 @@ public static void registerAllExtensions(
       "atransfer.v1.TransferState\022\022\n\npage_token" +
       "\030\003 \001(\t\022\021\n\tpage_size\030\004 \001(\005\022^\n\013run_attempt" +
       "\030\005 \001(\0162I.google.cloud.bigquery.datatrans" +
-      "fer.v1.ListTransferRunsRequest.RunAttemp" +
+      "fer.v1.ListTransferRunsRequest.RunAttemp",
       "t\"5\n\nRunAttempt\022\033\n\027RUN_ATTEMPT_UNSPECIFI" +
       "ED\020\000\022\n\n\006LATEST\020\001\"~\n\030ListTransferRunsResp" +
       "onse\022I\n\rtransfer_runs\030\001 \003(\01322.google.clo" +
@@ -217,7 +217,7 @@ public static void registerAllExtensions(
       "en\030\004 \001(\t\022\021\n\tpage_size\030\005 \001(\005\022]\n\rmessage_t" +
       "ypes\030\006 \003(\0162F.google.cloud.bigquery.datat" +
       "ransfer.v1.TransferMessage.MessageSeveri" +
-      "ty\"\206\001\n\030ListTransferLogsResponse\022Q\n\021trans" +
+      "ty\"\206\001\n\030ListTransferLogsResponse\022Q\n\021trans",
       "fer_messages\030\001 \003(\01326.google.cloud.bigque" +
       "ry.datatransfer.v1.TransferMessage\022\027\n\017ne" +
       "xt_page_token\030\002 \001(\t\"&\n\026CheckValidCredsRe" +
@@ -227,7 +227,7 @@ public static void registerAllExtensions(
       ".\n\nstart_time\030\002 \001(\0132\032.google.protobuf.Ti" +
       "mestamp\022,\n\010end_time\030\003 \001(\0132\032.google.proto" +
       "buf.Timestamp\"`\n\034ScheduleTransferRunsRes" +
-      "ponse\022@\n\004runs\030\001 \003(\01322.google.cloud.bigqu" +
+      "ponse\022@\n\004runs\030\001 \003(\01322.google.cloud.bigqu",
       "ery.datatransfer.v1.TransferRun2\206\033\n\023Data" +
       "TransferService\022\337\001\n\rGetDataSource\022;.goog" +
       "le.cloud.bigquery.datatransfer.v1.GetDat" +
@@ -237,7 +237,7 @@ public static void registerAllExtensions(
       "*}Z%\022#/v1/{name=projects/*/dataSources/*" +
       "}\022\360\001\n\017ListDataSources\022=.google.cloud.big" +
       "query.datatransfer.v1.ListDataSourcesReq" +
-      "uest\032>.google.cloud.bigquery.datatransfe" +
+      "uest\032>.google.cloud.bigquery.datatransfe",
       "r.v1.ListDataSourcesResponse\"^\202\323\344\223\002X\022//v" +
       "1/{parent=projects/*/locations/*}/dataSo" +
       "urcesZ%\022#/v1/{parent=projects/*}/dataSou" +
@@ -247,7 +247,7 @@ public static void registerAllExtensions(
       "y.datatransfer.v1.TransferConfig\"\211\001\202\323\344\223\002" +
       "\202\001\"3/v1/{parent=projects/*/locations/*}/" +
       "transferConfigs:\017transfer_configZ:\"\'/v1/" +
-      "{parent=projects/*}/transferConfigs:\017tra" +
+      "{parent=projects/*}/transferConfigs:\017tra",
       "nsfer_config\022\275\002\n\024UpdateTransferConfig\022B." +
       "google.cloud.bigquery.datatransfer.v1.Up" +
       "dateTransferConfigRequest\0325.google.cloud" +
@@ -257,7 +257,7 @@ public static void registerAllExtensions(
       "\017transfer_configZJ27/v1/{transfer_config" +
       ".name=projects/*/transferConfigs/*}:\017tra" +
       "nsfer_config\022\332\001\n\024DeleteTransferConfig\022B." +
-      "google.cloud.bigquery.datatransfer.v1.De" +
+      "google.cloud.bigquery.datatransfer.v1.De",
       "leteTransferConfigRequest\032\026.google.proto" +
       "buf.Empty\"f\202\323\344\223\002`*3/v1/{name=projects/*/" +
       "locations/*/transferConfigs/*}Z)*\'/v1/{n" +
@@ -267,7 +267,7 @@ public static void registerAllExtensions(
       "\0325.google.cloud.bigquery.datatransfer.v1" +
       ".TransferConfig\"f\202\323\344\223\002`\0223/v1/{name=proje" +
       "cts/*/locations/*/transferConfigs/*}Z)\022\'" +
-      "/v1/{name=projects/*/transferConfigs/*}\022" +
+      "/v1/{name=projects/*/transferConfigs/*}\022",
       "\204\002\n\023ListTransferConfigs\022A.google.cloud.b" +
       "igquery.datatransfer.v1.ListTransferConf" +
       "igsRequest\032B.google.cloud.bigquery.datat" +
@@ -277,7 +277,7 @@ public static void registerAllExtensions(
       "cts/*}/transferConfigs\022\255\002\n\024ScheduleTrans" +
       "ferRuns\022B.google.cloud.bigquery.datatran" +
       "sfer.v1.ScheduleTransferRunsRequest\032C.go" +
-      "ogle.cloud.bigquery.datatransfer.v1.Sche" +
+      "ogle.cloud.bigquery.datatransfer.v1.Sche",
       "duleTransferRunsResponse\"\213\001\202\323\344\223\002\204\001\"B/v1/" +
       "{parent=projects/*/locations/*/transferC" +
       "onfigs/*}:scheduleRuns:\001*Z;\"6/v1/{parent" +
@@ -287,7 +287,7 @@ public static void registerAllExtensions(
       "Request\0322.google.cloud.bigquery.datatran" +
       "sfer.v1.TransferRun\"t\202\323\344\223\002n\022:/v1/{name=p" +
       "rojects/*/locations/*/transferConfigs/*/" +
-      "runs/*}Z0\022./v1/{name=projects/*/transfer" +
+      "runs/*}Z0\022./v1/{name=projects/*/transfer",
       "Configs/*/runs/*}\022\342\001\n\021DeleteTransferRun\022" +
       "?.google.cloud.bigquery.datatransfer.v1." +
       "DeleteTransferRunRequest\032\026.google.protob" +
@@ -297,7 +297,7 @@ public static void registerAllExtensions(
       "uns/*}\022\211\002\n\020ListTransferRuns\022>.google.clo" +
       "ud.bigquery.datatransfer.v1.ListTransfer" +
       "RunsRequest\032?.google.cloud.bigquery.data" +
-      "transfer.v1.ListTransferRunsResponse\"t\202\323" +
+      "transfer.v1.ListTransferRunsResponse\"t\202\323",
       "\344\223\002n\022:/v1/{parent=projects/*/locations/*" +
       "/transferConfigs/*}/runsZ0\022./v1/{parent=" +
       "projects/*/transferConfigs/*}/runs\022\251\002\n\020L" +
@@ -307,7 +307,7 @@ public static void registerAllExtensions(
       "ListTransferLogsResponse\"\223\001\202\323\344\223\002\214\001\022I/v1/" +
       "{parent=projects/*/locations/*/transferC" +
       "onfigs/*/runs/*}/transferLogsZ?\022=/v1/{pa" +
-      "rent=projects/*/transferConfigs/*/runs/*" +
+      "rent=projects/*/transferConfigs/*/runs/*",
       "}/transferLogs\022\227\002\n\017CheckValidCreds\022=.goo" +
       "gle.cloud.bigquery.datatransfer.v1.Check" +
       "ValidCredsRequest\032>.google.cloud.bigquer" +
@@ -317,7 +317,7 @@ public static void registerAllExtensions(
       "\"3/v1/{name=projects/*/dataSources/*}:ch" +
       "eckValidCreds:\001*B\343\001\n)com.google.cloud.bi" +
       "gquery.datatransfer.v1B\021DataTransferProt" +
-      "oP\001ZQgoogle.golang.org/genproto/googleap" +
+      "oP\001ZQgoogle.golang.org/genproto/googleap",
       "is/cloud/bigquery/datatransfer/v1;datatr" +
       "ansfer\252\002%Google.Cloud.BigQuery.DataTrans" +
       "fer.V1\312\002%Google\\Cloud\\BigQuery\\DataTrans" +
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DeleteTransferConfigRequest.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DeleteTransferConfigRequest.java
index 5fe2ea4dc009..d6d50d1f06aa 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DeleteTransferConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DeleteTransferConfigRequest.java
@@ -34,9 +34,6 @@ private DeleteTransferConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,12 +45,6 @@ private DeleteTransferConfigRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -61,6 +52,12 @@ private DeleteTransferConfigRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -78,7 +75,6 @@ private DeleteTransferConfigRequest(
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_DeleteTransferConfigRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_DeleteTransferConfigRequest_fieldAccessorTable
@@ -131,7 +127,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -141,7 +136,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -150,7 +144,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static com.google.cloud.bigquery.datatransfer.v1.DeleteTransferConfigRequ
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.bigquery.datatransfer.v1.DeleteTransferConfigRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_DeleteTransferConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_DeleteTransferConfigRequest_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_DeleteTransferConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.DeleteTransferConfigRequest getDefaultInstanceForType() {
       return com.google.cloud.bigquery.datatransfer.v1.DeleteTransferConfigRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.DeleteTransferConfigRequest build() {
       com.google.cloud.bigquery.datatransfer.v1.DeleteTransferConfigRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.bigquery.datatransfer.v1.DeleteTransferConfigRequest bui
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.DeleteTransferConfigRequest buildPartial() {
       com.google.cloud.bigquery.datatransfer.v1.DeleteTransferConfigRequest result = new com.google.cloud.bigquery.datatransfer.v1.DeleteTransferConfigRequest(this);
       result.name_ = name_;
@@ -361,39 +346,32 @@ public com.google.cloud.bigquery.datatransfer.v1.DeleteTransferConfigRequest bui
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.bigquery.datatransfer.v1.DeleteTransferConfigRequest) {
         return mergeFrom((com.google.cloud.bigquery.datatransfer.v1.DeleteTransferConfigRequest)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.bigquery.datatransfer.v1.DeleteTransfe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -531,13 +507,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -559,12 +533,11 @@ public static com.google.cloud.bigquery.datatransfer.v1.DeleteTransferConfigRequ
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteTransferConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteTransferConfigRequest(input, extensionRegistry);
+        return new DeleteTransferConfigRequest(input, extensionRegistry);
     }
   };
 
@@ -577,7 +550,6 @@ public com.google.protobuf.Parser getParserForType(
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.bigquery.datatransfer.v1.DeleteTransferConfigRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DeleteTransferRunRequest.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DeleteTransferRunRequest.java
index 7d643e7639fd..fe71387ccf2f 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DeleteTransferRunRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/DeleteTransferRunRequest.java
@@ -33,9 +33,6 @@ private DeleteTransferRunRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteTransferRunRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteTransferRunRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteTransferRunRequest(
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_DeleteTransferRunRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_DeleteTransferRunRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.cloud.bigquery.datatransfer.v1.DeleteTransferRunRequest
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.bigquery.datatransfer.v1.DeleteTransferRunRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_DeleteTransferRunRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_DeleteTransferRunRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_DeleteTransferRunRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.DeleteTransferRunRequest getDefaultInstanceForType() {
       return com.google.cloud.bigquery.datatransfer.v1.DeleteTransferRunRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.DeleteTransferRunRequest build() {
       com.google.cloud.bigquery.datatransfer.v1.DeleteTransferRunRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.cloud.bigquery.datatransfer.v1.DeleteTransferRunRequest build(
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.DeleteTransferRunRequest buildPartial() {
       com.google.cloud.bigquery.datatransfer.v1.DeleteTransferRunRequest result = new com.google.cloud.bigquery.datatransfer.v1.DeleteTransferRunRequest(this);
       result.name_ = name_;
@@ -359,39 +344,32 @@ public com.google.cloud.bigquery.datatransfer.v1.DeleteTransferRunRequest buildP
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.bigquery.datatransfer.v1.DeleteTransferRunRequest) {
         return mergeFrom((com.google.cloud.bigquery.datatransfer.v1.DeleteTransferRunRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.cloud.bigquery.datatransfer.v1.DeleteTransfe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.cloud.bigquery.datatransfer.v1.DeleteTransferRunRequest
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteTransferRunRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteTransferRunRequest(input, extensionRegistry);
+        return new DeleteTransferRunRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.bigquery.datatransfer.v1.DeleteTransferRunRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/GetDataSourceRequest.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/GetDataSourceRequest.java
index 6b11373337d0..14e890f86958 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/GetDataSourceRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/GetDataSourceRequest.java
@@ -33,9 +33,6 @@ private GetDataSourceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetDataSourceRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetDataSourceRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetDataSourceRequest(
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_GetDataSourceRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_GetDataSourceRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.cloud.bigquery.datatransfer.v1.GetDataSourceRequest par
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.bigquery.datatransfer.v1.GetDataSourceRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_GetDataSourceRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_GetDataSourceRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_GetDataSourceRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.GetDataSourceRequest getDefaultInstanceForType() {
       return com.google.cloud.bigquery.datatransfer.v1.GetDataSourceRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.GetDataSourceRequest build() {
       com.google.cloud.bigquery.datatransfer.v1.GetDataSourceRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.cloud.bigquery.datatransfer.v1.GetDataSourceRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.GetDataSourceRequest buildPartial() {
       com.google.cloud.bigquery.datatransfer.v1.GetDataSourceRequest result = new com.google.cloud.bigquery.datatransfer.v1.GetDataSourceRequest(this);
       result.name_ = name_;
@@ -359,39 +344,32 @@ public com.google.cloud.bigquery.datatransfer.v1.GetDataSourceRequest buildParti
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.bigquery.datatransfer.v1.GetDataSourceRequest) {
         return mergeFrom((com.google.cloud.bigquery.datatransfer.v1.GetDataSourceRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.cloud.bigquery.datatransfer.v1.GetDataSource
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.cloud.bigquery.datatransfer.v1.GetDataSourceRequest get
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetDataSourceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetDataSourceRequest(input, extensionRegistry);
+        return new GetDataSourceRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.bigquery.datatransfer.v1.GetDataSourceRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/GetTransferConfigRequest.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/GetTransferConfigRequest.java
index 6f5fca8e4af5..81ab342a4468 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/GetTransferConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/GetTransferConfigRequest.java
@@ -33,9 +33,6 @@ private GetTransferConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetTransferConfigRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetTransferConfigRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetTransferConfigRequest(
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_GetTransferConfigRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_GetTransferConfigRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.cloud.bigquery.datatransfer.v1.GetTransferConfigRequest
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.bigquery.datatransfer.v1.GetTransferConfigRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_GetTransferConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_GetTransferConfigRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_GetTransferConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.GetTransferConfigRequest getDefaultInstanceForType() {
       return com.google.cloud.bigquery.datatransfer.v1.GetTransferConfigRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.GetTransferConfigRequest build() {
       com.google.cloud.bigquery.datatransfer.v1.GetTransferConfigRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.cloud.bigquery.datatransfer.v1.GetTransferConfigRequest build(
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.GetTransferConfigRequest buildPartial() {
       com.google.cloud.bigquery.datatransfer.v1.GetTransferConfigRequest result = new com.google.cloud.bigquery.datatransfer.v1.GetTransferConfigRequest(this);
       result.name_ = name_;
@@ -359,39 +344,32 @@ public com.google.cloud.bigquery.datatransfer.v1.GetTransferConfigRequest buildP
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.bigquery.datatransfer.v1.GetTransferConfigRequest) {
         return mergeFrom((com.google.cloud.bigquery.datatransfer.v1.GetTransferConfigRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.cloud.bigquery.datatransfer.v1.GetTransferCo
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.cloud.bigquery.datatransfer.v1.GetTransferConfigRequest
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetTransferConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetTransferConfigRequest(input, extensionRegistry);
+        return new GetTransferConfigRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.bigquery.datatransfer.v1.GetTransferConfigRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/GetTransferRunRequest.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/GetTransferRunRequest.java
index fe509da44109..4b8c670a3491 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/GetTransferRunRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/GetTransferRunRequest.java
@@ -33,9 +33,6 @@ private GetTransferRunRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetTransferRunRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetTransferRunRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetTransferRunRequest(
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_GetTransferRunRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_GetTransferRunRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.cloud.bigquery.datatransfer.v1.GetTransferRunRequest pa
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.bigquery.datatransfer.v1.GetTransferRunRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_GetTransferRunRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_GetTransferRunRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_GetTransferRunRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.GetTransferRunRequest getDefaultInstanceForType() {
       return com.google.cloud.bigquery.datatransfer.v1.GetTransferRunRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.GetTransferRunRequest build() {
       com.google.cloud.bigquery.datatransfer.v1.GetTransferRunRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.cloud.bigquery.datatransfer.v1.GetTransferRunRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.GetTransferRunRequest buildPartial() {
       com.google.cloud.bigquery.datatransfer.v1.GetTransferRunRequest result = new com.google.cloud.bigquery.datatransfer.v1.GetTransferRunRequest(this);
       result.name_ = name_;
@@ -359,39 +344,32 @@ public com.google.cloud.bigquery.datatransfer.v1.GetTransferRunRequest buildPart
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.bigquery.datatransfer.v1.GetTransferRunRequest) {
         return mergeFrom((com.google.cloud.bigquery.datatransfer.v1.GetTransferRunRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.cloud.bigquery.datatransfer.v1.GetTransferRu
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.cloud.bigquery.datatransfer.v1.GetTransferRunRequest ge
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetTransferRunRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetTransferRunRequest(input, extensionRegistry);
+        return new GetTransferRunRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.bigquery.datatransfer.v1.GetTransferRunRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListDataSourcesRequest.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListDataSourcesRequest.java
index 1620cd1cd11e..d43168dbdb21 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListDataSourcesRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListDataSourcesRequest.java
@@ -35,9 +35,6 @@ private ListDataSourcesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListDataSourcesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ListDataSourcesRequest(
             pageSize_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListDataSourcesRequest(
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListDataSourcesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListDataSourcesRequest_fieldAccessorTable
@@ -206,7 +202,6 @@ public int getPageSize() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -216,7 +211,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -231,7 +225,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -361,7 +354,6 @@ public static com.google.cloud.bigquery.datatransfer.v1.ListDataSourcesRequest p
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -369,7 +361,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.bigquery.datatransfer.v1.ListDataSourcesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -397,7 +388,6 @@ public static final class Builder extends
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListDataSourcesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListDataSourcesRequest_fieldAccessorTable
@@ -420,7 +410,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -432,18 +421,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListDataSourcesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.ListDataSourcesRequest getDefaultInstanceForType() {
       return com.google.cloud.bigquery.datatransfer.v1.ListDataSourcesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.ListDataSourcesRequest build() {
       com.google.cloud.bigquery.datatransfer.v1.ListDataSourcesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -452,7 +438,6 @@ public com.google.cloud.bigquery.datatransfer.v1.ListDataSourcesRequest build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.ListDataSourcesRequest buildPartial() {
       com.google.cloud.bigquery.datatransfer.v1.ListDataSourcesRequest result = new com.google.cloud.bigquery.datatransfer.v1.ListDataSourcesRequest(this);
       result.parent_ = parent_;
@@ -462,39 +447,32 @@ public com.google.cloud.bigquery.datatransfer.v1.ListDataSourcesRequest buildPar
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.bigquery.datatransfer.v1.ListDataSourcesRequest) {
         return mergeFrom((com.google.cloud.bigquery.datatransfer.v1.ListDataSourcesRequest)other);
@@ -522,12 +500,10 @@ public Builder mergeFrom(com.google.cloud.bigquery.datatransfer.v1.ListDataSourc
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -786,13 +762,11 @@ public Builder clearPageSize() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -814,12 +788,11 @@ public static com.google.cloud.bigquery.datatransfer.v1.ListDataSourcesRequest g
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListDataSourcesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDataSourcesRequest(input, extensionRegistry);
+        return new ListDataSourcesRequest(input, extensionRegistry);
     }
   };
 
@@ -832,7 +805,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.bigquery.datatransfer.v1.ListDataSourcesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListDataSourcesResponse.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListDataSourcesResponse.java
index d267c9bea0b8..4ebb51012142 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListDataSourcesResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListDataSourcesResponse.java
@@ -34,9 +34,6 @@ private ListDataSourcesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListDataSourcesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               dataSources_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListDataSourcesResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListDataSourcesResponse(
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListDataSourcesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListDataSourcesResponse_fieldAccessorTable
@@ -203,7 +199,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -213,7 +208,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < dataSources_.size(); i++) {
@@ -225,7 +219,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -350,7 +343,6 @@ public static com.google.cloud.bigquery.datatransfer.v1.ListDataSourcesResponse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -358,7 +350,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.bigquery.datatransfer.v1.ListDataSourcesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -386,7 +377,6 @@ public static final class Builder extends
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListDataSourcesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListDataSourcesResponse_fieldAccessorTable
@@ -410,7 +400,6 @@ private void maybeForceBuilderInitialization() {
         getDataSourcesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (dataSourcesBuilder_ == null) {
@@ -424,18 +413,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListDataSourcesResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.ListDataSourcesResponse getDefaultInstanceForType() {
       return com.google.cloud.bigquery.datatransfer.v1.ListDataSourcesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.ListDataSourcesResponse build() {
       com.google.cloud.bigquery.datatransfer.v1.ListDataSourcesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -444,7 +430,6 @@ public com.google.cloud.bigquery.datatransfer.v1.ListDataSourcesResponse build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.ListDataSourcesResponse buildPartial() {
       com.google.cloud.bigquery.datatransfer.v1.ListDataSourcesResponse result = new com.google.cloud.bigquery.datatransfer.v1.ListDataSourcesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -464,39 +449,32 @@ public com.google.cloud.bigquery.datatransfer.v1.ListDataSourcesResponse buildPa
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.bigquery.datatransfer.v1.ListDataSourcesResponse) {
         return mergeFrom((com.google.cloud.bigquery.datatransfer.v1.ListDataSourcesResponse)other);
@@ -543,12 +521,10 @@ public Builder mergeFrom(com.google.cloud.bigquery.datatransfer.v1.ListDataSourc
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -983,13 +959,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1011,12 +985,11 @@ public static com.google.cloud.bigquery.datatransfer.v1.ListDataSourcesResponse
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListDataSourcesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDataSourcesResponse(input, extensionRegistry);
+        return new ListDataSourcesResponse(input, extensionRegistry);
     }
   };
 
@@ -1029,7 +1002,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.bigquery.datatransfer.v1.ListDataSourcesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferConfigsRequest.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferConfigsRequest.java
index a4266601a297..6f1584543667 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferConfigsRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferConfigsRequest.java
@@ -36,9 +36,6 @@ private ListTransferConfigsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private ListTransferConfigsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -76,13 +80,6 @@ private ListTransferConfigsRequest(
             pageSize_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private ListTransferConfigsRequest(
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListTransferConfigsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListTransferConfigsRequest_fieldAccessorTable
@@ -265,7 +261,6 @@ public int getPageSize() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -275,7 +270,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -293,7 +287,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -437,7 +430,6 @@ public static com.google.cloud.bigquery.datatransfer.v1.ListTransferConfigsReque
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -445,7 +437,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.bigquery.datatransfer.v1.ListTransferConfigsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -473,7 +464,6 @@ public static final class Builder extends
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListTransferConfigsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListTransferConfigsRequest_fieldAccessorTable
@@ -496,7 +486,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -510,18 +499,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListTransferConfigsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.ListTransferConfigsRequest getDefaultInstanceForType() {
       return com.google.cloud.bigquery.datatransfer.v1.ListTransferConfigsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.ListTransferConfigsRequest build() {
       com.google.cloud.bigquery.datatransfer.v1.ListTransferConfigsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -530,7 +516,6 @@ public com.google.cloud.bigquery.datatransfer.v1.ListTransferConfigsRequest buil
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.ListTransferConfigsRequest buildPartial() {
       com.google.cloud.bigquery.datatransfer.v1.ListTransferConfigsRequest result = new com.google.cloud.bigquery.datatransfer.v1.ListTransferConfigsRequest(this);
       int from_bitField0_ = bitField0_;
@@ -548,39 +533,32 @@ public com.google.cloud.bigquery.datatransfer.v1.ListTransferConfigsRequest buil
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.bigquery.datatransfer.v1.ListTransferConfigsRequest) {
         return mergeFrom((com.google.cloud.bigquery.datatransfer.v1.ListTransferConfigsRequest)other);
@@ -618,12 +596,10 @@ public Builder mergeFrom(com.google.cloud.bigquery.datatransfer.v1.ListTransferC
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1013,13 +989,11 @@ public Builder clearPageSize() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1041,12 +1015,11 @@ public static com.google.cloud.bigquery.datatransfer.v1.ListTransferConfigsReque
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListTransferConfigsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTransferConfigsRequest(input, extensionRegistry);
+        return new ListTransferConfigsRequest(input, extensionRegistry);
     }
   };
 
@@ -1059,7 +1032,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.bigquery.datatransfer.v1.ListTransferConfigsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferConfigsResponse.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferConfigsResponse.java
index 4d269cdda195..5879e6ffc891 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferConfigsResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferConfigsResponse.java
@@ -34,9 +34,6 @@ private ListTransferConfigsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListTransferConfigsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               transferConfigs_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListTransferConfigsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListTransferConfigsResponse(
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListTransferConfigsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListTransferConfigsResponse_fieldAccessorTable
@@ -203,7 +199,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -213,7 +208,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < transferConfigs_.size(); i++) {
@@ -225,7 +219,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -350,7 +343,6 @@ public static com.google.cloud.bigquery.datatransfer.v1.ListTransferConfigsRespo
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -358,7 +350,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.bigquery.datatransfer.v1.ListTransferConfigsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -386,7 +377,6 @@ public static final class Builder extends
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListTransferConfigsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListTransferConfigsResponse_fieldAccessorTable
@@ -410,7 +400,6 @@ private void maybeForceBuilderInitialization() {
         getTransferConfigsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (transferConfigsBuilder_ == null) {
@@ -424,18 +413,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListTransferConfigsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.ListTransferConfigsResponse getDefaultInstanceForType() {
       return com.google.cloud.bigquery.datatransfer.v1.ListTransferConfigsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.ListTransferConfigsResponse build() {
       com.google.cloud.bigquery.datatransfer.v1.ListTransferConfigsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -444,7 +430,6 @@ public com.google.cloud.bigquery.datatransfer.v1.ListTransferConfigsResponse bui
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.ListTransferConfigsResponse buildPartial() {
       com.google.cloud.bigquery.datatransfer.v1.ListTransferConfigsResponse result = new com.google.cloud.bigquery.datatransfer.v1.ListTransferConfigsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -464,39 +449,32 @@ public com.google.cloud.bigquery.datatransfer.v1.ListTransferConfigsResponse bui
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.bigquery.datatransfer.v1.ListTransferConfigsResponse) {
         return mergeFrom((com.google.cloud.bigquery.datatransfer.v1.ListTransferConfigsResponse)other);
@@ -543,12 +521,10 @@ public Builder mergeFrom(com.google.cloud.bigquery.datatransfer.v1.ListTransferC
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -983,13 +959,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1011,12 +985,11 @@ public static com.google.cloud.bigquery.datatransfer.v1.ListTransferConfigsRespo
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListTransferConfigsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTransferConfigsResponse(input, extensionRegistry);
+        return new ListTransferConfigsResponse(input, extensionRegistry);
     }
   };
 
@@ -1029,7 +1002,6 @@ public com.google.protobuf.Parser getParserForType(
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.bigquery.datatransfer.v1.ListTransferConfigsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferLogsRequest.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferLogsRequest.java
index b1e2e98afb5c..3ccd5583b086 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferLogsRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferLogsRequest.java
@@ -36,9 +36,6 @@ private ListTransferLogsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private ListTransferLogsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -90,13 +94,6 @@ private ListTransferLogsRequest(
             input.popLimit(oldLimit);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -117,7 +114,6 @@ private ListTransferLogsRequest(
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListTransferLogsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListTransferLogsRequest_fieldAccessorTable
@@ -240,7 +236,6 @@ public int getPageSize() {
           new com.google.protobuf.Internal.ListAdapter.Converter<
               java.lang.Integer, com.google.cloud.bigquery.datatransfer.v1.TransferMessage.MessageSeverity>() {
             public com.google.cloud.bigquery.datatransfer.v1.TransferMessage.MessageSeverity convert(java.lang.Integer from) {
-              @SuppressWarnings("deprecation")
               com.google.cloud.bigquery.datatransfer.v1.TransferMessage.MessageSeverity result = com.google.cloud.bigquery.datatransfer.v1.TransferMessage.MessageSeverity.valueOf(from);
               return result == null ? com.google.cloud.bigquery.datatransfer.v1.TransferMessage.MessageSeverity.UNRECOGNIZED : result;
             }
@@ -305,7 +300,6 @@ public int getMessageTypesValue(int index) {
   private int messageTypesMemoizedSerializedSize;
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -315,7 +309,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     getSerializedSize();
@@ -338,7 +331,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -485,7 +477,6 @@ public static com.google.cloud.bigquery.datatransfer.v1.ListTransferLogsRequest
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -493,7 +484,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.bigquery.datatransfer.v1.ListTransferLogsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -521,7 +511,6 @@ public static final class Builder extends
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListTransferLogsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListTransferLogsRequest_fieldAccessorTable
@@ -544,7 +533,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -558,18 +546,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListTransferLogsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.ListTransferLogsRequest getDefaultInstanceForType() {
       return com.google.cloud.bigquery.datatransfer.v1.ListTransferLogsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.ListTransferLogsRequest build() {
       com.google.cloud.bigquery.datatransfer.v1.ListTransferLogsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -578,7 +563,6 @@ public com.google.cloud.bigquery.datatransfer.v1.ListTransferLogsRequest build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.ListTransferLogsRequest buildPartial() {
       com.google.cloud.bigquery.datatransfer.v1.ListTransferLogsRequest result = new com.google.cloud.bigquery.datatransfer.v1.ListTransferLogsRequest(this);
       int from_bitField0_ = bitField0_;
@@ -596,39 +580,32 @@ public com.google.cloud.bigquery.datatransfer.v1.ListTransferLogsRequest buildPa
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.bigquery.datatransfer.v1.ListTransferLogsRequest) {
         return mergeFrom((com.google.cloud.bigquery.datatransfer.v1.ListTransferLogsRequest)other);
@@ -666,12 +643,10 @@ public Builder mergeFrom(com.google.cloud.bigquery.datatransfer.v1.ListTransferL
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1109,13 +1084,11 @@ public Builder addAllMessageTypesValue(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1137,12 +1110,11 @@ public static com.google.cloud.bigquery.datatransfer.v1.ListTransferLogsRequest
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListTransferLogsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTransferLogsRequest(input, extensionRegistry);
+        return new ListTransferLogsRequest(input, extensionRegistry);
     }
   };
 
@@ -1155,7 +1127,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.bigquery.datatransfer.v1.ListTransferLogsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferLogsResponse.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferLogsResponse.java
index 8aea70a4305c..bc407d91cb48 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferLogsResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferLogsResponse.java
@@ -34,9 +34,6 @@ private ListTransferLogsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListTransferLogsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               transferMessages_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListTransferLogsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListTransferLogsResponse(
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListTransferLogsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListTransferLogsResponse_fieldAccessorTable
@@ -203,7 +199,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -213,7 +208,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < transferMessages_.size(); i++) {
@@ -225,7 +219,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -350,7 +343,6 @@ public static com.google.cloud.bigquery.datatransfer.v1.ListTransferLogsResponse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -358,7 +350,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.bigquery.datatransfer.v1.ListTransferLogsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -386,7 +377,6 @@ public static final class Builder extends
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListTransferLogsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListTransferLogsResponse_fieldAccessorTable
@@ -410,7 +400,6 @@ private void maybeForceBuilderInitialization() {
         getTransferMessagesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (transferMessagesBuilder_ == null) {
@@ -424,18 +413,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListTransferLogsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.ListTransferLogsResponse getDefaultInstanceForType() {
       return com.google.cloud.bigquery.datatransfer.v1.ListTransferLogsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.ListTransferLogsResponse build() {
       com.google.cloud.bigquery.datatransfer.v1.ListTransferLogsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -444,7 +430,6 @@ public com.google.cloud.bigquery.datatransfer.v1.ListTransferLogsResponse build(
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.ListTransferLogsResponse buildPartial() {
       com.google.cloud.bigquery.datatransfer.v1.ListTransferLogsResponse result = new com.google.cloud.bigquery.datatransfer.v1.ListTransferLogsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -464,39 +449,32 @@ public com.google.cloud.bigquery.datatransfer.v1.ListTransferLogsResponse buildP
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.bigquery.datatransfer.v1.ListTransferLogsResponse) {
         return mergeFrom((com.google.cloud.bigquery.datatransfer.v1.ListTransferLogsResponse)other);
@@ -543,12 +521,10 @@ public Builder mergeFrom(com.google.cloud.bigquery.datatransfer.v1.ListTransferL
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -983,13 +959,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1011,12 +985,11 @@ public static com.google.cloud.bigquery.datatransfer.v1.ListTransferLogsResponse
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListTransferLogsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTransferLogsResponse(input, extensionRegistry);
+        return new ListTransferLogsResponse(input, extensionRegistry);
     }
   };
 
@@ -1029,7 +1002,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.bigquery.datatransfer.v1.ListTransferLogsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferRunsRequest.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferRunsRequest.java
index fb03bb2a5e16..2723a2c3137f 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferRunsRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferRunsRequest.java
@@ -39,9 +39,6 @@ private ListTransferRunsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private ListTransferRunsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -99,13 +103,6 @@ private ListTransferRunsRequest(
             runAttempt_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -126,7 +123,6 @@ private ListTransferRunsRequest(
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListTransferRunsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListTransferRunsRequest_fieldAccessorTable
@@ -306,7 +302,6 @@ public java.lang.String getParent() {
           new com.google.protobuf.Internal.ListAdapter.Converter<
               java.lang.Integer, com.google.cloud.bigquery.datatransfer.v1.TransferState>() {
             public com.google.cloud.bigquery.datatransfer.v1.TransferState convert(java.lang.Integer from) {
-              @SuppressWarnings("deprecation")
               com.google.cloud.bigquery.datatransfer.v1.TransferState result = com.google.cloud.bigquery.datatransfer.v1.TransferState.valueOf(from);
               return result == null ? com.google.cloud.bigquery.datatransfer.v1.TransferState.UNRECOGNIZED : result;
             }
@@ -448,13 +443,11 @@ public int getRunAttemptValue() {
    * .google.cloud.bigquery.datatransfer.v1.ListTransferRunsRequest.RunAttempt run_attempt = 5;
    */
   public com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsRequest.RunAttempt getRunAttempt() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsRequest.RunAttempt result = com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsRequest.RunAttempt.valueOf(runAttempt_);
     return result == null ? com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsRequest.RunAttempt.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -464,7 +457,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     getSerializedSize();
@@ -490,7 +482,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -644,7 +635,6 @@ public static com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsRequest
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -652,7 +642,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -682,7 +671,6 @@ public static final class Builder extends
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListTransferRunsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListTransferRunsRequest_fieldAccessorTable
@@ -705,7 +693,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -721,18 +708,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListTransferRunsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsRequest getDefaultInstanceForType() {
       return com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsRequest build() {
       com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -741,7 +725,6 @@ public com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsRequest build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsRequest buildPartial() {
       com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsRequest result = new com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsRequest(this);
       int from_bitField0_ = bitField0_;
@@ -760,39 +743,32 @@ public com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsRequest buildPa
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsRequest) {
         return mergeFrom((com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsRequest)other);
@@ -833,12 +809,10 @@ public Builder mergeFrom(com.google.cloud.bigquery.datatransfer.v1.ListTransferR
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1301,7 +1275,6 @@ public Builder setRunAttemptValue(int value) {
      * .google.cloud.bigquery.datatransfer.v1.ListTransferRunsRequest.RunAttempt run_attempt = 5;
      */
     public com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsRequest.RunAttempt getRunAttempt() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsRequest.RunAttempt result = com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsRequest.RunAttempt.valueOf(runAttempt_);
       return result == null ? com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsRequest.RunAttempt.UNRECOGNIZED : result;
     }
@@ -1334,13 +1307,11 @@ public Builder clearRunAttempt() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1362,12 +1333,11 @@ public static com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsRequest
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListTransferRunsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTransferRunsRequest(input, extensionRegistry);
+        return new ListTransferRunsRequest(input, extensionRegistry);
     }
   };
 
@@ -1380,7 +1350,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferRunsResponse.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferRunsResponse.java
index 12040dba44e4..9977d85d41f4 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferRunsResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ListTransferRunsResponse.java
@@ -34,9 +34,6 @@ private ListTransferRunsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListTransferRunsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               transferRuns_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListTransferRunsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListTransferRunsResponse(
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListTransferRunsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListTransferRunsResponse_fieldAccessorTable
@@ -203,7 +199,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -213,7 +208,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < transferRuns_.size(); i++) {
@@ -225,7 +219,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -350,7 +343,6 @@ public static com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsResponse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -358,7 +350,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -386,7 +377,6 @@ public static final class Builder extends
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListTransferRunsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListTransferRunsResponse_fieldAccessorTable
@@ -410,7 +400,6 @@ private void maybeForceBuilderInitialization() {
         getTransferRunsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (transferRunsBuilder_ == null) {
@@ -424,18 +413,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ListTransferRunsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsResponse getDefaultInstanceForType() {
       return com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsResponse build() {
       com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -444,7 +430,6 @@ public com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsResponse build(
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsResponse buildPartial() {
       com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsResponse result = new com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -464,39 +449,32 @@ public com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsResponse buildP
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsResponse) {
         return mergeFrom((com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsResponse)other);
@@ -543,12 +521,10 @@ public Builder mergeFrom(com.google.cloud.bigquery.datatransfer.v1.ListTransferR
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -983,13 +959,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1011,12 +985,11 @@ public static com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsResponse
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListTransferRunsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTransferRunsResponse(input, extensionRegistry);
+        return new ListTransferRunsResponse(input, extensionRegistry);
     }
   };
 
@@ -1029,7 +1002,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.bigquery.datatransfer.v1.ListTransferRunsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ScheduleTransferRunsRequest.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ScheduleTransferRunsRequest.java
index b95d04918722..9f11c068aec2 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ScheduleTransferRunsRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ScheduleTransferRunsRequest.java
@@ -33,9 +33,6 @@ private ScheduleTransferRunsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ScheduleTransferRunsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -79,13 +83,6 @@ private ScheduleTransferRunsRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private ScheduleTransferRunsRequest(
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ScheduleTransferRunsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ScheduleTransferRunsRequest_fieldAccessorTable
@@ -228,7 +224,6 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -238,7 +233,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -253,7 +247,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -394,7 +387,6 @@ public static com.google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsRequ
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -402,7 +394,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -430,7 +421,6 @@ public static final class Builder extends
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ScheduleTransferRunsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ScheduleTransferRunsRequest_fieldAccessorTable
@@ -453,7 +443,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -473,18 +462,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ScheduleTransferRunsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsRequest getDefaultInstanceForType() {
       return com.google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsRequest build() {
       com.google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -493,7 +479,6 @@ public com.google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsRequest bui
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsRequest buildPartial() {
       com.google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsRequest result = new com.google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsRequest(this);
       result.parent_ = parent_;
@@ -511,39 +496,32 @@ public com.google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsRequest bui
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsRequest) {
         return mergeFrom((com.google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsRequest)other);
@@ -570,12 +548,10 @@ public Builder mergeFrom(com.google.cloud.bigquery.datatransfer.v1.ScheduleTrans
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1011,13 +987,11 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
       }
       return endTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1039,12 +1013,11 @@ public static com.google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsRequ
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ScheduleTransferRunsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ScheduleTransferRunsRequest(input, extensionRegistry);
+        return new ScheduleTransferRunsRequest(input, extensionRegistry);
     }
   };
 
@@ -1057,7 +1030,6 @@ public com.google.protobuf.Parser getParserForType(
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ScheduleTransferRunsResponse.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ScheduleTransferRunsResponse.java
index 09c85d086bfa..87dbdd59006e 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ScheduleTransferRunsResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/ScheduleTransferRunsResponse.java
@@ -33,9 +33,6 @@ private ScheduleTransferRunsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ScheduleTransferRunsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               runs_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private ScheduleTransferRunsResponse(
                 input.readMessage(com.google.cloud.bigquery.datatransfer.v1.TransferRun.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private ScheduleTransferRunsResponse(
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ScheduleTransferRunsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ScheduleTransferRunsResponse_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.cloud.bigquery.datatransfer.v1.TransferRunOrBuilder getRunsOrB
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < runs_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsResp
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ScheduleTransferRunsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ScheduleTransferRunsResponse_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getRunsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (runsBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_ScheduleTransferRunsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsResponse getDefaultInstanceForType() {
       return com.google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsResponse build() {
       com.google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsResponse bu
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsResponse buildPartial() {
       com.google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsResponse result = new com.google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsResponse bu
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsResponse) {
         return mergeFrom((com.google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsResponse)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.cloud.bigquery.datatransfer.v1.ScheduleTrans
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.cloud.bigquery.datatransfer.v1.TransferRun.Builder addRunsBuil
       }
       return runsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsResp
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ScheduleTransferRunsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ScheduleTransferRunsResponse(input, extensionRegistry);
+        return new ScheduleTransferRunsResponse(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.bigquery.datatransfer.v1.ScheduleTransferRunsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferConfig.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferConfig.java
index 5bede3c76679..5ba24ee3d31e 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferConfig.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferConfig.java
@@ -47,9 +47,6 @@ private TransferConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -61,6 +58,13 @@ private TransferConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -157,13 +161,6 @@ private TransferConfig(
             datasetRegion_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -181,7 +178,6 @@ private TransferConfig(
     return com.google.cloud.bigquery.datatransfer.v1.TransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_TransferConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.bigquery.datatransfer.v1.TransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_TransferConfig_fieldAccessorTable
@@ -582,7 +578,6 @@ public int getStateValue() {
    * .google.cloud.bigquery.datatransfer.v1.TransferState state = 10;
    */
   public com.google.cloud.bigquery.datatransfer.v1.TransferState getState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.bigquery.datatransfer.v1.TransferState result = com.google.cloud.bigquery.datatransfer.v1.TransferState.valueOf(state_);
     return result == null ? com.google.cloud.bigquery.datatransfer.v1.TransferState.UNRECOGNIZED : result;
   }
@@ -647,7 +642,6 @@ public java.lang.String getDatasetRegion() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -657,7 +651,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -702,7 +695,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -924,7 +916,6 @@ public static com.google.cloud.bigquery.datatransfer.v1.TransferConfig parseFrom
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -932,7 +923,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.bigquery.datatransfer.v1.TransferConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -965,7 +955,6 @@ public static final class Builder extends
       return com.google.cloud.bigquery.datatransfer.v1.TransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_TransferConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.bigquery.datatransfer.v1.TransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_TransferConfig_fieldAccessorTable
@@ -988,7 +977,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -1032,18 +1020,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.bigquery.datatransfer.v1.TransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_TransferConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.TransferConfig getDefaultInstanceForType() {
       return com.google.cloud.bigquery.datatransfer.v1.TransferConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.TransferConfig build() {
       com.google.cloud.bigquery.datatransfer.v1.TransferConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -1052,7 +1037,6 @@ public com.google.cloud.bigquery.datatransfer.v1.TransferConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.TransferConfig buildPartial() {
       com.google.cloud.bigquery.datatransfer.v1.TransferConfig result = new com.google.cloud.bigquery.datatransfer.v1.TransferConfig(this);
       result.name_ = name_;
@@ -1084,39 +1068,32 @@ public com.google.cloud.bigquery.datatransfer.v1.TransferConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.bigquery.datatransfer.v1.TransferConfig) {
         return mergeFrom((com.google.cloud.bigquery.datatransfer.v1.TransferConfig)other);
@@ -1178,12 +1155,10 @@ public Builder mergeFrom(com.google.cloud.bigquery.datatransfer.v1.TransferConfi
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2311,7 +2286,6 @@ public Builder setStateValue(int value) {
      * .google.cloud.bigquery.datatransfer.v1.TransferState state = 10;
      */
     public com.google.cloud.bigquery.datatransfer.v1.TransferState getState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.bigquery.datatransfer.v1.TransferState result = com.google.cloud.bigquery.datatransfer.v1.TransferState.valueOf(state_);
       return result == null ? com.google.cloud.bigquery.datatransfer.v1.TransferState.UNRECOGNIZED : result;
     }
@@ -2483,13 +2457,11 @@ public Builder setDatasetRegionBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2511,12 +2483,11 @@ public static com.google.cloud.bigquery.datatransfer.v1.TransferConfig getDefaul
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TransferConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TransferConfig(input, extensionRegistry);
+        return new TransferConfig(input, extensionRegistry);
     }
   };
 
@@ -2529,7 +2500,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.bigquery.datatransfer.v1.TransferConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferMessage.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferMessage.java
index d249a6be9adf..e1091af4a04c 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferMessage.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferMessage.java
@@ -34,9 +34,6 @@ private TransferMessage(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private TransferMessage(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.protobuf.Timestamp.Builder subBuilder = null;
             if (messageTime_ != null) {
@@ -73,13 +77,6 @@ private TransferMessage(
             messageText_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private TransferMessage(
     return com.google.cloud.bigquery.datatransfer.v1.TransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_TransferMessage_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.bigquery.datatransfer.v1.TransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_TransferMessage_fieldAccessorTable
@@ -310,7 +306,6 @@ public int getSeverityValue() {
    * .google.cloud.bigquery.datatransfer.v1.TransferMessage.MessageSeverity severity = 2;
    */
   public com.google.cloud.bigquery.datatransfer.v1.TransferMessage.MessageSeverity getSeverity() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.bigquery.datatransfer.v1.TransferMessage.MessageSeverity result = com.google.cloud.bigquery.datatransfer.v1.TransferMessage.MessageSeverity.valueOf(severity_);
     return result == null ? com.google.cloud.bigquery.datatransfer.v1.TransferMessage.MessageSeverity.UNRECOGNIZED : result;
   }
@@ -358,7 +353,6 @@ public java.lang.String getMessageText() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -368,7 +362,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (messageTime_ != null) {
@@ -383,7 +376,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -518,7 +510,6 @@ public static com.google.cloud.bigquery.datatransfer.v1.TransferMessage parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -526,7 +517,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.bigquery.datatransfer.v1.TransferMessage prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -554,7 +544,6 @@ public static final class Builder extends
       return com.google.cloud.bigquery.datatransfer.v1.TransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_TransferMessage_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.bigquery.datatransfer.v1.TransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_TransferMessage_fieldAccessorTable
@@ -577,7 +566,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (messageTimeBuilder_ == null) {
@@ -593,18 +581,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.bigquery.datatransfer.v1.TransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_TransferMessage_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.TransferMessage getDefaultInstanceForType() {
       return com.google.cloud.bigquery.datatransfer.v1.TransferMessage.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.TransferMessage build() {
       com.google.cloud.bigquery.datatransfer.v1.TransferMessage result = buildPartial();
       if (!result.isInitialized()) {
@@ -613,7 +598,6 @@ public com.google.cloud.bigquery.datatransfer.v1.TransferMessage build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.TransferMessage buildPartial() {
       com.google.cloud.bigquery.datatransfer.v1.TransferMessage result = new com.google.cloud.bigquery.datatransfer.v1.TransferMessage(this);
       if (messageTimeBuilder_ == null) {
@@ -627,39 +611,32 @@ public com.google.cloud.bigquery.datatransfer.v1.TransferMessage buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.bigquery.datatransfer.v1.TransferMessage) {
         return mergeFrom((com.google.cloud.bigquery.datatransfer.v1.TransferMessage)other);
@@ -686,12 +663,10 @@ public Builder mergeFrom(com.google.cloud.bigquery.datatransfer.v1.TransferMessa
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -894,7 +869,6 @@ public Builder setSeverityValue(int value) {
      * .google.cloud.bigquery.datatransfer.v1.TransferMessage.MessageSeverity severity = 2;
      */
     public com.google.cloud.bigquery.datatransfer.v1.TransferMessage.MessageSeverity getSeverity() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.bigquery.datatransfer.v1.TransferMessage.MessageSeverity result = com.google.cloud.bigquery.datatransfer.v1.TransferMessage.MessageSeverity.valueOf(severity_);
       return result == null ? com.google.cloud.bigquery.datatransfer.v1.TransferMessage.MessageSeverity.UNRECOGNIZED : result;
     }
@@ -1016,13 +990,11 @@ public Builder setMessageTextBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1044,12 +1016,11 @@ public static com.google.cloud.bigquery.datatransfer.v1.TransferMessage getDefau
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TransferMessage parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TransferMessage(input, extensionRegistry);
+        return new TransferMessage(input, extensionRegistry);
     }
   };
 
@@ -1062,7 +1033,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.bigquery.datatransfer.v1.TransferMessage getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferProto.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferProto.java
index 9637c2a6eb59..6220bf3e7478 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferProto.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferProto.java
@@ -47,7 +47,7 @@ public static void registerAllExtensions(
       " \001(\t\022\036\n\026destination_dataset_id\030\002 \001(\t\022\024\n\014" +
       "display_name\030\003 \001(\t\022\026\n\016data_source_id\030\005 \001" +
       "(\t\022\'\n\006params\030\t \001(\0132\027.google.protobuf.Str" +
-      "uct\022\020\n\010schedule\030\007 \001(\t\022 \n\030data_refresh_wi" +
+      "uct\022\020\n\010schedule\030\007 \001(\t\022 \n\030data_refresh_wi",
       "ndow_days\030\014 \001(\005\022\020\n\010disabled\030\r \001(\010\022/\n\013upd" +
       "ate_time\030\004 \001(\0132\032.google.protobuf.Timesta" +
       "mp\0221\n\rnext_run_time\030\010 \001(\0132\032.google.proto" +
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "\001(\t\"\376\003\n\013TransferRun\022\014\n\004name\030\001 \001(\t\0221\n\rsch" +
       "edule_time\030\003 \001(\0132\032.google.protobuf.Times" +
       "tamp\022,\n\010run_time\030\n \001(\0132\032.google.protobuf" +
-      ".Timestamp\022(\n\014error_status\030\025 \001(\0132\022.googl" +
+      ".Timestamp\022(\n\014error_status\030\025 \001(\0132\022.googl",
       "e.rpc.Status\022.\n\nstart_time\030\004 \001(\0132\032.googl" +
       "e.protobuf.Timestamp\022,\n\010end_time\030\005 \001(\0132\032" +
       ".google.protobuf.Timestamp\022/\n\013update_tim" +
@@ -67,7 +67,7 @@ public static void registerAllExtensions(
       "rce_id\030\007 \001(\t\022C\n\005state\030\010 \001(\01624.google.clo" +
       "ud.bigquery.datatransfer.v1.TransferStat" +
       "e\022\017\n\007user_id\030\013 \001(\003\022\020\n\010schedule\030\014 \001(\t\"\212\002\n" +
-      "\017TransferMessage\0220\n\014message_time\030\001 \001(\0132\032" +
+      "\017TransferMessage\0220\n\014message_time\030\001 \001(\0132\032",
       ".google.protobuf.Timestamp\022X\n\010severity\030\002" +
       " \001(\0162F.google.cloud.bigquery.datatransfe" +
       "r.v1.TransferMessage.MessageSeverity\022\024\n\014" +
@@ -77,7 +77,7 @@ public static void registerAllExtensions(
       "e\022\035\n\031TRANSFER_TYPE_UNSPECIFIED\020\000\022\t\n\005BATC" +
       "H\020\001\022\r\n\tSTREAMING\020\002*s\n\rTransferState\022\036\n\032T" +
       "RANSFER_STATE_UNSPECIFIED\020\000\022\013\n\007PENDING\020\002" +
-      "\022\013\n\007RUNNING\020\003\022\r\n\tSUCCEEDED\020\004\022\n\n\006FAILED\020\005" +
+      "\022\013\n\007RUNNING\020\003\022\r\n\tSUCCEEDED\020\004\022\n\n\006FAILED\020\005",
       "\022\r\n\tCANCELLED\020\006B\347\001\n)com.google.cloud.big" +
       "query.datatransfer.v1B\rTransferProtoP\001ZQ" +
       "google.golang.org/genproto/googleapis/cl" +
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferRun.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferRun.java
index 1178b86aa5e4..1121c21c750f 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferRun.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/TransferRun.java
@@ -38,9 +38,6 @@ private TransferRun(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private TransferRun(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -178,13 +182,6 @@ private TransferRun(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -202,7 +199,6 @@ private TransferRun(
     return com.google.cloud.bigquery.datatransfer.v1.TransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_TransferRun_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.bigquery.datatransfer.v1.TransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_TransferRun_fieldAccessorTable
@@ -602,7 +598,6 @@ public int getStateValue() {
    * .google.cloud.bigquery.datatransfer.v1.TransferState state = 8;
    */
   public com.google.cloud.bigquery.datatransfer.v1.TransferState getState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.bigquery.datatransfer.v1.TransferState result = com.google.cloud.bigquery.datatransfer.v1.TransferState.valueOf(state_);
     return result == null ? com.google.cloud.bigquery.datatransfer.v1.TransferState.UNRECOGNIZED : result;
   }
@@ -675,7 +670,6 @@ public java.lang.String getSchedule() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -685,7 +679,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -730,7 +723,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -973,7 +965,6 @@ public static com.google.cloud.bigquery.datatransfer.v1.TransferRun parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -981,7 +972,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.bigquery.datatransfer.v1.TransferRun prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1009,7 +999,6 @@ public static final class Builder extends
       return com.google.cloud.bigquery.datatransfer.v1.TransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_TransferRun_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.bigquery.datatransfer.v1.TransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_TransferRun_fieldAccessorTable
@@ -1032,7 +1021,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -1092,18 +1080,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.bigquery.datatransfer.v1.TransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_TransferRun_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.TransferRun getDefaultInstanceForType() {
       return com.google.cloud.bigquery.datatransfer.v1.TransferRun.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.TransferRun build() {
       com.google.cloud.bigquery.datatransfer.v1.TransferRun result = buildPartial();
       if (!result.isInitialized()) {
@@ -1112,7 +1097,6 @@ public com.google.cloud.bigquery.datatransfer.v1.TransferRun build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.TransferRun buildPartial() {
       com.google.cloud.bigquery.datatransfer.v1.TransferRun result = new com.google.cloud.bigquery.datatransfer.v1.TransferRun(this);
       result.name_ = name_;
@@ -1160,39 +1144,32 @@ public com.google.cloud.bigquery.datatransfer.v1.TransferRun buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.bigquery.datatransfer.v1.TransferRun) {
         return mergeFrom((com.google.cloud.bigquery.datatransfer.v1.TransferRun)other);
@@ -1252,12 +1229,10 @@ public Builder mergeFrom(com.google.cloud.bigquery.datatransfer.v1.TransferRun o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2687,7 +2662,6 @@ public Builder setStateValue(int value) {
      * .google.cloud.bigquery.datatransfer.v1.TransferState state = 8;
      */
     public com.google.cloud.bigquery.datatransfer.v1.TransferState getState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.bigquery.datatransfer.v1.TransferState result = com.google.cloud.bigquery.datatransfer.v1.TransferState.valueOf(state_);
       return result == null ? com.google.cloud.bigquery.datatransfer.v1.TransferState.UNRECOGNIZED : result;
     }
@@ -2879,13 +2853,11 @@ public Builder setScheduleBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2907,12 +2879,11 @@ public static com.google.cloud.bigquery.datatransfer.v1.TransferRun getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TransferRun parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TransferRun(input, extensionRegistry);
+        return new TransferRun(input, extensionRegistry);
     }
   };
 
@@ -2925,7 +2896,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.bigquery.datatransfer.v1.TransferRun getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/UpdateTransferConfigRequest.java b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/UpdateTransferConfigRequest.java
index 2b984def5aca..591bbed8ee87 100644
--- a/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/UpdateTransferConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigquerydatatransfer-v1/src/main/java/com/google/cloud/bigquery/datatransfer/v1/UpdateTransferConfigRequest.java
@@ -34,9 +34,6 @@ private UpdateTransferConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private UpdateTransferConfigRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.bigquery.datatransfer.v1.TransferConfig.Builder subBuilder = null;
             if (transferConfig_ != null) {
@@ -80,13 +84,6 @@ private UpdateTransferConfigRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private UpdateTransferConfigRequest(
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_UpdateTransferConfigRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_UpdateTransferConfigRequest_fieldAccessorTable
@@ -249,7 +245,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -259,7 +254,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (transferConfig_ != null) {
@@ -274,7 +268,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -415,7 +408,6 @@ public static com.google.cloud.bigquery.datatransfer.v1.UpdateTransferConfigRequ
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -423,7 +415,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.bigquery.datatransfer.v1.UpdateTransferConfigRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -452,7 +443,6 @@ public static final class Builder extends
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_UpdateTransferConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_UpdateTransferConfigRequest_fieldAccessorTable
@@ -475,7 +465,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (transferConfigBuilder_ == null) {
@@ -495,18 +484,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.bigquery.datatransfer.v1.DataTransferProto.internal_static_google_cloud_bigquery_datatransfer_v1_UpdateTransferConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.UpdateTransferConfigRequest getDefaultInstanceForType() {
       return com.google.cloud.bigquery.datatransfer.v1.UpdateTransferConfigRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.UpdateTransferConfigRequest build() {
       com.google.cloud.bigquery.datatransfer.v1.UpdateTransferConfigRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -515,7 +501,6 @@ public com.google.cloud.bigquery.datatransfer.v1.UpdateTransferConfigRequest bui
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.bigquery.datatransfer.v1.UpdateTransferConfigRequest buildPartial() {
       com.google.cloud.bigquery.datatransfer.v1.UpdateTransferConfigRequest result = new com.google.cloud.bigquery.datatransfer.v1.UpdateTransferConfigRequest(this);
       if (transferConfigBuilder_ == null) {
@@ -533,39 +518,32 @@ public com.google.cloud.bigquery.datatransfer.v1.UpdateTransferConfigRequest bui
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.bigquery.datatransfer.v1.UpdateTransferConfigRequest) {
         return mergeFrom((com.google.cloud.bigquery.datatransfer.v1.UpdateTransferConfigRequest)other);
@@ -592,12 +570,10 @@ public Builder mergeFrom(com.google.cloud.bigquery.datatransfer.v1.UpdateTransfe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1080,13 +1056,11 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
       }
       return updateMaskBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1108,12 +1082,11 @@ public static com.google.cloud.bigquery.datatransfer.v1.UpdateTransferConfigRequ
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateTransferConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateTransferConfigRequest(input, extensionRegistry);
+        return new UpdateTransferConfigRequest(input, extensionRegistry);
     }
   };
 
@@ -1126,7 +1099,6 @@ public com.google.protobuf.Parser getParserForType(
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.bigquery.datatransfer.v1.UpdateTransferConfigRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfile.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfile.java
index dff62dddb6dc..0edffb99d612 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfile.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfile.java
@@ -36,9 +36,6 @@ private AppProfile(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private AppProfile(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -96,13 +100,6 @@ private AppProfile(
             routingPolicyCase_ = 6;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -120,7 +117,6 @@ private AppProfile(
     return com.google.bigtable.admin.v2.InstanceProto.internal_static_google_bigtable_admin_v2_AppProfile_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.InstanceProto.internal_static_google_bigtable_admin_v2_AppProfile_fieldAccessorTable
@@ -164,9 +160,6 @@ private MultiClusterRoutingUseAny(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -201,7 +194,6 @@ private MultiClusterRoutingUseAny(
       return com.google.bigtable.admin.v2.InstanceProto.internal_static_google_bigtable_admin_v2_AppProfile_MultiClusterRoutingUseAny_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.InstanceProto.internal_static_google_bigtable_admin_v2_AppProfile_MultiClusterRoutingUseAny_fieldAccessorTable
@@ -210,7 +202,6 @@ private MultiClusterRoutingUseAny(
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -220,13 +211,11 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -334,7 +323,6 @@ public static com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -342,7 +330,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -373,7 +360,6 @@ public static final class Builder extends
         return com.google.bigtable.admin.v2.InstanceProto.internal_static_google_bigtable_admin_v2_AppProfile_MultiClusterRoutingUseAny_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.bigtable.admin.v2.InstanceProto.internal_static_google_bigtable_admin_v2_AppProfile_MultiClusterRoutingUseAny_fieldAccessorTable
@@ -396,24 +382,20 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.bigtable.admin.v2.InstanceProto.internal_static_google_bigtable_admin_v2_AppProfile_MultiClusterRoutingUseAny_descriptor;
       }
 
-      @java.lang.Override
       public com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny getDefaultInstanceForType() {
         return com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny build() {
         com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny result = buildPartial();
         if (!result.isInitialized()) {
@@ -422,46 +404,38 @@ public com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny build()
         return result;
       }
 
-      @java.lang.Override
       public com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny buildPartial() {
         com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny result = new com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny(this);
         onBuilt();
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny) {
           return mergeFrom((com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny)other);
@@ -478,12 +452,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.AppProfile.MultiClusterRou
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -501,13 +473,11 @@ public Builder mergeFrom(
         }
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -529,12 +499,11 @@ public static com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public MultiClusterRoutingUseAny parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new MultiClusterRoutingUseAny(input, extensionRegistry);
+          return new MultiClusterRoutingUseAny(input, extensionRegistry);
       }
     };
 
@@ -547,7 +516,6 @@ public com.google.protobuf.Parser getParserForType()
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -620,9 +588,6 @@ private SingleClusterRouting(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -634,6 +599,13 @@ private SingleClusterRouting(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -645,13 +617,6 @@ private SingleClusterRouting(
               allowTransactionalWrites_ = input.readBool();
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -669,7 +634,6 @@ private SingleClusterRouting(
       return com.google.bigtable.admin.v2.InstanceProto.internal_static_google_bigtable_admin_v2_AppProfile_SingleClusterRouting_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.InstanceProto.internal_static_google_bigtable_admin_v2_AppProfile_SingleClusterRouting_fieldAccessorTable
@@ -735,7 +699,6 @@ public boolean getAllowTransactionalWrites() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -745,7 +708,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getClusterIdBytes().isEmpty()) {
@@ -757,7 +719,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -881,7 +842,6 @@ public static com.google.bigtable.admin.v2.AppProfile.SingleClusterRouting parse
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -889,7 +849,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.bigtable.admin.v2.AppProfile.SingleClusterRouting prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -919,7 +878,6 @@ public static final class Builder extends
         return com.google.bigtable.admin.v2.InstanceProto.internal_static_google_bigtable_admin_v2_AppProfile_SingleClusterRouting_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.bigtable.admin.v2.InstanceProto.internal_static_google_bigtable_admin_v2_AppProfile_SingleClusterRouting_fieldAccessorTable
@@ -942,7 +900,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         clusterId_ = "";
@@ -952,18 +909,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.bigtable.admin.v2.InstanceProto.internal_static_google_bigtable_admin_v2_AppProfile_SingleClusterRouting_descriptor;
       }
 
-      @java.lang.Override
       public com.google.bigtable.admin.v2.AppProfile.SingleClusterRouting getDefaultInstanceForType() {
         return com.google.bigtable.admin.v2.AppProfile.SingleClusterRouting.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.bigtable.admin.v2.AppProfile.SingleClusterRouting build() {
         com.google.bigtable.admin.v2.AppProfile.SingleClusterRouting result = buildPartial();
         if (!result.isInitialized()) {
@@ -972,7 +926,6 @@ public com.google.bigtable.admin.v2.AppProfile.SingleClusterRouting build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.bigtable.admin.v2.AppProfile.SingleClusterRouting buildPartial() {
         com.google.bigtable.admin.v2.AppProfile.SingleClusterRouting result = new com.google.bigtable.admin.v2.AppProfile.SingleClusterRouting(this);
         result.clusterId_ = clusterId_;
@@ -981,39 +934,32 @@ public com.google.bigtable.admin.v2.AppProfile.SingleClusterRouting buildPartial
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.bigtable.admin.v2.AppProfile.SingleClusterRouting) {
           return mergeFrom((com.google.bigtable.admin.v2.AppProfile.SingleClusterRouting)other);
@@ -1037,12 +983,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.AppProfile.SingleClusterRo
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1193,13 +1137,11 @@ public Builder clearAllowTransactionalWrites() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1221,12 +1163,11 @@ public static com.google.bigtable.admin.v2.AppProfile.SingleClusterRouting getDe
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public SingleClusterRouting parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new SingleClusterRouting(input, extensionRegistry);
+          return new SingleClusterRouting(input, extensionRegistry);
       }
     };
 
@@ -1239,7 +1180,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.AppProfile.SingleClusterRouting getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1505,7 +1445,6 @@ public com.google.bigtable.admin.v2.AppProfile.SingleClusterRoutingOrBuilder get
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1515,7 +1454,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -1536,7 +1474,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1700,7 +1637,6 @@ public static com.google.bigtable.admin.v2.AppProfile parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1708,7 +1644,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.AppProfile prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1737,7 +1672,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.InstanceProto.internal_static_google_bigtable_admin_v2_AppProfile_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.InstanceProto.internal_static_google_bigtable_admin_v2_AppProfile_fieldAccessorTable
@@ -1760,7 +1694,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -1774,18 +1707,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.InstanceProto.internal_static_google_bigtable_admin_v2_AppProfile_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.AppProfile getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.AppProfile.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.AppProfile build() {
       com.google.bigtable.admin.v2.AppProfile result = buildPartial();
       if (!result.isInitialized()) {
@@ -1794,7 +1724,6 @@ public com.google.bigtable.admin.v2.AppProfile build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.AppProfile buildPartial() {
       com.google.bigtable.admin.v2.AppProfile result = new com.google.bigtable.admin.v2.AppProfile(this);
       result.name_ = name_;
@@ -1819,39 +1748,32 @@ public com.google.bigtable.admin.v2.AppProfile buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.AppProfile) {
         return mergeFrom((com.google.bigtable.admin.v2.AppProfile)other);
@@ -1893,12 +1815,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.AppProfile other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2587,13 +2507,11 @@ public com.google.bigtable.admin.v2.AppProfile.SingleClusterRoutingOrBuilder get
       onChanged();;
       return singleClusterRoutingBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2615,12 +2533,11 @@ public static com.google.bigtable.admin.v2.AppProfile getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AppProfile parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AppProfile(input, extensionRegistry);
+        return new AppProfile(input, extensionRegistry);
     }
   };
 
@@ -2633,7 +2550,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.AppProfile getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableInstanceAdminProto.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableInstanceAdminProto.java
index 9927bf2348cc..fa0b536d1090 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableInstanceAdminProto.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableInstanceAdminProto.java
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "ions.proto\032\033google/protobuf/empty.proto\032" +
       " google/protobuf/field_mask.proto\032\037googl" +
       "e/protobuf/timestamp.proto\"\227\002\n\025CreateIns" +
-      "tanceRequest\022\016\n\006parent\030\001 \001(\t\022\023\n\013instance" +
+      "tanceRequest\022\016\n\006parent\030\001 \001(\t\022\023\n\013instance",
       "_id\030\002 \001(\t\0224\n\010instance\030\003 \001(\0132\".google.big" +
       "table.admin.v2.Instance\022O\n\010clusters\030\004 \003(" +
       "\0132=.google.bigtable.admin.v2.CreateInsta" +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       "nceRequest\022\014\n\004name\030\001 \001(\t\":\n\024ListInstance" +
       "sRequest\022\016\n\006parent\030\001 \001(\t\022\022\n\npage_token\030\002" +
       " \001(\t\"\201\001\n\025ListInstancesResponse\0225\n\tinstan" +
-      "ces\030\001 \003(\0132\".google.bigtable.admin.v2.Ins" +
+      "ces\030\001 \003(\0132\".google.bigtable.admin.v2.Ins",
       "tance\022\030\n\020failed_locations\030\002 \003(\t\022\027\n\017next_" +
       "page_token\030\003 \001(\t\"\205\001\n\034PartialUpdateInstan" +
       "ceRequest\0224\n\010instance\030\001 \001(\0132\".google.big" +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       "eClusterRequest\022\016\n\006parent\030\001 \001(\t\022\022\n\nclust" +
       "er_id\030\002 \001(\t\0222\n\007cluster\030\003 \001(\0132!.google.bi" +
       "gtable.admin.v2.Cluster\"!\n\021GetClusterReq" +
-      "uest\022\014\n\004name\030\001 \001(\t\"9\n\023ListClustersReques" +
+      "uest\022\014\n\004name\030\001 \001(\t\"9\n\023ListClustersReques",
       "t\022\016\n\006parent\030\001 \001(\t\022\022\n\npage_token\030\002 \001(\t\"~\n" +
       "\024ListClustersResponse\0223\n\010clusters\030\001 \003(\0132" +
       "!.google.bigtable.admin.v2.Cluster\022\030\n\020fa" +
@@ -177,7 +177,7 @@ public static void registerAllExtensions(
       "al_request\030\001 \001(\0132/.google.bigtable.admin" +
       ".v2.CreateInstanceRequest\0220\n\014request_tim" +
       "e\030\002 \001(\0132\032.google.protobuf.Timestamp\022/\n\013f" +
-      "inish_time\030\003 \001(\0132\032.google.protobuf.Times" +
+      "inish_time\030\003 \001(\0132\032.google.protobuf.Times",
       "tamp\"\315\001\n\026UpdateInstanceMetadata\022P\n\020origi" +
       "nal_request\030\001 \001(\01326.google.bigtable.admi" +
       "n.v2.PartialUpdateInstanceRequest\0220\n\014req" +
@@ -187,7 +187,7 @@ public static void registerAllExtensions(
       "\n\020original_request\030\001 \001(\0132..google.bigtab" +
       "le.admin.v2.CreateClusterRequest\0220\n\014requ" +
       "est_time\030\002 \001(\0132\032.google.protobuf.Timesta" +
-      "mp\022/\n\013finish_time\030\003 \001(\0132\032.google.protobu" +
+      "mp\022/\n\013finish_time\030\003 \001(\0132\032.google.protobu",
       "f.Timestamp\"\267\001\n\025UpdateClusterMetadata\022;\n" +
       "\020original_request\030\001 \001(\0132!.google.bigtabl" +
       "e.admin.v2.Cluster\0220\n\014request_time\030\002 \001(\013" +
@@ -197,7 +197,7 @@ public static void registerAllExtensions(
       "\t\022\026\n\016app_profile_id\030\002 \001(\t\0229\n\013app_profile" +
       "\030\003 \001(\0132$.google.bigtable.admin.v2.AppPro" +
       "file\022\027\n\017ignore_warnings\030\004 \001(\010\"$\n\024GetAppP" +
-      "rofileRequest\022\014\n\004name\030\001 \001(\t\"<\n\026ListAppPr" +
+      "rofileRequest\022\014\n\004name\030\001 \001(\t\"<\n\026ListAppPr",
       "ofilesRequest\022\016\n\006parent\030\001 \001(\t\022\022\n\npage_to" +
       "ken\030\002 \001(\t\"n\n\027ListAppProfilesResponse\022:\n\014" +
       "app_profiles\030\001 \003(\0132$.google.bigtable.adm" +
@@ -207,7 +207,7 @@ public static void registerAllExtensions(
       "pProfile\022/\n\013update_mask\030\002 \001(\0132\032.google.p" +
       "rotobuf.FieldMask\022\027\n\017ignore_warnings\030\003 \001" +
       "(\010\"@\n\027DeleteAppProfileRequest\022\014\n\004name\030\001 " +
-      "\001(\t\022\027\n\017ignore_warnings\030\002 \001(\010\"\032\n\030UpdateAp" +
+      "\001(\t\022\027\n\017ignore_warnings\030\002 \001(\010\"\032\n\030UpdateAp",
       "pProfileMetadata2\252\027\n\025BigtableInstanceAdm" +
       "in\022\216\001\n\016CreateInstance\022/.google.bigtable." +
       "admin.v2.CreateInstanceRequest\032\035.google." +
@@ -217,7 +217,7 @@ public static void registerAllExtensions(
       "ceRequest\032\".google.bigtable.admin.v2.Ins" +
       "tance\")\202\323\344\223\002#\022!/v2/{name=projects/*/inst" +
       "ances/*}\022\233\001\n\rListInstances\022..google.bigt" +
-      "able.admin.v2.ListInstancesRequest\032/.goo" +
+      "able.admin.v2.ListInstancesRequest\032/.goo",
       "gle.bigtable.admin.v2.ListInstancesRespo" +
       "nse\")\202\323\344\223\002#\022!/v2/{parent=projects/*}/ins" +
       "tances\022\206\001\n\016UpdateInstance\022\".google.bigta" +
@@ -227,7 +227,7 @@ public static void registerAllExtensions(
       "eInstance\0226.google.bigtable.admin.v2.Par" +
       "tialUpdateInstanceRequest\032\035.google.longr" +
       "unning.Operation\"<\202\323\344\223\00262*/v2/{instance." +
-      "name=projects/*/instances/*}:\010instance\022\204" +
+      "name=projects/*/instances/*}:\010instance\022\204",
       "\001\n\016DeleteInstance\022/.google.bigtable.admi" +
       "n.v2.DeleteInstanceRequest\032\026.google.prot" +
       "obuf.Empty\")\202\323\344\223\002#*!/v2/{name=projects/*" +
@@ -237,7 +237,7 @@ public static void registerAllExtensions(
       "/v2/{parent=projects/*/instances/*}/clus" +
       "ters:\007cluster\022\222\001\n\nGetCluster\022+.google.bi" +
       "gtable.admin.v2.GetClusterRequest\032!.goog" +
-      "le.bigtable.admin.v2.Cluster\"4\202\323\344\223\002.\022,/v" +
+      "le.bigtable.admin.v2.Cluster\"4\202\323\344\223\002.\022,/v",
       "2/{name=projects/*/instances/*/clusters/" +
       "*}\022\243\001\n\014ListClusters\022-.google.bigtable.ad" +
       "min.v2.ListClustersRequest\032..google.bigt" +
@@ -247,7 +247,7 @@ public static void registerAllExtensions(
       "able.admin.v2.Cluster\032\035.google.longrunni" +
       "ng.Operation\"7\202\323\344\223\0021\032,/v2/{name=projects" +
       "/*/instances/*/clusters/*}:\001*\022\215\001\n\rDelete" +
-      "Cluster\022..google.bigtable.admin.v2.Delet" +
+      "Cluster\022..google.bigtable.admin.v2.Delet",
       "eClusterRequest\032\026.google.protobuf.Empty\"" +
       "4\202\323\344\223\002.*,/v2/{name=projects/*/instances/" +
       "*/clusters/*}\022\261\001\n\020CreateAppProfile\0221.goo" +
@@ -257,7 +257,7 @@ public static void registerAllExtensions(
       "ances/*}/appProfiles:\013app_profile\022\236\001\n\rGe" +
       "tAppProfile\022..google.bigtable.admin.v2.G" +
       "etAppProfileRequest\032$.google.bigtable.ad" +
-      "min.v2.AppProfile\"7\202\323\344\223\0021\022//v2/{name=pro" +
+      "min.v2.AppProfile\"7\202\323\344\223\0021\022//v2/{name=pro",
       "jects/*/instances/*/appProfiles/*}\022\257\001\n\017L" +
       "istAppProfiles\0220.google.bigtable.admin.v" +
       "2.ListAppProfilesRequest\0321.google.bigtab" +
@@ -267,7 +267,7 @@ public static void registerAllExtensions(
       "le.bigtable.admin.v2.UpdateAppProfileReq" +
       "uest\032\035.google.longrunning.Operation\"P\202\323\344" +
       "\223\002J2;/v2/{app_profile.name=projects/*/in" +
-      "stances/*/appProfiles/*}:\013app_profile\022\226\001" +
+      "stances/*/appProfiles/*}:\013app_profile\022\226\001",
       "\n\020DeleteAppProfile\0221.google.bigtable.adm" +
       "in.v2.DeleteAppProfileRequest\032\026.google.p" +
       "rotobuf.Empty\"7\202\323\344\223\0021*//v2/{name=project" +
@@ -277,7 +277,7 @@ public static void registerAllExtensions(
       "{resource=projects/*/instances/*}:getIam" +
       "Policy:\001*\022\210\001\n\014SetIamPolicy\022\".google.iam." +
       "v1.SetIamPolicyRequest\032\025.google.iam.v1.P" +
-      "olicy\"=\202\323\344\223\0027\"2/v2/{resource=projects/*/" +
+      "olicy\"=\202\323\344\223\0027\"2/v2/{resource=projects/*/",
       "instances/*}:setIamPolicy:\001*\022\256\001\n\022TestIam" +
       "Permissions\022(.google.iam.v1.TestIamPermi" +
       "ssionsRequest\032).google.iam.v1.TestIamPer" +
@@ -287,7 +287,7 @@ public static void registerAllExtensions(
       "BigtableInstanceAdminProtoP\001Z=google.gol" +
       "ang.org/genproto/googleapis/bigtable/adm" +
       "in/v2;admin\252\002\036Google.Cloud.Bigtable.Admi" +
-      "n.V2\312\002\036Google\\Cloud\\Bigtable\\Admin\\V2b\006p" +
+      "n.V2\312\002\036Google\\Cloud\\Bigtable\\Admin\\V2b\006p",
       "roto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableTableAdminProto.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableTableAdminProto.java
index 66a2c55f77d7..8bb4de21e6ee 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableTableAdminProto.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableTableAdminProto.java
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       "proto\032\037google/protobuf/timestamp.proto\"\310" +
       "\001\n\022CreateTableRequest\022\016\n\006parent\030\001 \001(\t\022\020\n" +
       "\010table_id\030\002 \001(\t\022.\n\005table\030\003 \001(\0132\037.google." +
-      "bigtable.admin.v2.Table\022J\n\016initial_split" +
+      "bigtable.admin.v2.Table\022J\n\016initial_split",
       "s\030\004 \003(\01322.google.bigtable.admin.v2.Creat" +
       "eTableRequest.Split\032\024\n\005Split\022\013\n\003key\030\001 \001(" +
       "\014\"[\n\036CreateTableFromSnapshotRequest\022\016\n\006p" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "\032delete_all_data_from_table\030\003 \001(\010H\000B\010\n\006t" +
       "arget\"k\n\021ListTablesRequest\022\016\n\006parent\030\001 \001" +
       "(\t\0222\n\004view\030\002 \001(\0162$.google.bigtable.admin" +
-      ".v2.Table.View\022\022\n\npage_token\030\003 \001(\t\"^\n\022Li" +
+      ".v2.Table.View\022\022\n\npage_token\030\003 \001(\t\"^\n\022Li",
       "stTablesResponse\022/\n\006tables\030\001 \003(\0132\037.googl" +
       "e.bigtable.admin.v2.Table\022\027\n\017next_page_t" +
       "oken\030\002 \001(\t\"S\n\017GetTableRequest\022\014\n\004name\030\001 " +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       "est\022\014\n\004name\030\001 \001(\t\022Y\n\rmodifications\030\002 \003(\013" +
       "2B.google.bigtable.admin.v2.ModifyColumn" +
       "FamiliesRequest.Modification\032\245\001\n\014Modific" +
-      "ation\022\n\n\002id\030\001 \001(\t\0228\n\006create\030\002 \001(\0132&.goog" +
+      "ation\022\n\n\002id\030\001 \001(\t\0228\n\006create\030\002 \001(\0132&.goog",
       "le.bigtable.admin.v2.ColumnFamilyH\000\0228\n\006u" +
       "pdate\030\003 \001(\0132&.google.bigtable.admin.v2.C" +
       "olumnFamilyH\000\022\016\n\004drop\030\004 \001(\010H\000B\005\n\003mod\"/\n\037" +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       "sistencyRequest\022\014\n\004name\030\001 \001(\t\022\031\n\021consist" +
       "ency_token\030\002 \001(\t\".\n\030CheckConsistencyResp" +
       "onse\022\022\n\nconsistent\030\001 \001(\010\"\207\001\n\024SnapshotTab" +
-      "leRequest\022\014\n\004name\030\001 \001(\t\022\017\n\007cluster\030\002 \001(\t" +
+      "leRequest\022\014\n\004name\030\001 \001(\t\022\017\n\007cluster\030\002 \001(\t",
       "\022\023\n\013snapshot_id\030\003 \001(\t\022&\n\003ttl\030\004 \001(\0132\031.goo" +
       "gle.protobuf.Duration\022\023\n\013description\030\005 \001" +
       "(\t\"\"\n\022GetSnapshotRequest\022\014\n\004name\030\001 \001(\t\"M" +
@@ -177,7 +177,7 @@ public static void registerAllExtensions(
       "\0132\".google.bigtable.admin.v2.Snapshot\022\027\n" +
       "\017next_page_token\030\002 \001(\t\"%\n\025DeleteSnapshot" +
       "Request\022\014\n\004name\030\001 \001(\t\"\304\001\n\025SnapshotTableM" +
-      "etadata\022H\n\020original_request\030\001 \001(\0132..goog" +
+      "etadata\022H\n\020original_request\030\001 \001(\0132..goog",
       "le.bigtable.admin.v2.SnapshotTableReques" +
       "t\0220\n\014request_time\030\002 \001(\0132\032.google.protobu" +
       "f.Timestamp\022/\n\013finish_time\030\003 \001(\0132\032.googl" +
@@ -187,7 +187,7 @@ public static void registerAllExtensions(
       "eFromSnapshotRequest\0220\n\014request_time\030\002 \001" +
       "(\0132\032.google.protobuf.Timestamp\022/\n\013finish" +
       "_time\030\003 \001(\0132\032.google.protobuf.Timestamp2" +
-      "\267\021\n\022BigtableTableAdmin\022\223\001\n\013CreateTable\022," +
+      "\267\021\n\022BigtableTableAdmin\022\223\001\n\013CreateTable\022,",
       ".google.bigtable.admin.v2.CreateTableReq" +
       "uest\032\037.google.bigtable.admin.v2.Table\"5\202" +
       "\323\344\223\002/\"*/v2/{parent=projects/*/instances/" +
@@ -197,7 +197,7 @@ public static void registerAllExtensions(
       "Operation\"H\202\323\344\223\002B\"=/v2/{parent=projects/" +
       "*/instances/*}/tables:createFromSnapshot" +
       ":\001*\022\233\001\n\nListTables\022+.google.bigtable.adm" +
-      "in.v2.ListTablesRequest\032,.google.bigtabl" +
+      "in.v2.ListTablesRequest\032,.google.bigtabl",
       "e.admin.v2.ListTablesResponse\"2\202\323\344\223\002,\022*/" +
       "v2/{parent=projects/*/instances/*}/table" +
       "s\022\212\001\n\010GetTable\022).google.bigtable.admin.v" +
@@ -207,7 +207,7 @@ public static void registerAllExtensions(
       ".google.bigtable.admin.v2.DeleteTableReq" +
       "uest\032\026.google.protobuf.Empty\"2\202\323\344\223\002,**/v" +
       "2/{name=projects/*/instances/*/tables/*}" +
-      "\022\272\001\n\024ModifyColumnFamilies\0225.google.bigta" +
+      "\022\272\001\n\024ModifyColumnFamilies\0225.google.bigta",
       "ble.admin.v2.ModifyColumnFamiliesRequest" +
       "\032\037.google.bigtable.admin.v2.Table\"J\202\323\344\223\002" +
       "D\"?/v2/{name=projects/*/instances/*/tabl" +
@@ -217,7 +217,7 @@ public static void registerAllExtensions(
       "\323\344\223\002<\"7/v2/{name=projects/*/instances/*/" +
       "tables/*}:dropRowRange:\001*\022\341\001\n\030GenerateCo" +
       "nsistencyToken\0229.google.bigtable.admin.v" +
-      "2.GenerateConsistencyTokenRequest\032:.goog" +
+      "2.GenerateConsistencyTokenRequest\032:.goog",
       "le.bigtable.admin.v2.GenerateConsistency" +
       "TokenResponse\"N\202\323\344\223\002H\"C/v2/{name=project" +
       "s/*/instances/*/tables/*}:generateConsis" +
@@ -227,7 +227,7 @@ public static void registerAllExtensions(
       "nsistencyResponse\"F\202\323\344\223\002@\";/v2/{name=pro" +
       "jects/*/instances/*/tables/*}:checkConsi" +
       "stency:\001*\022\236\001\n\rSnapshotTable\022..google.big" +
-      "table.admin.v2.SnapshotTableRequest\032\035.go" +
+      "table.admin.v2.SnapshotTableRequest\032\035.go",
       "ogle.longrunning.Operation\">\202\323\344\223\0028\"3/v2/" +
       "{name=projects/*/instances/*/tables/*}:s" +
       "napshot:\001*\022\241\001\n\013GetSnapshot\022,.google.bigt" +
@@ -237,7 +237,7 @@ public static void registerAllExtensions(
       "*/snapshots/*}\022\262\001\n\rListSnapshots\022..googl" +
       "e.bigtable.admin.v2.ListSnapshotsRequest" +
       "\032/.google.bigtable.admin.v2.ListSnapshot" +
-      "sResponse\"@\202\323\344\223\002:\0228/v2/{parent=projects/" +
+      "sResponse\"@\202\323\344\223\002:\0228/v2/{parent=projects/",
       "*/instances/*/clusters/*}/snapshots\022\233\001\n\016" +
       "DeleteSnapshot\022/.google.bigtable.admin.v" +
       "2.DeleteSnapshotRequest\032\026.google.protobu" +
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyRequest.java
index a991aea68539..df2812f3d507 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyRequest.java
@@ -35,9 +35,6 @@ private CheckConsistencyRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private CheckConsistencyRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -61,13 +65,6 @@ private CheckConsistencyRequest(
             consistencyToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -85,7 +82,6 @@ private CheckConsistencyRequest(
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_CheckConsistencyRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_CheckConsistencyRequest_fieldAccessorTable
@@ -182,7 +178,6 @@ public java.lang.String getConsistencyToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -192,7 +187,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -204,7 +198,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -326,7 +319,6 @@ public static com.google.bigtable.admin.v2.CheckConsistencyRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -334,7 +326,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.CheckConsistencyRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -363,7 +354,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_CheckConsistencyRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_CheckConsistencyRequest_fieldAccessorTable
@@ -386,7 +376,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -396,18 +385,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_CheckConsistencyRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.CheckConsistencyRequest getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.CheckConsistencyRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.CheckConsistencyRequest build() {
       com.google.bigtable.admin.v2.CheckConsistencyRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -416,7 +402,6 @@ public com.google.bigtable.admin.v2.CheckConsistencyRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.CheckConsistencyRequest buildPartial() {
       com.google.bigtable.admin.v2.CheckConsistencyRequest result = new com.google.bigtable.admin.v2.CheckConsistencyRequest(this);
       result.name_ = name_;
@@ -425,39 +410,32 @@ public com.google.bigtable.admin.v2.CheckConsistencyRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.CheckConsistencyRequest) {
         return mergeFrom((com.google.bigtable.admin.v2.CheckConsistencyRequest)other);
@@ -482,12 +460,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.CheckConsistencyRequest ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -693,13 +669,11 @@ public Builder setConsistencyTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -721,12 +695,11 @@ public static com.google.bigtable.admin.v2.CheckConsistencyRequest getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CheckConsistencyRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CheckConsistencyRequest(input, extensionRegistry);
+        return new CheckConsistencyRequest(input, extensionRegistry);
     }
   };
 
@@ -739,7 +712,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.CheckConsistencyRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyResponse.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyResponse.java
index 95203f319290..95f21bc7bda3 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyResponse.java
@@ -34,9 +34,6 @@ private CheckConsistencyResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,11 +45,6 @@ private CheckConsistencyResponse(
           case 0:
             done = true;
             break;
-          case 8: {
-
-            consistent_ = input.readBool();
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +52,11 @@ private CheckConsistencyResponse(
             }
             break;
           }
+          case 8: {
+
+            consistent_ = input.readBool();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private CheckConsistencyResponse(
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_CheckConsistencyResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_CheckConsistencyResponse_fieldAccessorTable
@@ -100,7 +96,6 @@ public boolean getConsistent() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -110,7 +105,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (consistent_ != false) {
@@ -119,7 +113,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -236,7 +229,6 @@ public static com.google.bigtable.admin.v2.CheckConsistencyResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -244,7 +236,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.CheckConsistencyResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -273,7 +264,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_CheckConsistencyResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_CheckConsistencyResponse_fieldAccessorTable
@@ -296,7 +286,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       consistent_ = false;
@@ -304,18 +293,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_CheckConsistencyResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.CheckConsistencyResponse getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.CheckConsistencyResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.CheckConsistencyResponse build() {
       com.google.bigtable.admin.v2.CheckConsistencyResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -324,7 +310,6 @@ public com.google.bigtable.admin.v2.CheckConsistencyResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.CheckConsistencyResponse buildPartial() {
       com.google.bigtable.admin.v2.CheckConsistencyResponse result = new com.google.bigtable.admin.v2.CheckConsistencyResponse(this);
       result.consistent_ = consistent_;
@@ -332,39 +317,32 @@ public com.google.bigtable.admin.v2.CheckConsistencyResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.CheckConsistencyResponse) {
         return mergeFrom((com.google.bigtable.admin.v2.CheckConsistencyResponse)other);
@@ -384,12 +362,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.CheckConsistencyResponse o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -448,13 +424,11 @@ public Builder clearConsistent() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -476,12 +450,11 @@ public static com.google.bigtable.admin.v2.CheckConsistencyResponse getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CheckConsistencyResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CheckConsistencyResponse(input, extensionRegistry);
+        return new CheckConsistencyResponse(input, extensionRegistry);
     }
   };
 
@@ -494,7 +467,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.CheckConsistencyResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Cluster.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Cluster.java
index c83f41c1edad..3344a5cf7148 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Cluster.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Cluster.java
@@ -39,9 +39,6 @@ private Cluster(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private Cluster(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -82,13 +86,6 @@ private Cluster(
             defaultStorageType_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -106,7 +103,6 @@ private Cluster(
     return com.google.bigtable.admin.v2.InstanceProto.internal_static_google_bigtable_admin_v2_Cluster_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.InstanceProto.internal_static_google_bigtable_admin_v2_Cluster_fieldAccessorTable
@@ -415,7 +411,6 @@ public int getStateValue() {
    * .google.bigtable.admin.v2.Cluster.State state = 3;
    */
   public com.google.bigtable.admin.v2.Cluster.State getState() {
-    @SuppressWarnings("deprecation")
     com.google.bigtable.admin.v2.Cluster.State result = com.google.bigtable.admin.v2.Cluster.State.valueOf(state_);
     return result == null ? com.google.bigtable.admin.v2.Cluster.State.UNRECOGNIZED : result;
   }
@@ -458,13 +453,11 @@ public int getDefaultStorageTypeValue() {
    * .google.bigtable.admin.v2.StorageType default_storage_type = 5;
    */
   public com.google.bigtable.admin.v2.StorageType getDefaultStorageType() {
-    @SuppressWarnings("deprecation")
     com.google.bigtable.admin.v2.StorageType result = com.google.bigtable.admin.v2.StorageType.valueOf(defaultStorageType_);
     return result == null ? com.google.bigtable.admin.v2.StorageType.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -474,7 +467,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -495,7 +487,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -639,7 +630,6 @@ public static com.google.bigtable.admin.v2.Cluster parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -647,7 +637,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.Cluster prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -677,7 +666,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.InstanceProto.internal_static_google_bigtable_admin_v2_Cluster_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.InstanceProto.internal_static_google_bigtable_admin_v2_Cluster_fieldAccessorTable
@@ -700,7 +688,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -716,18 +703,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.InstanceProto.internal_static_google_bigtable_admin_v2_Cluster_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.Cluster getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.Cluster.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.Cluster build() {
       com.google.bigtable.admin.v2.Cluster result = buildPartial();
       if (!result.isInitialized()) {
@@ -736,7 +720,6 @@ public com.google.bigtable.admin.v2.Cluster build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.Cluster buildPartial() {
       com.google.bigtable.admin.v2.Cluster result = new com.google.bigtable.admin.v2.Cluster(this);
       result.name_ = name_;
@@ -748,39 +731,32 @@ public com.google.bigtable.admin.v2.Cluster buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.Cluster) {
         return mergeFrom((com.google.bigtable.admin.v2.Cluster)other);
@@ -814,12 +790,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.Cluster other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1080,7 +1054,6 @@ public Builder setStateValue(int value) {
      * .google.bigtable.admin.v2.Cluster.State state = 3;
      */
     public com.google.bigtable.admin.v2.Cluster.State getState() {
-      @SuppressWarnings("deprecation")
       com.google.bigtable.admin.v2.Cluster.State result = com.google.bigtable.admin.v2.Cluster.State.valueOf(state_);
       return result == null ? com.google.bigtable.admin.v2.Cluster.State.UNRECOGNIZED : result;
     }
@@ -1194,7 +1167,6 @@ public Builder setDefaultStorageTypeValue(int value) {
      * .google.bigtable.admin.v2.StorageType default_storage_type = 5;
      */
     public com.google.bigtable.admin.v2.StorageType getDefaultStorageType() {
-      @SuppressWarnings("deprecation")
       com.google.bigtable.admin.v2.StorageType result = com.google.bigtable.admin.v2.StorageType.valueOf(defaultStorageType_);
       return result == null ? com.google.bigtable.admin.v2.StorageType.UNRECOGNIZED : result;
     }
@@ -1231,13 +1203,11 @@ public Builder clearDefaultStorageType() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1259,12 +1229,11 @@ public static com.google.bigtable.admin.v2.Cluster getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Cluster parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Cluster(input, extensionRegistry);
+        return new Cluster(input, extensionRegistry);
     }
   };
 
@@ -1277,7 +1246,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.Cluster getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ColumnFamily.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ColumnFamily.java
index c10fd7ed4a13..3e88cbb0b5d1 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ColumnFamily.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ColumnFamily.java
@@ -32,9 +32,6 @@ private ColumnFamily(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private ColumnFamily(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.bigtable.admin.v2.GcRule.Builder subBuilder = null;
             if (gcRule_ != null) {
@@ -59,13 +63,6 @@ private ColumnFamily(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private ColumnFamily(
     return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_ColumnFamily_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_ColumnFamily_fieldAccessorTable
@@ -137,7 +133,6 @@ public com.google.bigtable.admin.v2.GcRuleOrBuilder getGcRuleOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -147,7 +142,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (gcRule_ != null) {
@@ -156,7 +150,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -277,7 +270,6 @@ public static com.google.bigtable.admin.v2.ColumnFamily parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -285,7 +277,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.ColumnFamily prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -313,7 +304,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_ColumnFamily_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_ColumnFamily_fieldAccessorTable
@@ -336,7 +326,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (gcRuleBuilder_ == null) {
@@ -348,18 +337,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_ColumnFamily_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ColumnFamily getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.ColumnFamily.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ColumnFamily build() {
       com.google.bigtable.admin.v2.ColumnFamily result = buildPartial();
       if (!result.isInitialized()) {
@@ -368,7 +354,6 @@ public com.google.bigtable.admin.v2.ColumnFamily build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ColumnFamily buildPartial() {
       com.google.bigtable.admin.v2.ColumnFamily result = new com.google.bigtable.admin.v2.ColumnFamily(this);
       if (gcRuleBuilder_ == null) {
@@ -380,39 +365,32 @@ public com.google.bigtable.admin.v2.ColumnFamily buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.ColumnFamily) {
         return mergeFrom((com.google.bigtable.admin.v2.ColumnFamily)other);
@@ -432,12 +410,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ColumnFamily other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -644,13 +620,11 @@ public com.google.bigtable.admin.v2.GcRuleOrBuilder getGcRuleOrBuilder() {
       }
       return gcRuleBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -672,12 +646,11 @@ public static com.google.bigtable.admin.v2.ColumnFamily getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ColumnFamily parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ColumnFamily(input, extensionRegistry);
+        return new ColumnFamily(input, extensionRegistry);
     }
   };
 
@@ -690,7 +663,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.ColumnFamily getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateAppProfileRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateAppProfileRequest.java
index 7e0072d8f17f..1c6f090d753e 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateAppProfileRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateAppProfileRequest.java
@@ -35,9 +35,6 @@ private CreateAppProfileRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private CreateAppProfileRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -79,13 +83,6 @@ private CreateAppProfileRequest(
             ignoreWarnings_ = input.readBool();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private CreateAppProfileRequest(
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_CreateAppProfileRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_CreateAppProfileRequest_fieldAccessorTable
@@ -253,7 +249,6 @@ public boolean getIgnoreWarnings() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -263,7 +258,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -281,7 +275,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -425,7 +418,6 @@ public static com.google.bigtable.admin.v2.CreateAppProfileRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -433,7 +425,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.CreateAppProfileRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -461,7 +452,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_CreateAppProfileRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_CreateAppProfileRequest_fieldAccessorTable
@@ -484,7 +474,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -502,18 +491,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_CreateAppProfileRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.CreateAppProfileRequest getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.CreateAppProfileRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.CreateAppProfileRequest build() {
       com.google.bigtable.admin.v2.CreateAppProfileRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -522,7 +508,6 @@ public com.google.bigtable.admin.v2.CreateAppProfileRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.CreateAppProfileRequest buildPartial() {
       com.google.bigtable.admin.v2.CreateAppProfileRequest result = new com.google.bigtable.admin.v2.CreateAppProfileRequest(this);
       result.parent_ = parent_;
@@ -537,39 +522,32 @@ public com.google.bigtable.admin.v2.CreateAppProfileRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.CreateAppProfileRequest) {
         return mergeFrom((com.google.bigtable.admin.v2.CreateAppProfileRequest)other);
@@ -600,12 +578,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.CreateAppProfileRequest ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1021,13 +997,11 @@ public Builder clearIgnoreWarnings() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1049,12 +1023,11 @@ public static com.google.bigtable.admin.v2.CreateAppProfileRequest getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateAppProfileRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateAppProfileRequest(input, extensionRegistry);
+        return new CreateAppProfileRequest(input, extensionRegistry);
     }
   };
 
@@ -1067,7 +1040,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.CreateAppProfileRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateClusterMetadata.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateClusterMetadata.java
index 28fa5ff80a7e..945903dc2eb1 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateClusterMetadata.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateClusterMetadata.java
@@ -32,9 +32,6 @@ private CreateClusterMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private CreateClusterMetadata(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.bigtable.admin.v2.CreateClusterRequest.Builder subBuilder = null;
             if (originalRequest_ != null) {
@@ -85,13 +89,6 @@ private CreateClusterMetadata(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -109,7 +106,6 @@ private CreateClusterMetadata(
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_CreateClusterMetadata_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_CreateClusterMetadata_fieldAccessorTable
@@ -217,7 +213,6 @@ public com.google.protobuf.TimestampOrBuilder getFinishTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -227,7 +222,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (originalRequest_ != null) {
@@ -242,7 +236,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -389,7 +382,6 @@ public static com.google.bigtable.admin.v2.CreateClusterMetadata parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -397,7 +389,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.CreateClusterMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -425,7 +416,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_CreateClusterMetadata_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_CreateClusterMetadata_fieldAccessorTable
@@ -448,7 +438,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (originalRequestBuilder_ == null) {
@@ -472,18 +461,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_CreateClusterMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.CreateClusterMetadata getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.CreateClusterMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.CreateClusterMetadata build() {
       com.google.bigtable.admin.v2.CreateClusterMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -492,7 +478,6 @@ public com.google.bigtable.admin.v2.CreateClusterMetadata build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.CreateClusterMetadata buildPartial() {
       com.google.bigtable.admin.v2.CreateClusterMetadata result = new com.google.bigtable.admin.v2.CreateClusterMetadata(this);
       if (originalRequestBuilder_ == null) {
@@ -514,39 +499,32 @@ public com.google.bigtable.admin.v2.CreateClusterMetadata buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.CreateClusterMetadata) {
         return mergeFrom((com.google.bigtable.admin.v2.CreateClusterMetadata)other);
@@ -572,12 +550,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.CreateClusterMetadata othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1054,13 +1030,11 @@ public com.google.protobuf.TimestampOrBuilder getFinishTimeOrBuilder() {
       }
       return finishTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1082,12 +1056,11 @@ public static com.google.bigtable.admin.v2.CreateClusterMetadata getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateClusterMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateClusterMetadata(input, extensionRegistry);
+        return new CreateClusterMetadata(input, extensionRegistry);
     }
   };
 
@@ -1100,7 +1073,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.CreateClusterMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateClusterRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateClusterRequest.java
index 8a0993e10a7b..80884acc7f8d 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateClusterRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateClusterRequest.java
@@ -34,9 +34,6 @@ private CreateClusterRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private CreateClusterRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private CreateClusterRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private CreateClusterRequest(
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_CreateClusterRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_CreateClusterRequest_fieldAccessorTable
@@ -234,7 +230,6 @@ public com.google.bigtable.admin.v2.ClusterOrBuilder getClusterOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -244,7 +239,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -259,7 +253,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -394,7 +387,6 @@ public static com.google.bigtable.admin.v2.CreateClusterRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -402,7 +394,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.CreateClusterRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -430,7 +421,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_CreateClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_CreateClusterRequest_fieldAccessorTable
@@ -453,7 +443,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -469,18 +458,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_CreateClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.CreateClusterRequest getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.CreateClusterRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.CreateClusterRequest build() {
       com.google.bigtable.admin.v2.CreateClusterRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -489,7 +475,6 @@ public com.google.bigtable.admin.v2.CreateClusterRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.CreateClusterRequest buildPartial() {
       com.google.bigtable.admin.v2.CreateClusterRequest result = new com.google.bigtable.admin.v2.CreateClusterRequest(this);
       result.parent_ = parent_;
@@ -503,39 +488,32 @@ public com.google.bigtable.admin.v2.CreateClusterRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.CreateClusterRequest) {
         return mergeFrom((com.google.bigtable.admin.v2.CreateClusterRequest)other);
@@ -563,12 +541,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.CreateClusterRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -946,13 +922,11 @@ public com.google.bigtable.admin.v2.ClusterOrBuilder getClusterOrBuilder() {
       }
       return clusterBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -974,12 +948,11 @@ public static com.google.bigtable.admin.v2.CreateClusterRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateClusterRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateClusterRequest(input, extensionRegistry);
+        return new CreateClusterRequest(input, extensionRegistry);
     }
   };
 
@@ -992,7 +965,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.CreateClusterRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateInstanceMetadata.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateInstanceMetadata.java
index 872fd5b2a570..bb2e35ede09e 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateInstanceMetadata.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateInstanceMetadata.java
@@ -32,9 +32,6 @@ private CreateInstanceMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private CreateInstanceMetadata(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.bigtable.admin.v2.CreateInstanceRequest.Builder subBuilder = null;
             if (originalRequest_ != null) {
@@ -85,13 +89,6 @@ private CreateInstanceMetadata(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -109,7 +106,6 @@ private CreateInstanceMetadata(
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_CreateInstanceMetadata_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_CreateInstanceMetadata_fieldAccessorTable
@@ -217,7 +213,6 @@ public com.google.protobuf.TimestampOrBuilder getFinishTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -227,7 +222,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (originalRequest_ != null) {
@@ -242,7 +236,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -389,7 +382,6 @@ public static com.google.bigtable.admin.v2.CreateInstanceMetadata parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -397,7 +389,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.CreateInstanceMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -425,7 +416,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_CreateInstanceMetadata_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_CreateInstanceMetadata_fieldAccessorTable
@@ -448,7 +438,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (originalRequestBuilder_ == null) {
@@ -472,18 +461,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_CreateInstanceMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.CreateInstanceMetadata getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.CreateInstanceMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.CreateInstanceMetadata build() {
       com.google.bigtable.admin.v2.CreateInstanceMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -492,7 +478,6 @@ public com.google.bigtable.admin.v2.CreateInstanceMetadata build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.CreateInstanceMetadata buildPartial() {
       com.google.bigtable.admin.v2.CreateInstanceMetadata result = new com.google.bigtable.admin.v2.CreateInstanceMetadata(this);
       if (originalRequestBuilder_ == null) {
@@ -514,39 +499,32 @@ public com.google.bigtable.admin.v2.CreateInstanceMetadata buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.CreateInstanceMetadata) {
         return mergeFrom((com.google.bigtable.admin.v2.CreateInstanceMetadata)other);
@@ -572,12 +550,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.CreateInstanceMetadata oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1054,13 +1030,11 @@ public com.google.protobuf.TimestampOrBuilder getFinishTimeOrBuilder() {
       }
       return finishTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1082,12 +1056,11 @@ public static com.google.bigtable.admin.v2.CreateInstanceMetadata getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateInstanceMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateInstanceMetadata(input, extensionRegistry);
+        return new CreateInstanceMetadata(input, extensionRegistry);
     }
   };
 
@@ -1100,7 +1073,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.CreateInstanceMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateInstanceRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateInstanceRequest.java
index 8dadd6210911..3973295c9a2d 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateInstanceRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateInstanceRequest.java
@@ -34,9 +34,6 @@ private CreateInstanceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private CreateInstanceRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -86,13 +90,6 @@ private CreateInstanceRequest(
                 clusters__.getKey(), clusters__.getValue());
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -111,7 +108,6 @@ private CreateInstanceRequest(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -122,7 +118,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_CreateInstanceRequest_fieldAccessorTable
@@ -366,7 +361,6 @@ public com.google.bigtable.admin.v2.Cluster getClustersOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -376,7 +370,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -397,7 +390,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -548,7 +540,6 @@ public static com.google.bigtable.admin.v2.CreateInstanceRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -556,7 +547,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.CreateInstanceRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -606,7 +596,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_CreateInstanceRequest_fieldAccessorTable
@@ -629,7 +618,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -646,18 +634,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_CreateInstanceRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.CreateInstanceRequest getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.CreateInstanceRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.CreateInstanceRequest build() {
       com.google.bigtable.admin.v2.CreateInstanceRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -666,7 +651,6 @@ public com.google.bigtable.admin.v2.CreateInstanceRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.CreateInstanceRequest buildPartial() {
       com.google.bigtable.admin.v2.CreateInstanceRequest result = new com.google.bigtable.admin.v2.CreateInstanceRequest(this);
       int from_bitField0_ = bitField0_;
@@ -685,39 +669,32 @@ public com.google.bigtable.admin.v2.CreateInstanceRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.CreateInstanceRequest) {
         return mergeFrom((com.google.bigtable.admin.v2.CreateInstanceRequest)other);
@@ -747,12 +724,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.CreateInstanceRequest othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1305,13 +1280,11 @@ public Builder putAllClusters(
           .putAll(values);
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1333,12 +1306,11 @@ public static com.google.bigtable.admin.v2.CreateInstanceRequest getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateInstanceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateInstanceRequest(input, extensionRegistry);
+        return new CreateInstanceRequest(input, extensionRegistry);
     }
   };
 
@@ -1351,7 +1323,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.CreateInstanceRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotMetadata.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotMetadata.java
index 3b6f39c44076..c883cab07480 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotMetadata.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotMetadata.java
@@ -36,9 +36,6 @@ private CreateTableFromSnapshotMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private CreateTableFromSnapshotMetadata(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest.Builder subBuilder = null;
             if (originalRequest_ != null) {
@@ -89,13 +93,6 @@ private CreateTableFromSnapshotMetadata(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -113,7 +110,6 @@ private CreateTableFromSnapshotMetadata(
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_CreateTableFromSnapshotMetadata_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_CreateTableFromSnapshotMetadata_fieldAccessorTable
@@ -224,7 +220,6 @@ public com.google.protobuf.TimestampOrBuilder getFinishTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -234,7 +229,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (originalRequest_ != null) {
@@ -249,7 +243,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -396,7 +389,6 @@ public static com.google.bigtable.admin.v2.CreateTableFromSnapshotMetadata parse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -404,7 +396,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.CreateTableFromSnapshotMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -436,7 +427,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_CreateTableFromSnapshotMetadata_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_CreateTableFromSnapshotMetadata_fieldAccessorTable
@@ -459,7 +449,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (originalRequestBuilder_ == null) {
@@ -483,18 +472,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_CreateTableFromSnapshotMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.CreateTableFromSnapshotMetadata getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.CreateTableFromSnapshotMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.CreateTableFromSnapshotMetadata build() {
       com.google.bigtable.admin.v2.CreateTableFromSnapshotMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -503,7 +489,6 @@ public com.google.bigtable.admin.v2.CreateTableFromSnapshotMetadata build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.CreateTableFromSnapshotMetadata buildPartial() {
       com.google.bigtable.admin.v2.CreateTableFromSnapshotMetadata result = new com.google.bigtable.admin.v2.CreateTableFromSnapshotMetadata(this);
       if (originalRequestBuilder_ == null) {
@@ -525,39 +510,32 @@ public com.google.bigtable.admin.v2.CreateTableFromSnapshotMetadata buildPartial
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.CreateTableFromSnapshotMetadata) {
         return mergeFrom((com.google.bigtable.admin.v2.CreateTableFromSnapshotMetadata)other);
@@ -583,12 +561,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.CreateTableFromSnapshotMet
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1074,13 +1050,11 @@ public com.google.protobuf.TimestampOrBuilder getFinishTimeOrBuilder() {
       }
       return finishTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1102,12 +1076,11 @@ public static com.google.bigtable.admin.v2.CreateTableFromSnapshotMetadata getDe
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateTableFromSnapshotMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateTableFromSnapshotMetadata(input, extensionRegistry);
+        return new CreateTableFromSnapshotMetadata(input, extensionRegistry);
     }
   };
 
@@ -1120,7 +1093,6 @@ public com.google.protobuf.Parser getParserForT
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.CreateTableFromSnapshotMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotRequest.java
index 08a9e3f95be5..964f42270221 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotRequest.java
@@ -40,9 +40,6 @@ private CreateTableFromSnapshotRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -54,6 +51,13 @@ private CreateTableFromSnapshotRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -72,13 +76,6 @@ private CreateTableFromSnapshotRequest(
             sourceSnapshot_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private CreateTableFromSnapshotRequest(
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_CreateTableFromSnapshotRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_CreateTableFromSnapshotRequest_fieldAccessorTable
@@ -241,7 +237,6 @@ public java.lang.String getSourceSnapshot() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -251,7 +246,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -266,7 +260,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -395,7 +388,6 @@ public static com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest parseF
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -403,7 +395,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -436,7 +427,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_CreateTableFromSnapshotRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_CreateTableFromSnapshotRequest_fieldAccessorTable
@@ -459,7 +449,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -471,18 +460,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_CreateTableFromSnapshotRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest build() {
       com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -491,7 +477,6 @@ public com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest buildPartial() {
       com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest result = new com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest(this);
       result.parent_ = parent_;
@@ -501,39 +486,32 @@ public com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest buildPartial(
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest) {
         return mergeFrom((com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest)other);
@@ -562,12 +540,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.CreateTableFromSnapshotReq
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -877,13 +853,11 @@ public Builder setSourceSnapshotBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -905,12 +879,11 @@ public static com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest getDef
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateTableFromSnapshotRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateTableFromSnapshotRequest(input, extensionRegistry);
+        return new CreateTableFromSnapshotRequest(input, extensionRegistry);
     }
   };
 
@@ -923,7 +896,6 @@ public com.google.protobuf.Parser getParserForTy
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.CreateTableFromSnapshotRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableRequest.java
index f45229779010..d0121518a909 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableRequest.java
@@ -36,9 +36,6 @@ private CreateTableRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private CreateTableRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -84,13 +88,6 @@ private CreateTableRequest(
                 input.readMessage(com.google.bigtable.admin.v2.CreateTableRequest.Split.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -111,7 +108,6 @@ private CreateTableRequest(
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_CreateTableRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_CreateTableRequest_fieldAccessorTable
@@ -162,9 +158,6 @@ private Split(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -176,11 +169,6 @@ private Split(
             case 0:
               done = true;
               break;
-            case 10: {
-
-              key_ = input.readBytes();
-              break;
-            }
             default: {
               if (!parseUnknownFieldProto3(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -188,6 +176,11 @@ private Split(
               }
               break;
             }
+            case 10: {
+
+              key_ = input.readBytes();
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -205,7 +198,6 @@ private Split(
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_CreateTableRequest_Split_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_CreateTableRequest_Split_fieldAccessorTable
@@ -227,7 +219,6 @@ public com.google.protobuf.ByteString getKey() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -237,7 +228,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!key_.isEmpty()) {
@@ -246,7 +236,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -362,7 +351,6 @@ public static com.google.bigtable.admin.v2.CreateTableRequest.Split parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -370,7 +358,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.bigtable.admin.v2.CreateTableRequest.Split prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -398,7 +385,6 @@ public static final class Builder extends
         return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_CreateTableRequest_Split_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_CreateTableRequest_Split_fieldAccessorTable
@@ -421,7 +407,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         key_ = com.google.protobuf.ByteString.EMPTY;
@@ -429,18 +414,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_CreateTableRequest_Split_descriptor;
       }
 
-      @java.lang.Override
       public com.google.bigtable.admin.v2.CreateTableRequest.Split getDefaultInstanceForType() {
         return com.google.bigtable.admin.v2.CreateTableRequest.Split.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.bigtable.admin.v2.CreateTableRequest.Split build() {
         com.google.bigtable.admin.v2.CreateTableRequest.Split result = buildPartial();
         if (!result.isInitialized()) {
@@ -449,7 +431,6 @@ public com.google.bigtable.admin.v2.CreateTableRequest.Split build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.bigtable.admin.v2.CreateTableRequest.Split buildPartial() {
         com.google.bigtable.admin.v2.CreateTableRequest.Split result = new com.google.bigtable.admin.v2.CreateTableRequest.Split(this);
         result.key_ = key_;
@@ -457,39 +438,32 @@ public com.google.bigtable.admin.v2.CreateTableRequest.Split buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.bigtable.admin.v2.CreateTableRequest.Split) {
           return mergeFrom((com.google.bigtable.admin.v2.CreateTableRequest.Split)other);
@@ -509,12 +483,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.CreateTableRequest.Split o
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -573,13 +545,11 @@ public Builder clearKey() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -601,12 +571,11 @@ public static com.google.bigtable.admin.v2.CreateTableRequest.Split getDefaultIn
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Split parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Split(input, extensionRegistry);
+          return new Split(input, extensionRegistry);
       }
     };
 
@@ -619,7 +588,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.CreateTableRequest.Split getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -869,7 +837,6 @@ public com.google.bigtable.admin.v2.CreateTableRequest.SplitOrBuilder getInitial
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -879,7 +846,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -897,7 +863,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1042,7 +1007,6 @@ public static com.google.bigtable.admin.v2.CreateTableRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1050,7 +1014,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.CreateTableRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1079,7 +1042,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_CreateTableRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_CreateTableRequest_fieldAccessorTable
@@ -1103,7 +1065,6 @@ private void maybeForceBuilderInitialization() {
         getInitialSplitsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -1125,18 +1086,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_CreateTableRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.CreateTableRequest getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.CreateTableRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.CreateTableRequest build() {
       com.google.bigtable.admin.v2.CreateTableRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -1145,7 +1103,6 @@ public com.google.bigtable.admin.v2.CreateTableRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.CreateTableRequest buildPartial() {
       com.google.bigtable.admin.v2.CreateTableRequest result = new com.google.bigtable.admin.v2.CreateTableRequest(this);
       int from_bitField0_ = bitField0_;
@@ -1171,39 +1128,32 @@ public com.google.bigtable.admin.v2.CreateTableRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.CreateTableRequest) {
         return mergeFrom((com.google.bigtable.admin.v2.CreateTableRequest)other);
@@ -1257,12 +1207,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.CreateTableRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2168,13 +2116,11 @@ public com.google.bigtable.admin.v2.CreateTableRequest.Split.Builder addInitialS
       }
       return initialSplitsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2196,12 +2142,11 @@ public static com.google.bigtable.admin.v2.CreateTableRequest getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateTableRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateTableRequest(input, extensionRegistry);
+        return new CreateTableRequest(input, extensionRegistry);
     }
   };
 
@@ -2214,7 +2159,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.CreateTableRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteAppProfileRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteAppProfileRequest.java
index 3c17b879067c..72748939bae5 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteAppProfileRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteAppProfileRequest.java
@@ -34,9 +34,6 @@ private DeleteAppProfileRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private DeleteAppProfileRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -59,13 +63,6 @@ private DeleteAppProfileRequest(
             ignoreWarnings_ = input.readBool();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private DeleteAppProfileRequest(
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_DeleteAppProfileRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_DeleteAppProfileRequest_fieldAccessorTable
@@ -149,7 +145,6 @@ public boolean getIgnoreWarnings() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -159,7 +154,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -171,7 +165,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -295,7 +288,6 @@ public static com.google.bigtable.admin.v2.DeleteAppProfileRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -303,7 +295,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.DeleteAppProfileRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -331,7 +322,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_DeleteAppProfileRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_DeleteAppProfileRequest_fieldAccessorTable
@@ -354,7 +344,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -364,18 +353,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_DeleteAppProfileRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.DeleteAppProfileRequest getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.DeleteAppProfileRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.DeleteAppProfileRequest build() {
       com.google.bigtable.admin.v2.DeleteAppProfileRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -384,7 +370,6 @@ public com.google.bigtable.admin.v2.DeleteAppProfileRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.DeleteAppProfileRequest buildPartial() {
       com.google.bigtable.admin.v2.DeleteAppProfileRequest result = new com.google.bigtable.admin.v2.DeleteAppProfileRequest(this);
       result.name_ = name_;
@@ -393,39 +378,32 @@ public com.google.bigtable.admin.v2.DeleteAppProfileRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.DeleteAppProfileRequest) {
         return mergeFrom((com.google.bigtable.admin.v2.DeleteAppProfileRequest)other);
@@ -449,12 +427,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.DeleteAppProfileRequest ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -604,13 +580,11 @@ public Builder clearIgnoreWarnings() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -632,12 +606,11 @@ public static com.google.bigtable.admin.v2.DeleteAppProfileRequest getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteAppProfileRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteAppProfileRequest(input, extensionRegistry);
+        return new DeleteAppProfileRequest(input, extensionRegistry);
     }
   };
 
@@ -650,7 +623,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.DeleteAppProfileRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteClusterRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteClusterRequest.java
index 984856cee569..276bcffb173d 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteClusterRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteClusterRequest.java
@@ -33,9 +33,6 @@ private DeleteClusterRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteClusterRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteClusterRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteClusterRequest(
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_DeleteClusterRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_DeleteClusterRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.bigtable.admin.v2.DeleteClusterRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.DeleteClusterRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_DeleteClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_DeleteClusterRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_DeleteClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.DeleteClusterRequest getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.DeleteClusterRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.DeleteClusterRequest build() {
       com.google.bigtable.admin.v2.DeleteClusterRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.bigtable.admin.v2.DeleteClusterRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.DeleteClusterRequest buildPartial() {
       com.google.bigtable.admin.v2.DeleteClusterRequest result = new com.google.bigtable.admin.v2.DeleteClusterRequest(this);
       result.name_ = name_;
@@ -359,39 +344,32 @@ public com.google.bigtable.admin.v2.DeleteClusterRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.DeleteClusterRequest) {
         return mergeFrom((com.google.bigtable.admin.v2.DeleteClusterRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.DeleteClusterRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.bigtable.admin.v2.DeleteClusterRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteClusterRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteClusterRequest(input, extensionRegistry);
+        return new DeleteClusterRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.DeleteClusterRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteInstanceRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteInstanceRequest.java
index 0dde0eb0d985..164bf2bd681b 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteInstanceRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteInstanceRequest.java
@@ -33,9 +33,6 @@ private DeleteInstanceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteInstanceRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteInstanceRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteInstanceRequest(
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_DeleteInstanceRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_DeleteInstanceRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.bigtable.admin.v2.DeleteInstanceRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.DeleteInstanceRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_DeleteInstanceRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_DeleteInstanceRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_DeleteInstanceRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.DeleteInstanceRequest getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.DeleteInstanceRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.DeleteInstanceRequest build() {
       com.google.bigtable.admin.v2.DeleteInstanceRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.bigtable.admin.v2.DeleteInstanceRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.DeleteInstanceRequest buildPartial() {
       com.google.bigtable.admin.v2.DeleteInstanceRequest result = new com.google.bigtable.admin.v2.DeleteInstanceRequest(this);
       result.name_ = name_;
@@ -359,39 +344,32 @@ public com.google.bigtable.admin.v2.DeleteInstanceRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.DeleteInstanceRequest) {
         return mergeFrom((com.google.bigtable.admin.v2.DeleteInstanceRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.DeleteInstanceRequest othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.bigtable.admin.v2.DeleteInstanceRequest getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteInstanceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteInstanceRequest(input, extensionRegistry);
+        return new DeleteInstanceRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.DeleteInstanceRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteSnapshotRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteSnapshotRequest.java
index ad921430ffb6..39308b7dba1e 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteSnapshotRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteSnapshotRequest.java
@@ -38,9 +38,6 @@ private DeleteSnapshotRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,12 +49,6 @@ private DeleteSnapshotRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -65,6 +56,12 @@ private DeleteSnapshotRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -82,7 +79,6 @@ private DeleteSnapshotRequest(
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_DeleteSnapshotRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_DeleteSnapshotRequest_fieldAccessorTable
@@ -137,7 +133,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -147,7 +142,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -156,7 +150,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -271,7 +264,6 @@ public static com.google.bigtable.admin.v2.DeleteSnapshotRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -279,7 +271,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.DeleteSnapshotRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -312,7 +303,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_DeleteSnapshotRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_DeleteSnapshotRequest_fieldAccessorTable
@@ -335,7 +325,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -343,18 +332,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_DeleteSnapshotRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.DeleteSnapshotRequest getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.DeleteSnapshotRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.DeleteSnapshotRequest build() {
       com.google.bigtable.admin.v2.DeleteSnapshotRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -363,7 +349,6 @@ public com.google.bigtable.admin.v2.DeleteSnapshotRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.DeleteSnapshotRequest buildPartial() {
       com.google.bigtable.admin.v2.DeleteSnapshotRequest result = new com.google.bigtable.admin.v2.DeleteSnapshotRequest(this);
       result.name_ = name_;
@@ -371,39 +356,32 @@ public com.google.bigtable.admin.v2.DeleteSnapshotRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.DeleteSnapshotRequest) {
         return mergeFrom((com.google.bigtable.admin.v2.DeleteSnapshotRequest)other);
@@ -424,12 +402,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.DeleteSnapshotRequest othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -546,13 +522,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -574,12 +548,11 @@ public static com.google.bigtable.admin.v2.DeleteSnapshotRequest getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteSnapshotRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteSnapshotRequest(input, extensionRegistry);
+        return new DeleteSnapshotRequest(input, extensionRegistry);
     }
   };
 
@@ -592,7 +565,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.DeleteSnapshotRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteTableRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteTableRequest.java
index 150bd154e973..42ed806dbc26 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteTableRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteTableRequest.java
@@ -34,9 +34,6 @@ private DeleteTableRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,12 +45,6 @@ private DeleteTableRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -61,6 +52,12 @@ private DeleteTableRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -78,7 +75,6 @@ private DeleteTableRequest(
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_DeleteTableRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_DeleteTableRequest_fieldAccessorTable
@@ -133,7 +129,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -143,7 +138,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -152,7 +146,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -267,7 +260,6 @@ public static com.google.bigtable.admin.v2.DeleteTableRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -275,7 +267,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.DeleteTableRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -304,7 +295,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_DeleteTableRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_DeleteTableRequest_fieldAccessorTable
@@ -327,7 +317,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -335,18 +324,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_DeleteTableRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.DeleteTableRequest getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.DeleteTableRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.DeleteTableRequest build() {
       com.google.bigtable.admin.v2.DeleteTableRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -355,7 +341,6 @@ public com.google.bigtable.admin.v2.DeleteTableRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.DeleteTableRequest buildPartial() {
       com.google.bigtable.admin.v2.DeleteTableRequest result = new com.google.bigtable.admin.v2.DeleteTableRequest(this);
       result.name_ = name_;
@@ -363,39 +348,32 @@ public com.google.bigtable.admin.v2.DeleteTableRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.DeleteTableRequest) {
         return mergeFrom((com.google.bigtable.admin.v2.DeleteTableRequest)other);
@@ -416,12 +394,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.DeleteTableRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -538,13 +514,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -566,12 +540,11 @@ public static com.google.bigtable.admin.v2.DeleteTableRequest getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteTableRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteTableRequest(input, extensionRegistry);
+        return new DeleteTableRequest(input, extensionRegistry);
     }
   };
 
@@ -584,7 +557,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.DeleteTableRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DropRowRangeRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DropRowRangeRequest.java
index 6379ddd19d9b..94fefeba73ee 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DropRowRangeRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DropRowRangeRequest.java
@@ -34,9 +34,6 @@ private DropRowRangeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private DropRowRangeRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -64,13 +68,6 @@ private DropRowRangeRequest(
             target_ = input.readBool();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -88,7 +85,6 @@ private DropRowRangeRequest(
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_DropRowRangeRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_DropRowRangeRequest_fieldAccessorTable
@@ -212,7 +208,6 @@ public boolean getDeleteAllDataFromTable() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -222,7 +217,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -239,7 +233,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -392,7 +385,6 @@ public static com.google.bigtable.admin.v2.DropRowRangeRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -400,7 +392,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.DropRowRangeRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -429,7 +420,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_DropRowRangeRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_DropRowRangeRequest_fieldAccessorTable
@@ -452,7 +442,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -462,18 +451,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_DropRowRangeRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.DropRowRangeRequest getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.DropRowRangeRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.DropRowRangeRequest build() {
       com.google.bigtable.admin.v2.DropRowRangeRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -482,7 +468,6 @@ public com.google.bigtable.admin.v2.DropRowRangeRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.DropRowRangeRequest buildPartial() {
       com.google.bigtable.admin.v2.DropRowRangeRequest result = new com.google.bigtable.admin.v2.DropRowRangeRequest(this);
       result.name_ = name_;
@@ -497,39 +482,32 @@ public com.google.bigtable.admin.v2.DropRowRangeRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.DropRowRangeRequest) {
         return mergeFrom((com.google.bigtable.admin.v2.DropRowRangeRequest)other);
@@ -563,12 +541,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.DropRowRangeRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -790,13 +766,11 @@ public Builder clearDeleteAllDataFromTable() {
       }
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -818,12 +792,11 @@ public static com.google.bigtable.admin.v2.DropRowRangeRequest getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DropRowRangeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DropRowRangeRequest(input, extensionRegistry);
+        return new DropRowRangeRequest(input, extensionRegistry);
     }
   };
 
@@ -836,7 +809,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.DropRowRangeRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GcRule.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GcRule.java
index 046a462d0ffc..90cb7e6b15f7 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GcRule.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GcRule.java
@@ -32,9 +32,6 @@ private GcRule(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private GcRule(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             ruleCase_ = 1;
             rule_ = input.readInt32();
@@ -93,13 +97,6 @@ private GcRule(
             ruleCase_ = 4;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -117,7 +114,6 @@ private GcRule(
     return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_GcRule_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_GcRule_fieldAccessorTable
@@ -203,9 +199,6 @@ private Intersection(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -217,6 +210,13 @@ private Intersection(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
                 rules_ = new java.util.ArrayList();
@@ -226,13 +226,6 @@ private Intersection(
                   input.readMessage(com.google.bigtable.admin.v2.GcRule.parser(), extensionRegistry));
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -253,7 +246,6 @@ private Intersection(
       return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_GcRule_Intersection_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_GcRule_Intersection_fieldAccessorTable
@@ -317,7 +309,6 @@ public com.google.bigtable.admin.v2.GcRuleOrBuilder getRulesOrBuilder(
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -327,7 +318,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < rules_.size(); i++) {
@@ -336,7 +326,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -454,7 +443,6 @@ public static com.google.bigtable.admin.v2.GcRule.Intersection parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -462,7 +450,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.bigtable.admin.v2.GcRule.Intersection prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -490,7 +477,6 @@ public static final class Builder extends
         return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_GcRule_Intersection_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_GcRule_Intersection_fieldAccessorTable
@@ -514,7 +500,6 @@ private void maybeForceBuilderInitialization() {
           getRulesFieldBuilder();
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         if (rulesBuilder_ == null) {
@@ -526,18 +511,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_GcRule_Intersection_descriptor;
       }
 
-      @java.lang.Override
       public com.google.bigtable.admin.v2.GcRule.Intersection getDefaultInstanceForType() {
         return com.google.bigtable.admin.v2.GcRule.Intersection.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.bigtable.admin.v2.GcRule.Intersection build() {
         com.google.bigtable.admin.v2.GcRule.Intersection result = buildPartial();
         if (!result.isInitialized()) {
@@ -546,7 +528,6 @@ public com.google.bigtable.admin.v2.GcRule.Intersection build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.bigtable.admin.v2.GcRule.Intersection buildPartial() {
         com.google.bigtable.admin.v2.GcRule.Intersection result = new com.google.bigtable.admin.v2.GcRule.Intersection(this);
         int from_bitField0_ = bitField0_;
@@ -563,39 +544,32 @@ public com.google.bigtable.admin.v2.GcRule.Intersection buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.bigtable.admin.v2.GcRule.Intersection) {
           return mergeFrom((com.google.bigtable.admin.v2.GcRule.Intersection)other);
@@ -638,12 +612,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.GcRule.Intersection other)
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -974,13 +946,11 @@ public com.google.bigtable.admin.v2.GcRule.Builder addRulesBuilder(
         }
         return rulesBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1002,12 +972,11 @@ public static com.google.bigtable.admin.v2.GcRule.Intersection getDefaultInstanc
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Intersection parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Intersection(input, extensionRegistry);
+          return new Intersection(input, extensionRegistry);
       }
     };
 
@@ -1020,7 +989,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.GcRule.Intersection getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1105,9 +1073,6 @@ private Union(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1119,6 +1084,13 @@ private Union(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
                 rules_ = new java.util.ArrayList();
@@ -1128,13 +1100,6 @@ private Union(
                   input.readMessage(com.google.bigtable.admin.v2.GcRule.parser(), extensionRegistry));
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1155,7 +1120,6 @@ private Union(
       return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_GcRule_Union_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_GcRule_Union_fieldAccessorTable
@@ -1219,7 +1183,6 @@ public com.google.bigtable.admin.v2.GcRuleOrBuilder getRulesOrBuilder(
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1229,7 +1192,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < rules_.size(); i++) {
@@ -1238,7 +1200,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -1356,7 +1317,6 @@ public static com.google.bigtable.admin.v2.GcRule.Union parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -1364,7 +1324,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.bigtable.admin.v2.GcRule.Union prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -1392,7 +1351,6 @@ public static final class Builder extends
         return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_GcRule_Union_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_GcRule_Union_fieldAccessorTable
@@ -1416,7 +1374,6 @@ private void maybeForceBuilderInitialization() {
           getRulesFieldBuilder();
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         if (rulesBuilder_ == null) {
@@ -1428,18 +1385,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_GcRule_Union_descriptor;
       }
 
-      @java.lang.Override
       public com.google.bigtable.admin.v2.GcRule.Union getDefaultInstanceForType() {
         return com.google.bigtable.admin.v2.GcRule.Union.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.bigtable.admin.v2.GcRule.Union build() {
         com.google.bigtable.admin.v2.GcRule.Union result = buildPartial();
         if (!result.isInitialized()) {
@@ -1448,7 +1402,6 @@ public com.google.bigtable.admin.v2.GcRule.Union build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.bigtable.admin.v2.GcRule.Union buildPartial() {
         com.google.bigtable.admin.v2.GcRule.Union result = new com.google.bigtable.admin.v2.GcRule.Union(this);
         int from_bitField0_ = bitField0_;
@@ -1465,39 +1418,32 @@ public com.google.bigtable.admin.v2.GcRule.Union buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.bigtable.admin.v2.GcRule.Union) {
           return mergeFrom((com.google.bigtable.admin.v2.GcRule.Union)other);
@@ -1540,12 +1486,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.GcRule.Union other) {
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1876,13 +1820,11 @@ public com.google.bigtable.admin.v2.GcRule.Builder addRulesBuilder(
         }
         return rulesBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1904,12 +1846,11 @@ public static com.google.bigtable.admin.v2.GcRule.Union getDefaultInstance() {
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Union parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Union(input, extensionRegistry);
+          return new Union(input, extensionRegistry);
       }
     };
 
@@ -1922,7 +1863,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.GcRule.Union getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -2107,7 +2047,6 @@ public com.google.bigtable.admin.v2.GcRule.UnionOrBuilder getUnionOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -2117,7 +2056,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (ruleCase_ == 1) {
@@ -2136,7 +2074,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -2304,7 +2241,6 @@ public static com.google.bigtable.admin.v2.GcRule parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -2312,7 +2248,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.GcRule prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -2340,7 +2275,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_GcRule_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_GcRule_fieldAccessorTable
@@ -2363,7 +2297,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       ruleCase_ = 0;
@@ -2371,18 +2304,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_GcRule_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.GcRule getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.GcRule.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.GcRule build() {
       com.google.bigtable.admin.v2.GcRule result = buildPartial();
       if (!result.isInitialized()) {
@@ -2391,7 +2321,6 @@ public com.google.bigtable.admin.v2.GcRule build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.GcRule buildPartial() {
       com.google.bigtable.admin.v2.GcRule result = new com.google.bigtable.admin.v2.GcRule(this);
       if (ruleCase_ == 1) {
@@ -2423,39 +2352,32 @@ public com.google.bigtable.admin.v2.GcRule buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.GcRule) {
         return mergeFrom((com.google.bigtable.admin.v2.GcRule)other);
@@ -2493,12 +2415,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.GcRule other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3107,13 +3027,11 @@ public com.google.bigtable.admin.v2.GcRule.UnionOrBuilder getUnionOrBuilder() {
       onChanged();;
       return unionBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -3135,12 +3053,11 @@ public static com.google.bigtable.admin.v2.GcRule getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GcRule parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GcRule(input, extensionRegistry);
+        return new GcRule(input, extensionRegistry);
     }
   };
 
@@ -3153,7 +3070,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.GcRule getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenRequest.java
index c4e7857b8dcc..9a3bfb2a9fad 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenRequest.java
@@ -34,9 +34,6 @@ private GenerateConsistencyTokenRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,12 +45,6 @@ private GenerateConsistencyTokenRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -61,6 +52,12 @@ private GenerateConsistencyTokenRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -78,7 +75,6 @@ private GenerateConsistencyTokenRequest(
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_GenerateConsistencyTokenRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_GenerateConsistencyTokenRequest_fieldAccessorTable
@@ -133,7 +129,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -143,7 +138,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -152,7 +146,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -267,7 +260,6 @@ public static com.google.bigtable.admin.v2.GenerateConsistencyTokenRequest parse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -275,7 +267,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.GenerateConsistencyTokenRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -304,7 +295,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_GenerateConsistencyTokenRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_GenerateConsistencyTokenRequest_fieldAccessorTable
@@ -327,7 +317,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -335,18 +324,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_GenerateConsistencyTokenRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.GenerateConsistencyTokenRequest getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.GenerateConsistencyTokenRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.GenerateConsistencyTokenRequest build() {
       com.google.bigtable.admin.v2.GenerateConsistencyTokenRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -355,7 +341,6 @@ public com.google.bigtable.admin.v2.GenerateConsistencyTokenRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.GenerateConsistencyTokenRequest buildPartial() {
       com.google.bigtable.admin.v2.GenerateConsistencyTokenRequest result = new com.google.bigtable.admin.v2.GenerateConsistencyTokenRequest(this);
       result.name_ = name_;
@@ -363,39 +348,32 @@ public com.google.bigtable.admin.v2.GenerateConsistencyTokenRequest buildPartial
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.GenerateConsistencyTokenRequest) {
         return mergeFrom((com.google.bigtable.admin.v2.GenerateConsistencyTokenRequest)other);
@@ -416,12 +394,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.GenerateConsistencyTokenRe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -538,13 +514,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -566,12 +540,11 @@ public static com.google.bigtable.admin.v2.GenerateConsistencyTokenRequest getDe
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GenerateConsistencyTokenRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GenerateConsistencyTokenRequest(input, extensionRegistry);
+        return new GenerateConsistencyTokenRequest(input, extensionRegistry);
     }
   };
 
@@ -584,7 +557,6 @@ public com.google.protobuf.Parser getParserForT
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.GenerateConsistencyTokenRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenResponse.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenResponse.java
index 0399a7acb1fd..ad26cd9cd94e 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenResponse.java
@@ -34,9 +34,6 @@ private GenerateConsistencyTokenResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,12 +45,6 @@ private GenerateConsistencyTokenResponse(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            consistencyToken_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -61,6 +52,12 @@ private GenerateConsistencyTokenResponse(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            consistencyToken_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -78,7 +75,6 @@ private GenerateConsistencyTokenResponse(
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_GenerateConsistencyTokenResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_GenerateConsistencyTokenResponse_fieldAccessorTable
@@ -129,7 +125,6 @@ public java.lang.String getConsistencyToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -139,7 +134,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getConsistencyTokenBytes().isEmpty()) {
@@ -148,7 +142,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -263,7 +256,6 @@ public static com.google.bigtable.admin.v2.GenerateConsistencyTokenResponse pars
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -271,7 +263,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.GenerateConsistencyTokenResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_GenerateConsistencyTokenResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_GenerateConsistencyTokenResponse_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       consistencyToken_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_GenerateConsistencyTokenResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.GenerateConsistencyTokenResponse getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.GenerateConsistencyTokenResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.GenerateConsistencyTokenResponse build() {
       com.google.bigtable.admin.v2.GenerateConsistencyTokenResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.bigtable.admin.v2.GenerateConsistencyTokenResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.GenerateConsistencyTokenResponse buildPartial() {
       com.google.bigtable.admin.v2.GenerateConsistencyTokenResponse result = new com.google.bigtable.admin.v2.GenerateConsistencyTokenResponse(this);
       result.consistencyToken_ = consistencyToken_;
@@ -359,39 +344,32 @@ public com.google.bigtable.admin.v2.GenerateConsistencyTokenResponse buildPartia
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.GenerateConsistencyTokenResponse) {
         return mergeFrom((com.google.bigtable.admin.v2.GenerateConsistencyTokenResponse)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.GenerateConsistencyTokenRe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -524,13 +500,11 @@ public Builder setConsistencyTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -552,12 +526,11 @@ public static com.google.bigtable.admin.v2.GenerateConsistencyTokenResponse getD
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GenerateConsistencyTokenResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GenerateConsistencyTokenResponse(input, extensionRegistry);
+        return new GenerateConsistencyTokenResponse(input, extensionRegistry);
     }
   };
 
@@ -570,7 +543,6 @@ public com.google.protobuf.Parser getParserFor
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.GenerateConsistencyTokenResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetAppProfileRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetAppProfileRequest.java
index fd007bf03bd8..185ea19b4e15 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetAppProfileRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetAppProfileRequest.java
@@ -33,9 +33,6 @@ private GetAppProfileRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetAppProfileRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetAppProfileRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetAppProfileRequest(
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_GetAppProfileRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_GetAppProfileRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.bigtable.admin.v2.GetAppProfileRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.GetAppProfileRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_GetAppProfileRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_GetAppProfileRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_GetAppProfileRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.GetAppProfileRequest getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.GetAppProfileRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.GetAppProfileRequest build() {
       com.google.bigtable.admin.v2.GetAppProfileRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.bigtable.admin.v2.GetAppProfileRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.GetAppProfileRequest buildPartial() {
       com.google.bigtable.admin.v2.GetAppProfileRequest result = new com.google.bigtable.admin.v2.GetAppProfileRequest(this);
       result.name_ = name_;
@@ -359,39 +344,32 @@ public com.google.bigtable.admin.v2.GetAppProfileRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.GetAppProfileRequest) {
         return mergeFrom((com.google.bigtable.admin.v2.GetAppProfileRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.GetAppProfileRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.bigtable.admin.v2.GetAppProfileRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetAppProfileRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetAppProfileRequest(input, extensionRegistry);
+        return new GetAppProfileRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.GetAppProfileRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetClusterRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetClusterRequest.java
index 5ecbcc44fb06..9516f2571b8f 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetClusterRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetClusterRequest.java
@@ -33,9 +33,6 @@ private GetClusterRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetClusterRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetClusterRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetClusterRequest(
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_GetClusterRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_GetClusterRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.bigtable.admin.v2.GetClusterRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.GetClusterRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_GetClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_GetClusterRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_GetClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.GetClusterRequest getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.GetClusterRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.GetClusterRequest build() {
       com.google.bigtable.admin.v2.GetClusterRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.bigtable.admin.v2.GetClusterRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.GetClusterRequest buildPartial() {
       com.google.bigtable.admin.v2.GetClusterRequest result = new com.google.bigtable.admin.v2.GetClusterRequest(this);
       result.name_ = name_;
@@ -359,39 +344,32 @@ public com.google.bigtable.admin.v2.GetClusterRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.GetClusterRequest) {
         return mergeFrom((com.google.bigtable.admin.v2.GetClusterRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.GetClusterRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.bigtable.admin.v2.GetClusterRequest getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetClusterRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetClusterRequest(input, extensionRegistry);
+        return new GetClusterRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.GetClusterRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetInstanceRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetInstanceRequest.java
index 9dc07920bced..e085ec13a2d5 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetInstanceRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetInstanceRequest.java
@@ -33,9 +33,6 @@ private GetInstanceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetInstanceRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetInstanceRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetInstanceRequest(
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_GetInstanceRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_GetInstanceRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.bigtable.admin.v2.GetInstanceRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.GetInstanceRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_GetInstanceRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_GetInstanceRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_GetInstanceRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.GetInstanceRequest getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.GetInstanceRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.GetInstanceRequest build() {
       com.google.bigtable.admin.v2.GetInstanceRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.bigtable.admin.v2.GetInstanceRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.GetInstanceRequest buildPartial() {
       com.google.bigtable.admin.v2.GetInstanceRequest result = new com.google.bigtable.admin.v2.GetInstanceRequest(this);
       result.name_ = name_;
@@ -359,39 +344,32 @@ public com.google.bigtable.admin.v2.GetInstanceRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.GetInstanceRequest) {
         return mergeFrom((com.google.bigtable.admin.v2.GetInstanceRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.GetInstanceRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.bigtable.admin.v2.GetInstanceRequest getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetInstanceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetInstanceRequest(input, extensionRegistry);
+        return new GetInstanceRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.GetInstanceRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetSnapshotRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetSnapshotRequest.java
index 1e3a261d9d0a..919a36acd327 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetSnapshotRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetSnapshotRequest.java
@@ -38,9 +38,6 @@ private GetSnapshotRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,12 +49,6 @@ private GetSnapshotRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -65,6 +56,12 @@ private GetSnapshotRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -82,7 +79,6 @@ private GetSnapshotRequest(
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_GetSnapshotRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_GetSnapshotRequest_fieldAccessorTable
@@ -137,7 +133,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -147,7 +142,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -156,7 +150,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -271,7 +264,6 @@ public static com.google.bigtable.admin.v2.GetSnapshotRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -279,7 +271,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.GetSnapshotRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -312,7 +303,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_GetSnapshotRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_GetSnapshotRequest_fieldAccessorTable
@@ -335,7 +325,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -343,18 +332,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_GetSnapshotRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.GetSnapshotRequest getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.GetSnapshotRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.GetSnapshotRequest build() {
       com.google.bigtable.admin.v2.GetSnapshotRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -363,7 +349,6 @@ public com.google.bigtable.admin.v2.GetSnapshotRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.GetSnapshotRequest buildPartial() {
       com.google.bigtable.admin.v2.GetSnapshotRequest result = new com.google.bigtable.admin.v2.GetSnapshotRequest(this);
       result.name_ = name_;
@@ -371,39 +356,32 @@ public com.google.bigtable.admin.v2.GetSnapshotRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.GetSnapshotRequest) {
         return mergeFrom((com.google.bigtable.admin.v2.GetSnapshotRequest)other);
@@ -424,12 +402,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.GetSnapshotRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -546,13 +522,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -574,12 +548,11 @@ public static com.google.bigtable.admin.v2.GetSnapshotRequest getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetSnapshotRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetSnapshotRequest(input, extensionRegistry);
+        return new GetSnapshotRequest(input, extensionRegistry);
     }
   };
 
@@ -592,7 +565,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.GetSnapshotRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetTableRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetTableRequest.java
index a0925cd8f9d4..8a32878002b0 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetTableRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetTableRequest.java
@@ -35,9 +35,6 @@ private GetTableRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private GetTableRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -61,13 +65,6 @@ private GetTableRequest(
             view_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -85,7 +82,6 @@ private GetTableRequest(
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_GetTableRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_GetTableRequest_fieldAccessorTable
@@ -161,13 +157,11 @@ public int getViewValue() {
    * .google.bigtable.admin.v2.Table.View view = 2;
    */
   public com.google.bigtable.admin.v2.Table.View getView() {
-    @SuppressWarnings("deprecation")
     com.google.bigtable.admin.v2.Table.View result = com.google.bigtable.admin.v2.Table.View.valueOf(view_);
     return result == null ? com.google.bigtable.admin.v2.Table.View.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -177,7 +171,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -189,7 +182,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -311,7 +303,6 @@ public static com.google.bigtable.admin.v2.GetTableRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -319,7 +310,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.GetTableRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -348,7 +338,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_GetTableRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_GetTableRequest_fieldAccessorTable
@@ -371,7 +360,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -381,18 +369,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_GetTableRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.GetTableRequest getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.GetTableRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.GetTableRequest build() {
       com.google.bigtable.admin.v2.GetTableRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -401,7 +386,6 @@ public com.google.bigtable.admin.v2.GetTableRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.GetTableRequest buildPartial() {
       com.google.bigtable.admin.v2.GetTableRequest result = new com.google.bigtable.admin.v2.GetTableRequest(this);
       result.name_ = name_;
@@ -410,39 +394,32 @@ public com.google.bigtable.admin.v2.GetTableRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.GetTableRequest) {
         return mergeFrom((com.google.bigtable.admin.v2.GetTableRequest)other);
@@ -466,12 +443,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.GetTableRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -623,7 +598,6 @@ public Builder setViewValue(int value) {
      * .google.bigtable.admin.v2.Table.View view = 2;
      */
     public com.google.bigtable.admin.v2.Table.View getView() {
-      @SuppressWarnings("deprecation")
       com.google.bigtable.admin.v2.Table.View result = com.google.bigtable.admin.v2.Table.View.valueOf(view_);
       return result == null ? com.google.bigtable.admin.v2.Table.View.UNRECOGNIZED : result;
     }
@@ -658,13 +632,11 @@ public Builder clearView() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -686,12 +658,11 @@ public static com.google.bigtable.admin.v2.GetTableRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetTableRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetTableRequest(input, extensionRegistry);
+        return new GetTableRequest(input, extensionRegistry);
     }
   };
 
@@ -704,7 +675,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.GetTableRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Instance.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Instance.java
index 64f63b2051ac..14eb893d5496 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Instance.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Instance.java
@@ -39,9 +39,6 @@ private Instance(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private Instance(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -90,13 +94,6 @@ private Instance(
                 labels__.getKey(), labels__.getValue());
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -115,7 +112,6 @@ private Instance(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -126,7 +122,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.InstanceProto.internal_static_google_bigtable_admin_v2_Instance_fieldAccessorTable
@@ -541,7 +536,6 @@ public int getStateValue() {
    * .google.bigtable.admin.v2.Instance.State state = 3;
    */
   public com.google.bigtable.admin.v2.Instance.State getState() {
-    @SuppressWarnings("deprecation")
     com.google.bigtable.admin.v2.Instance.State result = com.google.bigtable.admin.v2.Instance.State.valueOf(state_);
     return result == null ? com.google.bigtable.admin.v2.Instance.State.UNRECOGNIZED : result;
   }
@@ -566,7 +560,6 @@ public int getTypeValue() {
    * .google.bigtable.admin.v2.Instance.Type type = 4;
    */
   public com.google.bigtable.admin.v2.Instance.Type getType() {
-    @SuppressWarnings("deprecation")
     com.google.bigtable.admin.v2.Instance.Type result = com.google.bigtable.admin.v2.Instance.Type.valueOf(type_);
     return result == null ? com.google.bigtable.admin.v2.Instance.Type.UNRECOGNIZED : result;
   }
@@ -700,7 +693,6 @@ public java.lang.String getLabelsOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -710,7 +702,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -734,7 +725,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -886,7 +876,6 @@ public static com.google.bigtable.admin.v2.Instance parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -894,7 +883,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.Instance prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -947,7 +935,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.InstanceProto.internal_static_google_bigtable_admin_v2_Instance_fieldAccessorTable
@@ -970,7 +957,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -985,18 +971,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.InstanceProto.internal_static_google_bigtable_admin_v2_Instance_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.Instance getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.Instance.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.Instance build() {
       com.google.bigtable.admin.v2.Instance result = buildPartial();
       if (!result.isInitialized()) {
@@ -1005,7 +988,6 @@ public com.google.bigtable.admin.v2.Instance build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.Instance buildPartial() {
       com.google.bigtable.admin.v2.Instance result = new com.google.bigtable.admin.v2.Instance(this);
       int from_bitField0_ = bitField0_;
@@ -1021,39 +1003,32 @@ public com.google.bigtable.admin.v2.Instance buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.Instance) {
         return mergeFrom((com.google.bigtable.admin.v2.Instance)other);
@@ -1086,12 +1061,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.Instance other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1343,7 +1316,6 @@ public Builder setStateValue(int value) {
      * .google.bigtable.admin.v2.Instance.State state = 3;
      */
     public com.google.bigtable.admin.v2.Instance.State getState() {
-      @SuppressWarnings("deprecation")
       com.google.bigtable.admin.v2.Instance.State result = com.google.bigtable.admin.v2.Instance.State.valueOf(state_);
       return result == null ? com.google.bigtable.admin.v2.Instance.State.UNRECOGNIZED : result;
     }
@@ -1410,7 +1382,6 @@ public Builder setTypeValue(int value) {
      * .google.bigtable.admin.v2.Instance.Type type = 4;
      */
     public com.google.bigtable.admin.v2.Instance.Type getType() {
-      @SuppressWarnings("deprecation")
       com.google.bigtable.admin.v2.Instance.Type result = com.google.bigtable.admin.v2.Instance.Type.valueOf(type_);
       return result == null ? com.google.bigtable.admin.v2.Instance.Type.UNRECOGNIZED : result;
     }
@@ -1657,13 +1628,11 @@ public Builder putAllLabels(
           .putAll(values);
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1685,12 +1654,11 @@ public static com.google.bigtable.admin.v2.Instance getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Instance parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Instance(input, extensionRegistry);
+        return new Instance(input, extensionRegistry);
     }
   };
 
@@ -1703,7 +1671,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.Instance getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/InstanceProto.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/InstanceProto.java
index 954081e8b9e1..25f0f939c92f 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/InstanceProto.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/InstanceProto.java
@@ -62,7 +62,7 @@ public static void registerAllExtensions(
       "te\0225\n\004type\030\004 \001(\0162\'.google.bigtable.admin" +
       ".v2.Instance.Type\022>\n\006labels\030\005 \003(\0132..goog" +
       "le.bigtable.admin.v2.Instance.LabelsEntr" +
-      "y\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002" +
+      "y\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002",
       " \001(\t:\0028\001\"5\n\005State\022\023\n\017STATE_NOT_KNOWN\020\000\022\t" +
       "\n\005READY\020\001\022\014\n\010CREATING\020\002\"=\n\004Type\022\024\n\020TYPE_" +
       "UNSPECIFIED\020\000\022\016\n\nPRODUCTION\020\001\022\017\n\013DEVELOP" +
@@ -72,7 +72,7 @@ public static void registerAllExtensions(
       "s\030\004 \001(\005\022C\n\024default_storage_type\030\005 \001(\0162%." +
       "google.bigtable.admin.v2.StorageType\"Q\n\005" +
       "State\022\023\n\017STATE_NOT_KNOWN\020\000\022\t\n\005READY\020\001\022\014\n" +
-      "\010CREATING\020\002\022\014\n\010RESIZING\020\003\022\014\n\010DISABLED\020\004\"" +
+      "\010CREATING\020\002\022\014\n\010RESIZING\020\003\022\014\n\010DISABLED\020\004\"",
       "\202\003\n\nAppProfile\022\014\n\004name\030\001 \001(\t\022\014\n\004etag\030\002 \001" +
       "(\t\022\023\n\013description\030\003 \001(\t\022g\n\035multi_cluster" +
       "_routing_use_any\030\005 \001(\0132>.google.bigtable" +
@@ -82,7 +82,7 @@ public static void registerAllExtensions(
       "ingleClusterRoutingH\000\032\033\n\031MultiClusterRou" +
       "tingUseAny\032N\n\024SingleClusterRouting\022\022\n\ncl" +
       "uster_id\030\001 \001(\t\022\"\n\032allow_transactional_wr" +
-      "ites\030\002 \001(\010B\020\n\016routing_policyB\260\001\n\034com.goo" +
+      "ites\030\002 \001(\010B\020\n\016routing_policyB\260\001\n\034com.goo",
       "gle.bigtable.admin.v2B\rInstanceProtoP\001Z=" +
       "google.golang.org/genproto/googleapis/bi" +
       "gtable/admin/v2;admin\252\002\036Google.Cloud.Big" +
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesRequest.java
index 851f72b64a7c..75a1332dffc2 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesRequest.java
@@ -34,9 +34,6 @@ private ListAppProfilesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListAppProfilesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private ListAppProfilesRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private ListAppProfilesRequest(
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_ListAppProfilesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_ListAppProfilesRequest_fieldAccessorTable
@@ -181,7 +177,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -191,7 +186,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -203,7 +197,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -325,7 +318,6 @@ public static com.google.bigtable.admin.v2.ListAppProfilesRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -333,7 +325,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.ListAppProfilesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -361,7 +352,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_ListAppProfilesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_ListAppProfilesRequest_fieldAccessorTable
@@ -384,7 +374,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -394,18 +383,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_ListAppProfilesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ListAppProfilesRequest getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.ListAppProfilesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ListAppProfilesRequest build() {
       com.google.bigtable.admin.v2.ListAppProfilesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -414,7 +400,6 @@ public com.google.bigtable.admin.v2.ListAppProfilesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ListAppProfilesRequest buildPartial() {
       com.google.bigtable.admin.v2.ListAppProfilesRequest result = new com.google.bigtable.admin.v2.ListAppProfilesRequest(this);
       result.parent_ = parent_;
@@ -423,39 +408,32 @@ public com.google.bigtable.admin.v2.ListAppProfilesRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.ListAppProfilesRequest) {
         return mergeFrom((com.google.bigtable.admin.v2.ListAppProfilesRequest)other);
@@ -480,12 +458,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ListAppProfilesRequest oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -691,13 +667,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -719,12 +693,11 @@ public static com.google.bigtable.admin.v2.ListAppProfilesRequest getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListAppProfilesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListAppProfilesRequest(input, extensionRegistry);
+        return new ListAppProfilesRequest(input, extensionRegistry);
     }
   };
 
@@ -737,7 +710,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.ListAppProfilesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesResponse.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesResponse.java
index f321dfd533fe..2e4ec7ebe0aa 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesResponse.java
@@ -34,9 +34,6 @@ private ListAppProfilesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListAppProfilesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               appProfiles_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListAppProfilesResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListAppProfilesResponse(
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_ListAppProfilesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_ListAppProfilesResponse_fieldAccessorTable
@@ -201,7 +197,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -211,7 +206,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < appProfiles_.size(); i++) {
@@ -223,7 +217,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.bigtable.admin.v2.ListAppProfilesResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.ListAppProfilesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_ListAppProfilesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_ListAppProfilesResponse_fieldAccessorTable
@@ -408,7 +398,6 @@ private void maybeForceBuilderInitialization() {
         getAppProfilesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (appProfilesBuilder_ == null) {
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_ListAppProfilesResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ListAppProfilesResponse getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.ListAppProfilesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ListAppProfilesResponse build() {
       com.google.bigtable.admin.v2.ListAppProfilesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public com.google.bigtable.admin.v2.ListAppProfilesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ListAppProfilesResponse buildPartial() {
       com.google.bigtable.admin.v2.ListAppProfilesResponse result = new com.google.bigtable.admin.v2.ListAppProfilesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -462,39 +447,32 @@ public com.google.bigtable.admin.v2.ListAppProfilesResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.ListAppProfilesResponse) {
         return mergeFrom((com.google.bigtable.admin.v2.ListAppProfilesResponse)other);
@@ -541,12 +519,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ListAppProfilesResponse ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -976,13 +952,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1004,12 +978,11 @@ public static com.google.bigtable.admin.v2.ListAppProfilesResponse getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListAppProfilesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListAppProfilesResponse(input, extensionRegistry);
+        return new ListAppProfilesResponse(input, extensionRegistry);
     }
   };
 
@@ -1022,7 +995,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.ListAppProfilesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersRequest.java
index cfaab249c135..4daf9bb5a515 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersRequest.java
@@ -34,9 +34,6 @@ private ListClustersRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListClustersRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private ListClustersRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private ListClustersRequest(
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_ListClustersRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_ListClustersRequest_fieldAccessorTable
@@ -183,7 +179,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -193,7 +188,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -205,7 +199,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -327,7 +320,6 @@ public static com.google.bigtable.admin.v2.ListClustersRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -335,7 +327,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.ListClustersRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -363,7 +354,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_ListClustersRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_ListClustersRequest_fieldAccessorTable
@@ -386,7 +376,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -396,18 +385,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_ListClustersRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ListClustersRequest getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.ListClustersRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ListClustersRequest build() {
       com.google.bigtable.admin.v2.ListClustersRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -416,7 +402,6 @@ public com.google.bigtable.admin.v2.ListClustersRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ListClustersRequest buildPartial() {
       com.google.bigtable.admin.v2.ListClustersRequest result = new com.google.bigtable.admin.v2.ListClustersRequest(this);
       result.parent_ = parent_;
@@ -425,39 +410,32 @@ public com.google.bigtable.admin.v2.ListClustersRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.ListClustersRequest) {
         return mergeFrom((com.google.bigtable.admin.v2.ListClustersRequest)other);
@@ -482,12 +460,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ListClustersRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -698,13 +674,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -726,12 +700,11 @@ public static com.google.bigtable.admin.v2.ListClustersRequest getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListClustersRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListClustersRequest(input, extensionRegistry);
+        return new ListClustersRequest(input, extensionRegistry);
     }
   };
 
@@ -744,7 +717,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.ListClustersRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersResponse.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersResponse.java
index 2521ddaded8d..7ab0e0252999 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersResponse.java
@@ -35,9 +35,6 @@ private ListClustersResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListClustersResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               clusters_ = new java.util.ArrayList();
@@ -73,13 +77,6 @@ private ListClustersResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private ListClustersResponse(
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_ListClustersResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_ListClustersResponse_fieldAccessorTable
@@ -271,7 +267,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -281,7 +276,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < clusters_.size(); i++) {
@@ -296,7 +290,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -435,7 +428,6 @@ public static com.google.bigtable.admin.v2.ListClustersResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -443,7 +435,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.ListClustersResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -471,7 +462,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_ListClustersResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_ListClustersResponse_fieldAccessorTable
@@ -495,7 +485,6 @@ private void maybeForceBuilderInitialization() {
         getClustersFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (clustersBuilder_ == null) {
@@ -511,18 +500,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_ListClustersResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ListClustersResponse getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.ListClustersResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ListClustersResponse build() {
       com.google.bigtable.admin.v2.ListClustersResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -531,7 +517,6 @@ public com.google.bigtable.admin.v2.ListClustersResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ListClustersResponse buildPartial() {
       com.google.bigtable.admin.v2.ListClustersResponse result = new com.google.bigtable.admin.v2.ListClustersResponse(this);
       int from_bitField0_ = bitField0_;
@@ -556,39 +541,32 @@ public com.google.bigtable.admin.v2.ListClustersResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.ListClustersResponse) {
         return mergeFrom((com.google.bigtable.admin.v2.ListClustersResponse)other);
@@ -645,12 +623,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ListClustersResponse other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1237,13 +1213,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1265,12 +1239,11 @@ public static com.google.bigtable.admin.v2.ListClustersResponse getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListClustersResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListClustersResponse(input, extensionRegistry);
+        return new ListClustersResponse(input, extensionRegistry);
     }
   };
 
@@ -1283,7 +1256,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.ListClustersResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListInstancesRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListInstancesRequest.java
index 075910a0b59a..67b1e19ad4bf 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListInstancesRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListInstancesRequest.java
@@ -34,9 +34,6 @@ private ListInstancesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListInstancesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private ListInstancesRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private ListInstancesRequest(
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_ListInstancesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_ListInstancesRequest_fieldAccessorTable
@@ -179,7 +175,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -189,7 +184,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -201,7 +195,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -323,7 +316,6 @@ public static com.google.bigtable.admin.v2.ListInstancesRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -331,7 +323,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.ListInstancesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -359,7 +350,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_ListInstancesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_ListInstancesRequest_fieldAccessorTable
@@ -382,7 +372,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -392,18 +381,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_ListInstancesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ListInstancesRequest getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.ListInstancesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ListInstancesRequest build() {
       com.google.bigtable.admin.v2.ListInstancesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -412,7 +398,6 @@ public com.google.bigtable.admin.v2.ListInstancesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ListInstancesRequest buildPartial() {
       com.google.bigtable.admin.v2.ListInstancesRequest result = new com.google.bigtable.admin.v2.ListInstancesRequest(this);
       result.parent_ = parent_;
@@ -421,39 +406,32 @@ public com.google.bigtable.admin.v2.ListInstancesRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.ListInstancesRequest) {
         return mergeFrom((com.google.bigtable.admin.v2.ListInstancesRequest)other);
@@ -478,12 +456,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ListInstancesRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -684,13 +660,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -712,12 +686,11 @@ public static com.google.bigtable.admin.v2.ListInstancesRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListInstancesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListInstancesRequest(input, extensionRegistry);
+        return new ListInstancesRequest(input, extensionRegistry);
     }
   };
 
@@ -730,7 +703,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.ListInstancesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListInstancesResponse.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListInstancesResponse.java
index 96675697372f..b4836668ad8f 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListInstancesResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListInstancesResponse.java
@@ -35,9 +35,6 @@ private ListInstancesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListInstancesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               instances_ = new java.util.ArrayList();
@@ -73,13 +77,6 @@ private ListInstancesResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private ListInstancesResponse(
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_ListInstancesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_ListInstancesResponse_fieldAccessorTable
@@ -275,7 +271,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -285,7 +280,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < instances_.size(); i++) {
@@ -300,7 +294,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -439,7 +432,6 @@ public static com.google.bigtable.admin.v2.ListInstancesResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -447,7 +439,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.ListInstancesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -475,7 +466,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_ListInstancesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_ListInstancesResponse_fieldAccessorTable
@@ -499,7 +489,6 @@ private void maybeForceBuilderInitialization() {
         getInstancesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (instancesBuilder_ == null) {
@@ -515,18 +504,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_ListInstancesResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ListInstancesResponse getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.ListInstancesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ListInstancesResponse build() {
       com.google.bigtable.admin.v2.ListInstancesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -535,7 +521,6 @@ public com.google.bigtable.admin.v2.ListInstancesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ListInstancesResponse buildPartial() {
       com.google.bigtable.admin.v2.ListInstancesResponse result = new com.google.bigtable.admin.v2.ListInstancesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -560,39 +545,32 @@ public com.google.bigtable.admin.v2.ListInstancesResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.ListInstancesResponse) {
         return mergeFrom((com.google.bigtable.admin.v2.ListInstancesResponse)other);
@@ -649,12 +627,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ListInstancesResponse othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1250,13 +1226,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1278,12 +1252,11 @@ public static com.google.bigtable.admin.v2.ListInstancesResponse getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListInstancesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListInstancesResponse(input, extensionRegistry);
+        return new ListInstancesResponse(input, extensionRegistry);
     }
   };
 
@@ -1296,7 +1269,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.ListInstancesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsRequest.java
index c1d129646f00..01e2d7f851fe 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsRequest.java
@@ -40,9 +40,6 @@ private ListSnapshotsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -54,6 +51,13 @@ private ListSnapshotsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -71,13 +75,6 @@ private ListSnapshotsRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -95,7 +92,6 @@ private ListSnapshotsRequest(
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_ListSnapshotsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_ListSnapshotsRequest_fieldAccessorTable
@@ -209,7 +205,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -219,7 +214,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -234,7 +228,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -364,7 +357,6 @@ public static com.google.bigtable.admin.v2.ListSnapshotsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -372,7 +364,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.ListSnapshotsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -405,7 +396,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_ListSnapshotsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_ListSnapshotsRequest_fieldAccessorTable
@@ -428,7 +418,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -440,18 +429,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_ListSnapshotsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ListSnapshotsRequest getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.ListSnapshotsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ListSnapshotsRequest build() {
       com.google.bigtable.admin.v2.ListSnapshotsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -460,7 +446,6 @@ public com.google.bigtable.admin.v2.ListSnapshotsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ListSnapshotsRequest buildPartial() {
       com.google.bigtable.admin.v2.ListSnapshotsRequest result = new com.google.bigtable.admin.v2.ListSnapshotsRequest(this);
       result.parent_ = parent_;
@@ -470,39 +455,32 @@ public com.google.bigtable.admin.v2.ListSnapshotsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.ListSnapshotsRequest) {
         return mergeFrom((com.google.bigtable.admin.v2.ListSnapshotsRequest)other);
@@ -530,12 +508,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ListSnapshotsRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -789,13 +765,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -817,12 +791,11 @@ public static com.google.bigtable.admin.v2.ListSnapshotsRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListSnapshotsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListSnapshotsRequest(input, extensionRegistry);
+        return new ListSnapshotsRequest(input, extensionRegistry);
     }
   };
 
@@ -835,7 +808,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.ListSnapshotsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsResponse.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsResponse.java
index 2f877048322c..189ca38b3027 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsResponse.java
@@ -39,9 +39,6 @@ private ListSnapshotsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private ListSnapshotsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               snapshots_ = new java.util.ArrayList();
@@ -68,13 +72,6 @@ private ListSnapshotsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -95,7 +92,6 @@ private ListSnapshotsResponse(
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_ListSnapshotsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_ListSnapshotsResponse_fieldAccessorTable
@@ -206,7 +202,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -216,7 +211,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < snapshots_.size(); i++) {
@@ -228,7 +222,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -353,7 +346,6 @@ public static com.google.bigtable.admin.v2.ListSnapshotsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -361,7 +353,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.ListSnapshotsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -394,7 +385,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_ListSnapshotsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_ListSnapshotsResponse_fieldAccessorTable
@@ -418,7 +408,6 @@ private void maybeForceBuilderInitialization() {
         getSnapshotsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (snapshotsBuilder_ == null) {
@@ -432,18 +421,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_ListSnapshotsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ListSnapshotsResponse getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.ListSnapshotsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ListSnapshotsResponse build() {
       com.google.bigtable.admin.v2.ListSnapshotsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -452,7 +438,6 @@ public com.google.bigtable.admin.v2.ListSnapshotsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ListSnapshotsResponse buildPartial() {
       com.google.bigtable.admin.v2.ListSnapshotsResponse result = new com.google.bigtable.admin.v2.ListSnapshotsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -472,39 +457,32 @@ public com.google.bigtable.admin.v2.ListSnapshotsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.ListSnapshotsResponse) {
         return mergeFrom((com.google.bigtable.admin.v2.ListSnapshotsResponse)other);
@@ -551,12 +529,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ListSnapshotsResponse othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -986,13 +962,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1014,12 +988,11 @@ public static com.google.bigtable.admin.v2.ListSnapshotsResponse getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListSnapshotsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListSnapshotsResponse(input, extensionRegistry);
+        return new ListSnapshotsResponse(input, extensionRegistry);
     }
   };
 
@@ -1032,7 +1005,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.ListSnapshotsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesRequest.java
index d65cce0fcbf3..9249a2f7706d 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesRequest.java
@@ -36,9 +36,6 @@ private ListTablesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private ListTablesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -68,13 +72,6 @@ private ListTablesRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -92,7 +89,6 @@ private ListTablesRequest(
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_ListTablesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_ListTablesRequest_fieldAccessorTable
@@ -166,7 +162,6 @@ public int getViewValue() {
    * .google.bigtable.admin.v2.Table.View view = 2;
    */
   public com.google.bigtable.admin.v2.Table.View getView() {
-    @SuppressWarnings("deprecation")
     com.google.bigtable.admin.v2.Table.View result = com.google.bigtable.admin.v2.Table.View.valueOf(view_);
     return result == null ? com.google.bigtable.admin.v2.Table.View.UNRECOGNIZED : result;
   }
@@ -214,7 +209,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -224,7 +218,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -239,7 +232,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -368,7 +360,6 @@ public static com.google.bigtable.admin.v2.ListTablesRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -376,7 +367,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.ListTablesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -405,7 +395,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_ListTablesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_ListTablesRequest_fieldAccessorTable
@@ -428,7 +417,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -440,18 +428,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_ListTablesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ListTablesRequest getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.ListTablesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ListTablesRequest build() {
       com.google.bigtable.admin.v2.ListTablesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -460,7 +445,6 @@ public com.google.bigtable.admin.v2.ListTablesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ListTablesRequest buildPartial() {
       com.google.bigtable.admin.v2.ListTablesRequest result = new com.google.bigtable.admin.v2.ListTablesRequest(this);
       result.parent_ = parent_;
@@ -470,39 +454,32 @@ public com.google.bigtable.admin.v2.ListTablesRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.ListTablesRequest) {
         return mergeFrom((com.google.bigtable.admin.v2.ListTablesRequest)other);
@@ -530,12 +507,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ListTablesRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -682,7 +657,6 @@ public Builder setViewValue(int value) {
      * .google.bigtable.admin.v2.Table.View view = 2;
      */
     public com.google.bigtable.admin.v2.Table.View getView() {
-      @SuppressWarnings("deprecation")
       com.google.bigtable.admin.v2.Table.View result = com.google.bigtable.admin.v2.Table.View.valueOf(view_);
       return result == null ? com.google.bigtable.admin.v2.Table.View.UNRECOGNIZED : result;
     }
@@ -806,13 +780,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -834,12 +806,11 @@ public static com.google.bigtable.admin.v2.ListTablesRequest getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListTablesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTablesRequest(input, extensionRegistry);
+        return new ListTablesRequest(input, extensionRegistry);
     }
   };
 
@@ -852,7 +823,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.ListTablesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesResponse.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesResponse.java
index 8662fa5df6b9..b8a50f17a593 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesResponse.java
@@ -35,9 +35,6 @@ private ListTablesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListTablesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               tables_ = new java.util.ArrayList();
@@ -64,13 +68,6 @@ private ListTablesResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private ListTablesResponse(
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_ListTablesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_ListTablesResponse_fieldAccessorTable
@@ -202,7 +198,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -212,7 +207,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < tables_.size(); i++) {
@@ -224,7 +218,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -349,7 +342,6 @@ public static com.google.bigtable.admin.v2.ListTablesResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -357,7 +349,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.ListTablesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -386,7 +377,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_ListTablesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_ListTablesResponse_fieldAccessorTable
@@ -410,7 +400,6 @@ private void maybeForceBuilderInitialization() {
         getTablesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (tablesBuilder_ == null) {
@@ -424,18 +413,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_ListTablesResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ListTablesResponse getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.ListTablesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ListTablesResponse build() {
       com.google.bigtable.admin.v2.ListTablesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -444,7 +430,6 @@ public com.google.bigtable.admin.v2.ListTablesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ListTablesResponse buildPartial() {
       com.google.bigtable.admin.v2.ListTablesResponse result = new com.google.bigtable.admin.v2.ListTablesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -464,39 +449,32 @@ public com.google.bigtable.admin.v2.ListTablesResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.ListTablesResponse) {
         return mergeFrom((com.google.bigtable.admin.v2.ListTablesResponse)other);
@@ -543,12 +521,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ListTablesResponse other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -978,13 +954,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1006,12 +980,11 @@ public static com.google.bigtable.admin.v2.ListTablesResponse getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListTablesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTablesResponse(input, extensionRegistry);
+        return new ListTablesResponse(input, extensionRegistry);
     }
   };
 
@@ -1024,7 +997,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.ListTablesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ModifyColumnFamiliesRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ModifyColumnFamiliesRequest.java
index cc6f33bbcdbe..d75be49efcf3 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ModifyColumnFamiliesRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ModifyColumnFamiliesRequest.java
@@ -35,9 +35,6 @@ private ModifyColumnFamiliesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ModifyColumnFamiliesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -64,13 +68,6 @@ private ModifyColumnFamiliesRequest(
                 input.readMessage(com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private ModifyColumnFamiliesRequest(
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_ModifyColumnFamiliesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_ModifyColumnFamiliesRequest_fieldAccessorTable
@@ -219,9 +215,6 @@ private Modification(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -233,6 +226,13 @@ private Modification(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -272,13 +272,6 @@ private Modification(
               mod_ = input.readBool();
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -296,7 +289,6 @@ private Modification(
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_ModifyColumnFamiliesRequest_Modification_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_ModifyColumnFamiliesRequest_Modification_fieldAccessorTable
@@ -485,7 +477,6 @@ public boolean getDrop() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -495,7 +486,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getIdBytes().isEmpty()) {
@@ -514,7 +504,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -678,7 +667,6 @@ public static com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modificat
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -686,7 +674,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -714,7 +701,6 @@ public static final class Builder extends
         return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_ModifyColumnFamiliesRequest_Modification_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_ModifyColumnFamiliesRequest_Modification_fieldAccessorTable
@@ -737,7 +723,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         id_ = "";
@@ -747,18 +732,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_ModifyColumnFamiliesRequest_Modification_descriptor;
       }
 
-      @java.lang.Override
       public com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification getDefaultInstanceForType() {
         return com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification build() {
         com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification result = buildPartial();
         if (!result.isInitialized()) {
@@ -767,7 +749,6 @@ public com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification bui
         return result;
       }
 
-      @java.lang.Override
       public com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification buildPartial() {
         com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification result = new com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification(this);
         result.id_ = id_;
@@ -793,39 +774,32 @@ public com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification bui
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification) {
           return mergeFrom((com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification)other);
@@ -863,12 +837,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ModifyColumnFamiliesReques
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1397,13 +1369,11 @@ public Builder clearDrop() {
         }
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1425,12 +1395,11 @@ public static com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modificat
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Modification parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Modification(input, extensionRegistry);
+          return new Modification(input, extensionRegistry);
       }
     };
 
@@ -1443,7 +1412,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1568,7 +1536,6 @@ public com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.ModificationOrBu
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1578,7 +1545,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -1590,7 +1556,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1715,7 +1680,6 @@ public static com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest parseFrom
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1723,7 +1687,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1752,7 +1715,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_ModifyColumnFamiliesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_ModifyColumnFamiliesRequest_fieldAccessorTable
@@ -1776,7 +1738,6 @@ private void maybeForceBuilderInitialization() {
         getModificationsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -1790,18 +1751,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_ModifyColumnFamiliesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest build() {
       com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -1810,7 +1768,6 @@ public com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest buildPartial() {
       com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest result = new com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest(this);
       int from_bitField0_ = bitField0_;
@@ -1830,39 +1787,32 @@ public com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest) {
         return mergeFrom((com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest)other);
@@ -1909,12 +1859,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.ModifyColumnFamiliesReques
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2398,13 +2346,11 @@ public com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification.Bui
       }
       return modificationsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2426,12 +2372,11 @@ public static com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest getDefaul
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ModifyColumnFamiliesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ModifyColumnFamiliesRequest(input, extensionRegistry);
+        return new ModifyColumnFamiliesRequest(input, extensionRegistry);
     }
   };
 
@@ -2444,7 +2389,6 @@ public com.google.protobuf.Parser getParserForType(
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/PartialUpdateInstanceRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/PartialUpdateInstanceRequest.java
index 0ca88aa6dce6..a97efd9b2a59 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/PartialUpdateInstanceRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/PartialUpdateInstanceRequest.java
@@ -32,9 +32,6 @@ private PartialUpdateInstanceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private PartialUpdateInstanceRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.bigtable.admin.v2.Instance.Builder subBuilder = null;
             if (instance_ != null) {
@@ -72,13 +76,6 @@ private PartialUpdateInstanceRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private PartialUpdateInstanceRequest(
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_PartialUpdateInstanceRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_PartialUpdateInstanceRequest_fieldAccessorTable
@@ -174,7 +170,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -184,7 +179,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (instance_ != null) {
@@ -196,7 +190,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -330,7 +323,6 @@ public static com.google.bigtable.admin.v2.PartialUpdateInstanceRequest parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -338,7 +330,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.PartialUpdateInstanceRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -366,7 +357,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_PartialUpdateInstanceRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_PartialUpdateInstanceRequest_fieldAccessorTable
@@ -389,7 +379,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (instanceBuilder_ == null) {
@@ -407,18 +396,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_PartialUpdateInstanceRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.PartialUpdateInstanceRequest getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.PartialUpdateInstanceRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.PartialUpdateInstanceRequest build() {
       com.google.bigtable.admin.v2.PartialUpdateInstanceRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -427,7 +413,6 @@ public com.google.bigtable.admin.v2.PartialUpdateInstanceRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.PartialUpdateInstanceRequest buildPartial() {
       com.google.bigtable.admin.v2.PartialUpdateInstanceRequest result = new com.google.bigtable.admin.v2.PartialUpdateInstanceRequest(this);
       if (instanceBuilder_ == null) {
@@ -444,39 +429,32 @@ public com.google.bigtable.admin.v2.PartialUpdateInstanceRequest buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.PartialUpdateInstanceRequest) {
         return mergeFrom((com.google.bigtable.admin.v2.PartialUpdateInstanceRequest)other);
@@ -499,12 +477,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.PartialUpdateInstanceReque
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -837,13 +813,11 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
       }
       return updateMaskBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -865,12 +839,11 @@ public static com.google.bigtable.admin.v2.PartialUpdateInstanceRequest getDefau
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PartialUpdateInstanceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PartialUpdateInstanceRequest(input, extensionRegistry);
+        return new PartialUpdateInstanceRequest(input, extensionRegistry);
     }
   };
 
@@ -883,7 +856,6 @@ public com.google.protobuf.Parser getParserForType
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.PartialUpdateInstanceRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Snapshot.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Snapshot.java
index e5b2758fbca7..2c137c1ff6f7 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Snapshot.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Snapshot.java
@@ -41,9 +41,6 @@ private Snapshot(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -55,6 +52,13 @@ private Snapshot(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -117,13 +121,6 @@ private Snapshot(
             description_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -141,7 +138,6 @@ private Snapshot(
     return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_Snapshot_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_Snapshot_fieldAccessorTable
@@ -488,7 +484,6 @@ public int getStateValue() {
    * .google.bigtable.admin.v2.Snapshot.State state = 6;
    */
   public com.google.bigtable.admin.v2.Snapshot.State getState() {
-    @SuppressWarnings("deprecation")
     com.google.bigtable.admin.v2.Snapshot.State result = com.google.bigtable.admin.v2.Snapshot.State.valueOf(state_);
     return result == null ? com.google.bigtable.admin.v2.Snapshot.State.UNRECOGNIZED : result;
   }
@@ -538,7 +533,6 @@ public java.lang.String getDescription() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -548,7 +542,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -575,7 +568,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -752,7 +744,6 @@ public static com.google.bigtable.admin.v2.Snapshot parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -760,7 +751,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.Snapshot prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -793,7 +783,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_Snapshot_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_Snapshot_fieldAccessorTable
@@ -816,7 +805,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -848,18 +836,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_Snapshot_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.Snapshot getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.Snapshot.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.Snapshot build() {
       com.google.bigtable.admin.v2.Snapshot result = buildPartial();
       if (!result.isInitialized()) {
@@ -868,7 +853,6 @@ public com.google.bigtable.admin.v2.Snapshot build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.Snapshot buildPartial() {
       com.google.bigtable.admin.v2.Snapshot result = new com.google.bigtable.admin.v2.Snapshot(this);
       result.name_ = name_;
@@ -894,39 +878,32 @@ public com.google.bigtable.admin.v2.Snapshot buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.Snapshot) {
         return mergeFrom((com.google.bigtable.admin.v2.Snapshot)other);
@@ -966,12 +943,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.Snapshot other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1679,7 +1654,6 @@ public Builder setStateValue(int value) {
      * .google.bigtable.admin.v2.Snapshot.State state = 6;
      */
     public com.google.bigtable.admin.v2.Snapshot.State getState() {
-      @SuppressWarnings("deprecation")
       com.google.bigtable.admin.v2.Snapshot.State result = com.google.bigtable.admin.v2.Snapshot.State.valueOf(state_);
       return result == null ? com.google.bigtable.admin.v2.Snapshot.State.UNRECOGNIZED : result;
     }
@@ -1808,13 +1782,11 @@ public Builder setDescriptionBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1836,12 +1808,11 @@ public static com.google.bigtable.admin.v2.Snapshot getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Snapshot parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Snapshot(input, extensionRegistry);
+        return new Snapshot(input, extensionRegistry);
     }
   };
 
@@ -1854,7 +1825,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.Snapshot getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableMetadata.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableMetadata.java
index e77693cac7e4..3ffa99f7d0c5 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableMetadata.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableMetadata.java
@@ -36,9 +36,6 @@ private SnapshotTableMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private SnapshotTableMetadata(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.bigtable.admin.v2.SnapshotTableRequest.Builder subBuilder = null;
             if (originalRequest_ != null) {
@@ -89,13 +93,6 @@ private SnapshotTableMetadata(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -113,7 +110,6 @@ private SnapshotTableMetadata(
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_SnapshotTableMetadata_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_SnapshotTableMetadata_fieldAccessorTable
@@ -221,7 +217,6 @@ public com.google.protobuf.TimestampOrBuilder getFinishTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -231,7 +226,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (originalRequest_ != null) {
@@ -246,7 +240,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -393,7 +386,6 @@ public static com.google.bigtable.admin.v2.SnapshotTableMetadata parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -401,7 +393,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.SnapshotTableMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -433,7 +424,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_SnapshotTableMetadata_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_SnapshotTableMetadata_fieldAccessorTable
@@ -456,7 +446,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (originalRequestBuilder_ == null) {
@@ -480,18 +469,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_SnapshotTableMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.SnapshotTableMetadata getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.SnapshotTableMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.SnapshotTableMetadata build() {
       com.google.bigtable.admin.v2.SnapshotTableMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -500,7 +486,6 @@ public com.google.bigtable.admin.v2.SnapshotTableMetadata build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.SnapshotTableMetadata buildPartial() {
       com.google.bigtable.admin.v2.SnapshotTableMetadata result = new com.google.bigtable.admin.v2.SnapshotTableMetadata(this);
       if (originalRequestBuilder_ == null) {
@@ -522,39 +507,32 @@ public com.google.bigtable.admin.v2.SnapshotTableMetadata buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.SnapshotTableMetadata) {
         return mergeFrom((com.google.bigtable.admin.v2.SnapshotTableMetadata)other);
@@ -580,12 +558,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.SnapshotTableMetadata othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1062,13 +1038,11 @@ public com.google.protobuf.TimestampOrBuilder getFinishTimeOrBuilder() {
       }
       return finishTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1090,12 +1064,11 @@ public static com.google.bigtable.admin.v2.SnapshotTableMetadata getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SnapshotTableMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SnapshotTableMetadata(input, extensionRegistry);
+        return new SnapshotTableMetadata(input, extensionRegistry);
     }
   };
 
@@ -1108,7 +1081,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.SnapshotTableMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequest.java
index 56c40f9640aa..0d728b8436a5 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequest.java
@@ -41,9 +41,6 @@ private SnapshotTableRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -55,6 +52,13 @@ private SnapshotTableRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -92,13 +96,6 @@ private SnapshotTableRequest(
             description_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -116,7 +113,6 @@ private SnapshotTableRequest(
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_SnapshotTableRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_SnapshotTableRequest_fieldAccessorTable
@@ -349,7 +345,6 @@ public java.lang.String getDescription() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -359,7 +354,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -380,7 +374,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -529,7 +522,6 @@ public static com.google.bigtable.admin.v2.SnapshotTableRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -537,7 +529,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.SnapshotTableRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -570,7 +561,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_SnapshotTableRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_SnapshotTableRequest_fieldAccessorTable
@@ -593,7 +583,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -613,18 +602,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableTableAdminProto.internal_static_google_bigtable_admin_v2_SnapshotTableRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.SnapshotTableRequest getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.SnapshotTableRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.SnapshotTableRequest build() {
       com.google.bigtable.admin.v2.SnapshotTableRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -633,7 +619,6 @@ public com.google.bigtable.admin.v2.SnapshotTableRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.SnapshotTableRequest buildPartial() {
       com.google.bigtable.admin.v2.SnapshotTableRequest result = new com.google.bigtable.admin.v2.SnapshotTableRequest(this);
       result.name_ = name_;
@@ -649,39 +634,32 @@ public com.google.bigtable.admin.v2.SnapshotTableRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.SnapshotTableRequest) {
         return mergeFrom((com.google.bigtable.admin.v2.SnapshotTableRequest)other);
@@ -717,12 +695,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.SnapshotTableRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1311,13 +1287,11 @@ public Builder setDescriptionBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1339,12 +1313,11 @@ public static com.google.bigtable.admin.v2.SnapshotTableRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SnapshotTableRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SnapshotTableRequest(input, extensionRegistry);
+        return new SnapshotTableRequest(input, extensionRegistry);
     }
   };
 
@@ -1357,7 +1330,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.SnapshotTableRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Table.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Table.java
index fe9467af59dc..ed22b8d1ff41 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Table.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Table.java
@@ -35,9 +35,6 @@ private Table(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private Table(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -87,13 +91,6 @@ private Table(
             granularity_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -112,7 +109,6 @@ private Table(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -125,7 +121,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_Table_fieldAccessorTable
@@ -478,9 +473,6 @@ private ClusterState(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -492,12 +484,6 @@ private ClusterState(
             case 0:
               done = true;
               break;
-            case 8: {
-              int rawValue = input.readEnum();
-
-              replicationState_ = rawValue;
-              break;
-            }
             default: {
               if (!parseUnknownFieldProto3(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -505,6 +491,12 @@ private ClusterState(
               }
               break;
             }
+            case 8: {
+              int rawValue = input.readEnum();
+
+              replicationState_ = rawValue;
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -522,7 +514,6 @@ private ClusterState(
       return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_Table_ClusterState_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_Table_ClusterState_fieldAccessorTable
@@ -733,13 +724,11 @@ public int getReplicationStateValue() {
      * .google.bigtable.admin.v2.Table.ClusterState.ReplicationState replication_state = 1;
      */
     public com.google.bigtable.admin.v2.Table.ClusterState.ReplicationState getReplicationState() {
-      @SuppressWarnings("deprecation")
       com.google.bigtable.admin.v2.Table.ClusterState.ReplicationState result = com.google.bigtable.admin.v2.Table.ClusterState.ReplicationState.valueOf(replicationState_);
       return result == null ? com.google.bigtable.admin.v2.Table.ClusterState.ReplicationState.UNRECOGNIZED : result;
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -749,7 +738,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (replicationState_ != com.google.bigtable.admin.v2.Table.ClusterState.ReplicationState.STATE_NOT_KNOWN.getNumber()) {
@@ -758,7 +746,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -873,7 +860,6 @@ public static com.google.bigtable.admin.v2.Table.ClusterState parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -881,7 +867,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.bigtable.admin.v2.Table.ClusterState prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -909,7 +894,6 @@ public static final class Builder extends
         return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_Table_ClusterState_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_Table_ClusterState_fieldAccessorTable
@@ -932,7 +916,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         replicationState_ = 0;
@@ -940,18 +923,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_Table_ClusterState_descriptor;
       }
 
-      @java.lang.Override
       public com.google.bigtable.admin.v2.Table.ClusterState getDefaultInstanceForType() {
         return com.google.bigtable.admin.v2.Table.ClusterState.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.bigtable.admin.v2.Table.ClusterState build() {
         com.google.bigtable.admin.v2.Table.ClusterState result = buildPartial();
         if (!result.isInitialized()) {
@@ -960,7 +940,6 @@ public com.google.bigtable.admin.v2.Table.ClusterState build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.bigtable.admin.v2.Table.ClusterState buildPartial() {
         com.google.bigtable.admin.v2.Table.ClusterState result = new com.google.bigtable.admin.v2.Table.ClusterState(this);
         result.replicationState_ = replicationState_;
@@ -968,39 +947,32 @@ public com.google.bigtable.admin.v2.Table.ClusterState buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.bigtable.admin.v2.Table.ClusterState) {
           return mergeFrom((com.google.bigtable.admin.v2.Table.ClusterState)other);
@@ -1020,12 +992,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.Table.ClusterState other)
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1078,7 +1048,6 @@ public Builder setReplicationStateValue(int value) {
        * .google.bigtable.admin.v2.Table.ClusterState.ReplicationState replication_state = 1;
        */
       public com.google.bigtable.admin.v2.Table.ClusterState.ReplicationState getReplicationState() {
-        @SuppressWarnings("deprecation")
         com.google.bigtable.admin.v2.Table.ClusterState.ReplicationState result = com.google.bigtable.admin.v2.Table.ClusterState.ReplicationState.valueOf(replicationState_);
         return result == null ? com.google.bigtable.admin.v2.Table.ClusterState.ReplicationState.UNRECOGNIZED : result;
       }
@@ -1113,13 +1082,11 @@ public Builder clearReplicationState() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1141,12 +1108,11 @@ public static com.google.bigtable.admin.v2.Table.ClusterState getDefaultInstance
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public ClusterState parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ClusterState(input, extensionRegistry);
+          return new ClusterState(input, extensionRegistry);
       }
     };
 
@@ -1159,7 +1125,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.Table.ClusterState getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1455,13 +1420,11 @@ public int getGranularityValue() {
    * .google.bigtable.admin.v2.Table.TimestampGranularity granularity = 4;
    */
   public com.google.bigtable.admin.v2.Table.TimestampGranularity getGranularity() {
-    @SuppressWarnings("deprecation")
     com.google.bigtable.admin.v2.Table.TimestampGranularity result = com.google.bigtable.admin.v2.Table.TimestampGranularity.valueOf(granularity_);
     return result == null ? com.google.bigtable.admin.v2.Table.TimestampGranularity.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1471,7 +1434,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -1495,7 +1457,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1649,7 +1610,6 @@ public static com.google.bigtable.admin.v2.Table parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1657,7 +1617,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.Table prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1712,7 +1671,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_Table_fieldAccessorTable
@@ -1735,7 +1693,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -1747,18 +1704,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.TableProto.internal_static_google_bigtable_admin_v2_Table_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.Table getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.Table.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.Table build() {
       com.google.bigtable.admin.v2.Table result = buildPartial();
       if (!result.isInitialized()) {
@@ -1767,7 +1721,6 @@ public com.google.bigtable.admin.v2.Table build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.Table buildPartial() {
       com.google.bigtable.admin.v2.Table result = new com.google.bigtable.admin.v2.Table(this);
       int from_bitField0_ = bitField0_;
@@ -1783,39 +1736,32 @@ public com.google.bigtable.admin.v2.Table buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.Table) {
         return mergeFrom((com.google.bigtable.admin.v2.Table)other);
@@ -1843,12 +1789,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.Table other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2366,7 +2310,6 @@ public Builder setGranularityValue(int value) {
      * .google.bigtable.admin.v2.Table.TimestampGranularity granularity = 4;
      */
     public com.google.bigtable.admin.v2.Table.TimestampGranularity getGranularity() {
-      @SuppressWarnings("deprecation")
       com.google.bigtable.admin.v2.Table.TimestampGranularity result = com.google.bigtable.admin.v2.Table.TimestampGranularity.valueOf(granularity_);
       return result == null ? com.google.bigtable.admin.v2.Table.TimestampGranularity.UNRECOGNIZED : result;
     }
@@ -2407,13 +2350,11 @@ public Builder clearGranularity() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2435,12 +2376,11 @@ public static com.google.bigtable.admin.v2.Table getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser
() {
-    @java.lang.Override
     public Table parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Table(input, extensionRegistry);
+        return new Table(input, extensionRegistry);
     }
   };
 
@@ -2453,7 +2393,6 @@ public com.google.protobuf.Parser
 getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.Table getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/TableProto.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/TableProto.java
index cedc689943b6..2c3a17cee561 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/TableProto.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/TableProto.java
@@ -77,7 +77,7 @@ public static void registerAllExtensions(
       ".ClusterStatesEntry\022L\n\017column_families\030\003" +
       " \003(\01323.google.bigtable.admin.v2.Table.Co" +
       "lumnFamiliesEntry\022I\n\013granularity\030\004 \001(\01624" +
-      ".google.bigtable.admin.v2.Table.Timestam" +
+      ".google.bigtable.admin.v2.Table.Timestam",
       "pGranularity\032\342\001\n\014ClusterState\022X\n\021replica" +
       "tion_state\030\001 \001(\0162=.google.bigtable.admin" +
       ".v2.Table.ClusterState.ReplicationState\"" +
@@ -87,7 +87,7 @@ public static void registerAllExtensions(
       "\004\032b\n\022ClusterStatesEntry\022\013\n\003key\030\001 \001(\t\022;\n\005" +
       "value\030\002 \001(\0132,.google.bigtable.admin.v2.T" +
       "able.ClusterState:\0028\001\032]\n\023ColumnFamiliesE" +
-      "ntry\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001(\0132&.googl" +
+      "ntry\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001(\0132&.googl",
       "e.bigtable.admin.v2.ColumnFamily:\0028\001\"I\n\024" +
       "TimestampGranularity\022%\n!TIMESTAMP_GRANUL" +
       "ARITY_UNSPECIFIED\020\000\022\n\n\006MILLIS\020\001\"\\\n\004View\022" +
@@ -97,7 +97,7 @@ public static void registerAllExtensions(
       ".google.bigtable.admin.v2.GcRule\"\325\002\n\006GcR" +
       "ule\022\032\n\020max_num_versions\030\001 \001(\005H\000\022,\n\007max_a" +
       "ge\030\002 \001(\0132\031.google.protobuf.DurationH\000\022E\n" +
-      "\014intersection\030\003 \001(\0132-.google.bigtable.ad" +
+      "\014intersection\030\003 \001(\0132-.google.bigtable.ad",
       "min.v2.GcRule.IntersectionH\000\0227\n\005union\030\004 " +
       "\001(\0132&.google.bigtable.admin.v2.GcRule.Un" +
       "ionH\000\032?\n\014Intersection\022/\n\005rules\030\001 \003(\0132 .g" +
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "\001(\t\0225\n\014source_table\030\002 \001(\0132\037.google.bigta" +
       "ble.admin.v2.Table\022\027\n\017data_size_bytes\030\003 " +
       "\001(\003\022/\n\013create_time\030\004 \001(\0132\032.google.protob" +
-      "uf.Timestamp\022/\n\013delete_time\030\005 \001(\0132\032.goog" +
+      "uf.Timestamp\022/\n\013delete_time\030\005 \001(\0132\032.goog",
       "le.protobuf.Timestamp\0227\n\005state\030\006 \001(\0162(.g" +
       "oogle.bigtable.admin.v2.Snapshot.State\022\023" +
       "\n\013description\030\007 \001(\t\"5\n\005State\022\023\n\017STATE_NO" +
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileMetadata.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileMetadata.java
index 6201b31be0a2..286c4e658f04 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileMetadata.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileMetadata.java
@@ -32,9 +32,6 @@ private UpdateAppProfileMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -69,7 +66,6 @@ private UpdateAppProfileMetadata(
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_UpdateAppProfileMetadata_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_UpdateAppProfileMetadata_fieldAccessorTable
@@ -78,7 +74,6 @@ private UpdateAppProfileMetadata(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -88,13 +83,11 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -202,7 +195,6 @@ public static com.google.bigtable.admin.v2.UpdateAppProfileMetadata parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -210,7 +202,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.UpdateAppProfileMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -238,7 +229,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_UpdateAppProfileMetadata_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_UpdateAppProfileMetadata_fieldAccessorTable
@@ -261,24 +251,20 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_UpdateAppProfileMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.UpdateAppProfileMetadata getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.UpdateAppProfileMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.UpdateAppProfileMetadata build() {
       com.google.bigtable.admin.v2.UpdateAppProfileMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -287,46 +273,38 @@ public com.google.bigtable.admin.v2.UpdateAppProfileMetadata build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.UpdateAppProfileMetadata buildPartial() {
       com.google.bigtable.admin.v2.UpdateAppProfileMetadata result = new com.google.bigtable.admin.v2.UpdateAppProfileMetadata(this);
       onBuilt();
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.UpdateAppProfileMetadata) {
         return mergeFrom((com.google.bigtable.admin.v2.UpdateAppProfileMetadata)other);
@@ -343,12 +321,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.UpdateAppProfileMetadata o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -366,13 +342,11 @@ public Builder mergeFrom(
       }
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -394,12 +368,11 @@ public static com.google.bigtable.admin.v2.UpdateAppProfileMetadata getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateAppProfileMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateAppProfileMetadata(input, extensionRegistry);
+        return new UpdateAppProfileMetadata(input, extensionRegistry);
     }
   };
 
@@ -412,7 +385,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.UpdateAppProfileMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileRequest.java
index aabc8a94c2bd..5e6f5d169e65 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileRequest.java
@@ -33,9 +33,6 @@ private UpdateAppProfileRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private UpdateAppProfileRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.bigtable.admin.v2.AppProfile.Builder subBuilder = null;
             if (appProfile_ != null) {
@@ -78,13 +82,6 @@ private UpdateAppProfileRequest(
             ignoreWarnings_ = input.readBool();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -102,7 +99,6 @@ private UpdateAppProfileRequest(
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_UpdateAppProfileRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_UpdateAppProfileRequest_fieldAccessorTable
@@ -193,7 +189,6 @@ public boolean getIgnoreWarnings() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -203,7 +198,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (appProfile_ != null) {
@@ -218,7 +212,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -361,7 +354,6 @@ public static com.google.bigtable.admin.v2.UpdateAppProfileRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -369,7 +361,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.UpdateAppProfileRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -397,7 +388,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_UpdateAppProfileRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_UpdateAppProfileRequest_fieldAccessorTable
@@ -420,7 +410,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (appProfileBuilder_ == null) {
@@ -440,18 +429,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_UpdateAppProfileRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.UpdateAppProfileRequest getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.UpdateAppProfileRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.UpdateAppProfileRequest build() {
       com.google.bigtable.admin.v2.UpdateAppProfileRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -460,7 +446,6 @@ public com.google.bigtable.admin.v2.UpdateAppProfileRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.UpdateAppProfileRequest buildPartial() {
       com.google.bigtable.admin.v2.UpdateAppProfileRequest result = new com.google.bigtable.admin.v2.UpdateAppProfileRequest(this);
       if (appProfileBuilder_ == null) {
@@ -478,39 +463,32 @@ public com.google.bigtable.admin.v2.UpdateAppProfileRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.UpdateAppProfileRequest) {
         return mergeFrom((com.google.bigtable.admin.v2.UpdateAppProfileRequest)other);
@@ -536,12 +514,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.UpdateAppProfileRequest ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -912,13 +888,11 @@ public Builder clearIgnoreWarnings() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -940,12 +914,11 @@ public static com.google.bigtable.admin.v2.UpdateAppProfileRequest getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateAppProfileRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateAppProfileRequest(input, extensionRegistry);
+        return new UpdateAppProfileRequest(input, extensionRegistry);
     }
   };
 
@@ -958,7 +931,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.UpdateAppProfileRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateClusterMetadata.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateClusterMetadata.java
index dfaf7253a788..aec8754f2d35 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateClusterMetadata.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateClusterMetadata.java
@@ -32,9 +32,6 @@ private UpdateClusterMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private UpdateClusterMetadata(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.bigtable.admin.v2.Cluster.Builder subBuilder = null;
             if (originalRequest_ != null) {
@@ -85,13 +89,6 @@ private UpdateClusterMetadata(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -109,7 +106,6 @@ private UpdateClusterMetadata(
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_UpdateClusterMetadata_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_UpdateClusterMetadata_fieldAccessorTable
@@ -217,7 +213,6 @@ public com.google.protobuf.TimestampOrBuilder getFinishTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -227,7 +222,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (originalRequest_ != null) {
@@ -242,7 +236,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -389,7 +382,6 @@ public static com.google.bigtable.admin.v2.UpdateClusterMetadata parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -397,7 +389,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.UpdateClusterMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -425,7 +416,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_UpdateClusterMetadata_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_UpdateClusterMetadata_fieldAccessorTable
@@ -448,7 +438,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (originalRequestBuilder_ == null) {
@@ -472,18 +461,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_UpdateClusterMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.UpdateClusterMetadata getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.UpdateClusterMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.UpdateClusterMetadata build() {
       com.google.bigtable.admin.v2.UpdateClusterMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -492,7 +478,6 @@ public com.google.bigtable.admin.v2.UpdateClusterMetadata build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.UpdateClusterMetadata buildPartial() {
       com.google.bigtable.admin.v2.UpdateClusterMetadata result = new com.google.bigtable.admin.v2.UpdateClusterMetadata(this);
       if (originalRequestBuilder_ == null) {
@@ -514,39 +499,32 @@ public com.google.bigtable.admin.v2.UpdateClusterMetadata buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.UpdateClusterMetadata) {
         return mergeFrom((com.google.bigtable.admin.v2.UpdateClusterMetadata)other);
@@ -572,12 +550,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.UpdateClusterMetadata othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1054,13 +1030,11 @@ public com.google.protobuf.TimestampOrBuilder getFinishTimeOrBuilder() {
       }
       return finishTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1082,12 +1056,11 @@ public static com.google.bigtable.admin.v2.UpdateClusterMetadata getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateClusterMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateClusterMetadata(input, extensionRegistry);
+        return new UpdateClusterMetadata(input, extensionRegistry);
     }
   };
 
@@ -1100,7 +1073,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.UpdateClusterMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateInstanceMetadata.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateInstanceMetadata.java
index a06dc86efab4..8fc4200580a8 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateInstanceMetadata.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateInstanceMetadata.java
@@ -32,9 +32,6 @@ private UpdateInstanceMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private UpdateInstanceMetadata(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.bigtable.admin.v2.PartialUpdateInstanceRequest.Builder subBuilder = null;
             if (originalRequest_ != null) {
@@ -85,13 +89,6 @@ private UpdateInstanceMetadata(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -109,7 +106,6 @@ private UpdateInstanceMetadata(
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_UpdateInstanceMetadata_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_UpdateInstanceMetadata_fieldAccessorTable
@@ -217,7 +213,6 @@ public com.google.protobuf.TimestampOrBuilder getFinishTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -227,7 +222,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (originalRequest_ != null) {
@@ -242,7 +236,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -389,7 +382,6 @@ public static com.google.bigtable.admin.v2.UpdateInstanceMetadata parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -397,7 +389,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.admin.v2.UpdateInstanceMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -425,7 +416,6 @@ public static final class Builder extends
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_UpdateInstanceMetadata_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_UpdateInstanceMetadata_fieldAccessorTable
@@ -448,7 +438,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (originalRequestBuilder_ == null) {
@@ -472,18 +461,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.admin.v2.BigtableInstanceAdminProto.internal_static_google_bigtable_admin_v2_UpdateInstanceMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.UpdateInstanceMetadata getDefaultInstanceForType() {
       return com.google.bigtable.admin.v2.UpdateInstanceMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.UpdateInstanceMetadata build() {
       com.google.bigtable.admin.v2.UpdateInstanceMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -492,7 +478,6 @@ public com.google.bigtable.admin.v2.UpdateInstanceMetadata build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.admin.v2.UpdateInstanceMetadata buildPartial() {
       com.google.bigtable.admin.v2.UpdateInstanceMetadata result = new com.google.bigtable.admin.v2.UpdateInstanceMetadata(this);
       if (originalRequestBuilder_ == null) {
@@ -514,39 +499,32 @@ public com.google.bigtable.admin.v2.UpdateInstanceMetadata buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.admin.v2.UpdateInstanceMetadata) {
         return mergeFrom((com.google.bigtable.admin.v2.UpdateInstanceMetadata)other);
@@ -572,12 +550,10 @@ public Builder mergeFrom(com.google.bigtable.admin.v2.UpdateInstanceMetadata oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1054,13 +1030,11 @@ public com.google.protobuf.TimestampOrBuilder getFinishTimeOrBuilder() {
       }
       return finishTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1082,12 +1056,11 @@ public static com.google.bigtable.admin.v2.UpdateInstanceMetadata getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateInstanceMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateInstanceMetadata(input, extensionRegistry);
+        return new UpdateInstanceMetadata(input, extensionRegistry);
     }
   };
 
@@ -1100,7 +1073,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.admin.v2.UpdateInstanceMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/BigtableProto.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/BigtableProto.java
index f045bb96c57e..eddc17a341d4 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/BigtableProto.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/BigtableProto.java
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "\004rows\030\002 \001(\0132\032.google.bigtable.v2.RowSet\022" +
       "-\n\006filter\030\003 \001(\0132\035.google.bigtable.v2.Row" +
       "Filter\022\022\n\nrows_limit\030\004 \001(\003\"\370\002\n\020ReadRowsR" +
-      "esponse\022>\n\006chunks\030\001 \003(\0132..google.bigtabl" +
+      "esponse\022>\n\006chunks\030\001 \003(\0132..google.bigtabl",
       "e.v2.ReadRowsResponse.CellChunk\022\034\n\024last_" +
       "scanned_row_key\030\002 \001(\014\032\205\002\n\tCellChunk\022\017\n\007r" +
       "ow_key\030\001 \001(\014\0221\n\013family_name\030\002 \001(\0132\034.goog" +
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       "ue\030\006 \001(\014\022\022\n\nvalue_size\030\007 \001(\005\022\023\n\treset_ro" +
       "w\030\010 \001(\010H\000\022\024\n\ncommit_row\030\t \001(\010H\000B\014\n\nrow_s" +
       "tatus\"B\n\024SampleRowKeysRequest\022\022\n\ntable_n" +
-      "ame\030\001 \001(\t\022\026\n\016app_profile_id\030\002 \001(\t\">\n\025Sam" +
+      "ame\030\001 \001(\t\022\026\n\016app_profile_id\030\002 \001(\t\">\n\025Sam",
       "pleRowKeysResponse\022\017\n\007row_key\030\001 \001(\014\022\024\n\014o" +
       "ffset_bytes\030\002 \001(\003\"\200\001\n\020MutateRowRequest\022\022" +
       "\n\ntable_name\030\001 \001(\t\022\026\n\016app_profile_id\030\004 \001" +
@@ -127,7 +127,7 @@ public static void registerAllExtensions(
       "_name\030\001 \001(\t\022\026\n\016app_profile_id\030\003 \001(\t\022<\n\007e" +
       "ntries\030\002 \003(\0132+.google.bigtable.v2.Mutate" +
       "RowsRequest.Entry\032I\n\005Entry\022\017\n\007row_key\030\001 " +
-      "\001(\014\022/\n\tmutations\030\002 \003(\0132\034.google.bigtable" +
+      "\001(\014\022/\n\tmutations\030\002 \003(\0132\034.google.bigtable",
       ".v2.Mutation\"\217\001\n\022MutateRowsResponse\022=\n\007e" +
       "ntries\030\001 \003(\0132,.google.bigtable.v2.Mutate" +
       "RowsResponse.Entry\032:\n\005Entry\022\r\n\005index\030\001 \001" +
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       "ey\030\002 \001(\014\0227\n\020predicate_filter\030\006 \001(\0132\035.goo" +
       "gle.bigtable.v2.RowFilter\0224\n\016true_mutati" +
       "ons\030\004 \003(\0132\034.google.bigtable.v2.Mutation\022" +
-      "5\n\017false_mutations\030\005 \003(\0132\034.google.bigtab" +
+      "5\n\017false_mutations\030\005 \003(\0132\034.google.bigtab",
       "le.v2.Mutation\"6\n\031CheckAndMutateRowRespo" +
       "nse\022\031\n\021predicate_matched\030\001 \001(\010\"\220\001\n\031ReadM" +
       "odifyWriteRowRequest\022\022\n\ntable_name\030\001 \001(\t" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "esponse\022$\n\003row\030\001 \001(\0132\027.google.bigtable.v" +
       "2.Row2\255\010\n\010Bigtable\022\235\001\n\010ReadRows\022#.google" +
       ".bigtable.v2.ReadRowsRequest\032$.google.bi" +
-      "gtable.v2.ReadRowsResponse\"D\202\323\344\223\002>\"9/v2/" +
+      "gtable.v2.ReadRowsResponse\"D\202\323\344\223\002>\"9/v2/",
       "{table_name=projects/*/instances/*/table" +
       "s/*}:readRows:\001*0\001\022\256\001\n\rSampleRowKeys\022(.g" +
       "oogle.bigtable.v2.SampleRowKeysRequest\032)" +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       "MutateRow\022$.google.bigtable.v2.MutateRow" +
       "Request\032%.google.bigtable.v2.MutateRowRe" +
       "sponse\"E\202\323\344\223\002?\":/v2/{table_name=projects" +
-      "/*/instances/*/tables/*}:mutateRow:\001*\022\245\001" +
+      "/*/instances/*/tables/*}:mutateRow:\001*\022\245\001",
       "\n\nMutateRows\022%.google.bigtable.v2.Mutate" +
       "RowsRequest\032&.google.bigtable.v2.MutateR" +
       "owsResponse\"F\202\323\344\223\002@\";/v2/{table_name=pro" +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       "le.bigtable.v2.CheckAndMutateRowResponse" +
       "\"M\202\323\344\223\002G\"B/v2/{table_name=projects/*/ins" +
       "tances/*/tables/*}:checkAndMutateRow:\001*\022" +
-      "\303\001\n\022ReadModifyWriteRow\022-.google.bigtable" +
+      "\303\001\n\022ReadModifyWriteRow\022-.google.bigtable",
       ".v2.ReadModifyWriteRowRequest\032..google.b" +
       "igtable.v2.ReadModifyWriteRowResponse\"N\202" +
       "\323\344\223\002H\"C/v2/{table_name=projects/*/instan" +
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Cell.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Cell.java
index 00e616eecac3..7ee032b242fc 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Cell.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Cell.java
@@ -35,9 +35,6 @@ private Cell(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private Cell(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
 
             timestampMicros_ = input.readInt64();
@@ -68,13 +72,6 @@ private Cell(
             labels_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -95,7 +92,6 @@ private Cell(
     return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Cell_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Cell_fieldAccessorTable
@@ -183,7 +179,6 @@ public java.lang.String getLabels(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -193,7 +188,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (timestampMicros_ != 0L) {
@@ -208,7 +202,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -347,7 +340,6 @@ public static com.google.bigtable.v2.Cell parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -355,7 +347,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.v2.Cell prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -383,7 +374,6 @@ public static final class Builder extends
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Cell_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Cell_fieldAccessorTable
@@ -406,7 +396,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       timestampMicros_ = 0L;
@@ -418,18 +407,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Cell_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.Cell getDefaultInstanceForType() {
       return com.google.bigtable.v2.Cell.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.Cell build() {
       com.google.bigtable.v2.Cell result = buildPartial();
       if (!result.isInitialized()) {
@@ -438,7 +424,6 @@ public com.google.bigtable.v2.Cell build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.Cell buildPartial() {
       com.google.bigtable.v2.Cell result = new com.google.bigtable.v2.Cell(this);
       int from_bitField0_ = bitField0_;
@@ -455,39 +440,32 @@ public com.google.bigtable.v2.Cell buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.v2.Cell) {
         return mergeFrom((com.google.bigtable.v2.Cell)other);
@@ -520,12 +498,10 @@ public Builder mergeFrom(com.google.bigtable.v2.Cell other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -774,13 +750,11 @@ public Builder addLabelsBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -802,12 +776,11 @@ public static com.google.bigtable.v2.Cell getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Cell parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Cell(input, extensionRegistry);
+        return new Cell(input, extensionRegistry);
     }
   };
 
@@ -820,7 +793,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.v2.Cell getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowRequest.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowRequest.java
index 1a32fb4c5195..d372e7d5deb8 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowRequest.java
@@ -37,9 +37,6 @@ private CheckAndMutateRowRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private CheckAndMutateRowRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -99,13 +103,6 @@ private CheckAndMutateRowRequest(
             appProfileId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -129,7 +126,6 @@ private CheckAndMutateRowRequest(
     return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_CheckAndMutateRowRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_CheckAndMutateRowRequest_fieldAccessorTable
@@ -436,7 +432,6 @@ public com.google.bigtable.v2.MutationOrBuilder getFalseMutationsOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -446,7 +441,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getTableNameBytes().isEmpty()) {
@@ -470,7 +464,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -633,7 +626,6 @@ public static com.google.bigtable.v2.CheckAndMutateRowRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -641,7 +633,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.v2.CheckAndMutateRowRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -669,7 +660,6 @@ public static final class Builder extends
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_CheckAndMutateRowRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_CheckAndMutateRowRequest_fieldAccessorTable
@@ -694,7 +684,6 @@ private void maybeForceBuilderInitialization() {
         getFalseMutationsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       tableName_ = "";
@@ -724,18 +713,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_CheckAndMutateRowRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.CheckAndMutateRowRequest getDefaultInstanceForType() {
       return com.google.bigtable.v2.CheckAndMutateRowRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.CheckAndMutateRowRequest build() {
       com.google.bigtable.v2.CheckAndMutateRowRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -744,7 +730,6 @@ public com.google.bigtable.v2.CheckAndMutateRowRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.CheckAndMutateRowRequest buildPartial() {
       com.google.bigtable.v2.CheckAndMutateRowRequest result = new com.google.bigtable.v2.CheckAndMutateRowRequest(this);
       int from_bitField0_ = bitField0_;
@@ -780,39 +765,32 @@ public com.google.bigtable.v2.CheckAndMutateRowRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.v2.CheckAndMutateRowRequest) {
         return mergeFrom((com.google.bigtable.v2.CheckAndMutateRowRequest)other);
@@ -895,12 +873,10 @@ public Builder mergeFrom(com.google.bigtable.v2.CheckAndMutateRowRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2106,13 +2082,11 @@ public com.google.bigtable.v2.Mutation.Builder addFalseMutationsBuilder(
       }
       return falseMutationsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2134,12 +2108,11 @@ public static com.google.bigtable.v2.CheckAndMutateRowRequest getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CheckAndMutateRowRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CheckAndMutateRowRequest(input, extensionRegistry);
+        return new CheckAndMutateRowRequest(input, extensionRegistry);
     }
   };
 
@@ -2152,7 +2125,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.v2.CheckAndMutateRowRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowResponse.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowResponse.java
index 1f978071d86d..e5d58d094139 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowResponse.java
@@ -33,9 +33,6 @@ private CheckAndMutateRowResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,11 +44,6 @@ private CheckAndMutateRowResponse(
           case 0:
             done = true;
             break;
-          case 8: {
-
-            predicateMatched_ = input.readBool();
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -59,6 +51,11 @@ private CheckAndMutateRowResponse(
             }
             break;
           }
+          case 8: {
+
+            predicateMatched_ = input.readBool();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -76,7 +73,6 @@ private CheckAndMutateRowResponse(
     return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_CheckAndMutateRowResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_CheckAndMutateRowResponse_fieldAccessorTable
@@ -99,7 +95,6 @@ public boolean getPredicateMatched() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -109,7 +104,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (predicateMatched_ != false) {
@@ -118,7 +112,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -235,7 +228,6 @@ public static com.google.bigtable.v2.CheckAndMutateRowResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -243,7 +235,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.v2.CheckAndMutateRowResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -271,7 +262,6 @@ public static final class Builder extends
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_CheckAndMutateRowResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_CheckAndMutateRowResponse_fieldAccessorTable
@@ -294,7 +284,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       predicateMatched_ = false;
@@ -302,18 +291,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_CheckAndMutateRowResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.CheckAndMutateRowResponse getDefaultInstanceForType() {
       return com.google.bigtable.v2.CheckAndMutateRowResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.CheckAndMutateRowResponse build() {
       com.google.bigtable.v2.CheckAndMutateRowResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -322,7 +308,6 @@ public com.google.bigtable.v2.CheckAndMutateRowResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.CheckAndMutateRowResponse buildPartial() {
       com.google.bigtable.v2.CheckAndMutateRowResponse result = new com.google.bigtable.v2.CheckAndMutateRowResponse(this);
       result.predicateMatched_ = predicateMatched_;
@@ -330,39 +315,32 @@ public com.google.bigtable.v2.CheckAndMutateRowResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.v2.CheckAndMutateRowResponse) {
         return mergeFrom((com.google.bigtable.v2.CheckAndMutateRowResponse)other);
@@ -382,12 +360,10 @@ public Builder mergeFrom(com.google.bigtable.v2.CheckAndMutateRowResponse other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -446,13 +422,11 @@ public Builder clearPredicateMatched() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -474,12 +448,11 @@ public static com.google.bigtable.v2.CheckAndMutateRowResponse getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CheckAndMutateRowResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CheckAndMutateRowResponse(input, extensionRegistry);
+        return new CheckAndMutateRowResponse(input, extensionRegistry);
     }
   };
 
@@ -492,7 +465,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.v2.CheckAndMutateRowResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Column.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Column.java
index d11840a355c8..71743f5a3e59 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Column.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Column.java
@@ -35,9 +35,6 @@ private Column(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private Column(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
 
             qualifier_ = input.readBytes();
@@ -63,13 +67,6 @@ private Column(
                 input.readMessage(com.google.bigtable.v2.Cell.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private Column(
     return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Column_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Column_fieldAccessorTable
@@ -172,7 +168,6 @@ public com.google.bigtable.v2.CellOrBuilder getCellsOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -182,7 +177,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!qualifier_.isEmpty()) {
@@ -194,7 +188,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -320,7 +313,6 @@ public static com.google.bigtable.v2.Column parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -328,7 +320,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.v2.Column prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -357,7 +348,6 @@ public static final class Builder extends
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Column_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Column_fieldAccessorTable
@@ -381,7 +371,6 @@ private void maybeForceBuilderInitialization() {
         getCellsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       qualifier_ = com.google.protobuf.ByteString.EMPTY;
@@ -395,18 +384,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Column_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.Column getDefaultInstanceForType() {
       return com.google.bigtable.v2.Column.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.Column build() {
       com.google.bigtable.v2.Column result = buildPartial();
       if (!result.isInitialized()) {
@@ -415,7 +401,6 @@ public com.google.bigtable.v2.Column build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.Column buildPartial() {
       com.google.bigtable.v2.Column result = new com.google.bigtable.v2.Column(this);
       int from_bitField0_ = bitField0_;
@@ -435,39 +420,32 @@ public com.google.bigtable.v2.Column buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.v2.Column) {
         return mergeFrom((com.google.bigtable.v2.Column)other);
@@ -513,12 +491,10 @@ public Builder mergeFrom(com.google.bigtable.v2.Column other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -902,13 +878,11 @@ public com.google.bigtable.v2.Cell.Builder addCellsBuilder(
       }
       return cellsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -930,12 +904,11 @@ public static com.google.bigtable.v2.Column getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Column parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Column(input, extensionRegistry);
+        return new Column(input, extensionRegistry);
     }
   };
 
@@ -948,7 +921,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.v2.Column getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ColumnRange.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ColumnRange.java
index f4f44f42089b..b8b304605365 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ColumnRange.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ColumnRange.java
@@ -36,9 +36,6 @@ private ColumnRange(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private ColumnRange(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -76,13 +80,6 @@ private ColumnRange(
             endQualifier_ = input.readBytes();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -100,7 +97,6 @@ private ColumnRange(
     return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_ColumnRange_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_ColumnRange_fieldAccessorTable
@@ -287,7 +283,6 @@ public com.google.protobuf.ByteString getEndQualifierOpen() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -297,7 +292,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getFamilyNameBytes().isEmpty()) {
@@ -322,7 +316,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -511,7 +504,6 @@ public static com.google.bigtable.v2.ColumnRange parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -519,7 +511,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.v2.ColumnRange prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -550,7 +541,6 @@ public static final class Builder extends
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_ColumnRange_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_ColumnRange_fieldAccessorTable
@@ -573,7 +563,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       familyName_ = "";
@@ -585,18 +574,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_ColumnRange_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.ColumnRange getDefaultInstanceForType() {
       return com.google.bigtable.v2.ColumnRange.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.ColumnRange build() {
       com.google.bigtable.v2.ColumnRange result = buildPartial();
       if (!result.isInitialized()) {
@@ -605,7 +591,6 @@ public com.google.bigtable.v2.ColumnRange build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.ColumnRange buildPartial() {
       com.google.bigtable.v2.ColumnRange result = new com.google.bigtable.v2.ColumnRange(this);
       result.familyName_ = familyName_;
@@ -627,39 +612,32 @@ public com.google.bigtable.v2.ColumnRange buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.v2.ColumnRange) {
         return mergeFrom((com.google.bigtable.v2.ColumnRange)other);
@@ -706,12 +684,10 @@ public Builder mergeFrom(com.google.bigtable.v2.ColumnRange other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1028,13 +1004,11 @@ public Builder clearEndQualifierOpen() {
       }
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1056,12 +1030,11 @@ public static com.google.bigtable.v2.ColumnRange getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ColumnRange parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ColumnRange(input, extensionRegistry);
+        return new ColumnRange(input, extensionRegistry);
     }
   };
 
@@ -1074,7 +1047,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.v2.ColumnRange getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/DataProto.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/DataProto.java
index 66858365b135..94d203f78900 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/DataProto.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/DataProto.java
@@ -127,7 +127,7 @@ public static void registerAllExtensions(
       "bigtable.v2.Cell\"?\n\004Cell\022\030\n\020timestamp_mi" +
       "cros\030\001 \001(\003\022\r\n\005value\030\002 \001(\014\022\016\n\006labels\030\003 \003(" +
       "\t\"\212\001\n\010RowRange\022\032\n\020start_key_closed\030\001 \001(\014" +
-      "H\000\022\030\n\016start_key_open\030\002 \001(\014H\000\022\026\n\014end_key_" +
+      "H\000\022\030\n\016start_key_open\030\002 \001(\014H\000\022\026\n\014end_key_",
       "open\030\003 \001(\014H\001\022\030\n\016end_key_closed\030\004 \001(\014H\001B\013" +
       "\n\tstart_keyB\t\n\007end_key\"L\n\006RowSet\022\020\n\010row_" +
       "keys\030\001 \003(\014\0220\n\nrow_ranges\030\002 \003(\0132\034.google." +
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       "\014H\000\022\036\n\024end_qualifier_closed\030\004 \001(\014H\001\022\034\n\022e" +
       "nd_qualifier_open\030\005 \001(\014H\001B\021\n\017start_quali" +
       "fierB\017\n\rend_qualifier\"N\n\016TimestampRange\022" +
-      "\036\n\026start_timestamp_micros\030\001 \001(\003\022\034\n\024end_t" +
+      "\036\n\026start_timestamp_micros\030\001 \001(\003\022\034\n\024end_t",
       "imestamp_micros\030\002 \001(\003\"\230\001\n\nValueRange\022\034\n\022" +
       "start_value_closed\030\001 \001(\014H\000\022\032\n\020start_valu" +
       "e_open\030\002 \001(\014H\000\022\032\n\020end_value_closed\030\003 \001(\014" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "inH\000\022>\n\ninterleave\030\002 \001(\0132(.google.bigtab" +
       "le.v2.RowFilter.InterleaveH\000\022<\n\tconditio" +
       "n\030\003 \001(\0132\'.google.bigtable.v2.RowFilter.C" +
-      "onditionH\000\022\016\n\004sink\030\020 \001(\010H\000\022\031\n\017pass_all_f" +
+      "onditionH\000\022\016\n\004sink\030\020 \001(\010H\000\022\031\n\017pass_all_f",
       "ilter\030\021 \001(\010H\000\022\032\n\020block_all_filter\030\022 \001(\010H" +
       "\000\022\036\n\024row_key_regex_filter\030\004 \001(\014H\000\022\033\n\021row" +
       "_sample_filter\030\016 \001(\001H\000\022\"\n\030family_name_re" +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       "eH\000\022D\n\026timestamp_range_filter\030\010 \001(\0132\".go" +
       "ogle.bigtable.v2.TimestampRangeH\000\022\034\n\022val" +
       "ue_regex_filter\030\t \001(\014H\000\022<\n\022value_range_f" +
-      "ilter\030\017 \001(\0132\036.google.bigtable.v2.ValueRa" +
+      "ilter\030\017 \001(\0132\036.google.bigtable.v2.ValueRa",
       "ngeH\000\022%\n\033cells_per_row_offset_filter\030\n \001" +
       "(\005H\000\022$\n\032cells_per_row_limit_filter\030\013 \001(\005" +
       "H\000\022\'\n\035cells_per_column_limit_filter\030\014 \001(" +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       ".RowFilter\032<\n\nInterleave\022.\n\007filters\030\001 \003(" +
       "\0132\035.google.bigtable.v2.RowFilter\032\255\001\n\tCon" +
       "dition\0227\n\020predicate_filter\030\001 \001(\0132\035.googl" +
-      "e.bigtable.v2.RowFilter\0222\n\013true_filter\030\002" +
+      "e.bigtable.v2.RowFilter\0222\n\013true_filter\030\002",
       " \001(\0132\035.google.bigtable.v2.RowFilter\0223\n\014f" +
       "alse_filter\030\003 \001(\0132\035.google.bigtable.v2.R" +
       "owFilterB\010\n\006filter\"\311\004\n\010Mutation\0228\n\010set_c" +
@@ -177,7 +177,7 @@ public static void registerAllExtensions(
       "lumnH\000\022K\n\022delete_from_family\030\003 \001(\0132-.goo" +
       "gle.bigtable.v2.Mutation.DeleteFromFamil" +
       "yH\000\022E\n\017delete_from_row\030\004 \001(\0132*.google.bi" +
-      "gtable.v2.Mutation.DeleteFromRowH\000\032a\n\007Se" +
+      "gtable.v2.Mutation.DeleteFromRowH\000\032a\n\007Se",
       "tCell\022\023\n\013family_name\030\001 \001(\t\022\030\n\020column_qua" +
       "lifier\030\002 \001(\014\022\030\n\020timestamp_micros\030\003 \001(\003\022\r" +
       "\n\005value\030\004 \001(\014\032y\n\020DeleteFromColumn\022\023\n\013fam" +
@@ -187,7 +187,7 @@ public static void registerAllExtensions(
       "family_name\030\001 \001(\t\032\017\n\rDeleteFromRowB\n\n\010mu" +
       "tation\"\200\001\n\023ReadModifyWriteRule\022\023\n\013family" +
       "_name\030\001 \001(\t\022\030\n\020column_qualifier\030\002 \001(\014\022\026\n" +
-      "\014append_value\030\003 \001(\014H\000\022\032\n\020increment_amoun" +
+      "\014append_value\030\003 \001(\014H\000\022\032\n\020increment_amoun",
       "t\030\004 \001(\003H\000B\006\n\004ruleB\227\001\n\026com.google.bigtabl" +
       "e.v2B\tDataProtoP\001Z:google.golang.org/gen" +
       "proto/googleapis/bigtable/v2;bigtable\252\002\030" +
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Family.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Family.java
index c59aed5fcfe5..d4b38dbe4f39 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Family.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Family.java
@@ -35,9 +35,6 @@ private Family(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private Family(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -64,13 +68,6 @@ private Family(
                 input.readMessage(com.google.bigtable.v2.Column.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private Family(
     return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Family_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Family_fieldAccessorTable
@@ -208,7 +204,6 @@ public com.google.bigtable.v2.ColumnOrBuilder getColumnsOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -218,7 +213,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -230,7 +224,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -355,7 +348,6 @@ public static com.google.bigtable.v2.Family parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -363,7 +355,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.v2.Family prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -392,7 +383,6 @@ public static final class Builder extends
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Family_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Family_fieldAccessorTable
@@ -416,7 +406,6 @@ private void maybeForceBuilderInitialization() {
         getColumnsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -430,18 +419,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Family_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.Family getDefaultInstanceForType() {
       return com.google.bigtable.v2.Family.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.Family build() {
       com.google.bigtable.v2.Family result = buildPartial();
       if (!result.isInitialized()) {
@@ -450,7 +436,6 @@ public com.google.bigtable.v2.Family build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.Family buildPartial() {
       com.google.bigtable.v2.Family result = new com.google.bigtable.v2.Family(this);
       int from_bitField0_ = bitField0_;
@@ -470,39 +455,32 @@ public com.google.bigtable.v2.Family buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.v2.Family) {
         return mergeFrom((com.google.bigtable.v2.Family)other);
@@ -549,12 +527,10 @@ public Builder mergeFrom(com.google.bigtable.v2.Family other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -999,13 +975,11 @@ public com.google.bigtable.v2.Column.Builder addColumnsBuilder(
       }
       return columnsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1027,12 +1001,11 @@ public static com.google.bigtable.v2.Family getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Family parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Family(input, extensionRegistry);
+        return new Family(input, extensionRegistry);
     }
   };
 
@@ -1045,7 +1018,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.v2.Family getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowRequest.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowRequest.java
index 56172d4d7fbe..a46c9196a07b 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowRequest.java
@@ -36,9 +36,6 @@ private MutateRowRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private MutateRowRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -76,13 +80,6 @@ private MutateRowRequest(
             appProfileId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private MutateRowRequest(
     return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_MutateRowRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_MutateRowRequest_fieldAccessorTable
@@ -281,7 +277,6 @@ public com.google.bigtable.v2.MutationOrBuilder getMutationsOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -291,7 +286,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getTableNameBytes().isEmpty()) {
@@ -309,7 +303,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -449,7 +442,6 @@ public static com.google.bigtable.v2.MutateRowRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -457,7 +449,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.v2.MutateRowRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -485,7 +476,6 @@ public static final class Builder extends
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_MutateRowRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_MutateRowRequest_fieldAccessorTable
@@ -509,7 +499,6 @@ private void maybeForceBuilderInitialization() {
         getMutationsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       tableName_ = "";
@@ -527,18 +516,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_MutateRowRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.MutateRowRequest getDefaultInstanceForType() {
       return com.google.bigtable.v2.MutateRowRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.MutateRowRequest build() {
       com.google.bigtable.v2.MutateRowRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -547,7 +533,6 @@ public com.google.bigtable.v2.MutateRowRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.MutateRowRequest buildPartial() {
       com.google.bigtable.v2.MutateRowRequest result = new com.google.bigtable.v2.MutateRowRequest(this);
       int from_bitField0_ = bitField0_;
@@ -569,39 +554,32 @@ public com.google.bigtable.v2.MutateRowRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.v2.MutateRowRequest) {
         return mergeFrom((com.google.bigtable.v2.MutateRowRequest)other);
@@ -655,12 +633,10 @@ public Builder mergeFrom(com.google.bigtable.v2.MutateRowRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1261,13 +1237,11 @@ public com.google.bigtable.v2.Mutation.Builder addMutationsBuilder(
       }
       return mutationsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1289,12 +1263,11 @@ public static com.google.bigtable.v2.MutateRowRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public MutateRowRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new MutateRowRequest(input, extensionRegistry);
+        return new MutateRowRequest(input, extensionRegistry);
     }
   };
 
@@ -1307,7 +1280,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.v2.MutateRowRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowResponse.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowResponse.java
index d694dd67f9ef..017ef8b15db8 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowResponse.java
@@ -32,9 +32,6 @@ private MutateRowResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -69,7 +66,6 @@ private MutateRowResponse(
     return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_MutateRowResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_MutateRowResponse_fieldAccessorTable
@@ -78,7 +74,6 @@ private MutateRowResponse(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -88,13 +83,11 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -202,7 +195,6 @@ public static com.google.bigtable.v2.MutateRowResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -210,7 +202,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.v2.MutateRowResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -238,7 +229,6 @@ public static final class Builder extends
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_MutateRowResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_MutateRowResponse_fieldAccessorTable
@@ -261,24 +251,20 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_MutateRowResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.MutateRowResponse getDefaultInstanceForType() {
       return com.google.bigtable.v2.MutateRowResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.MutateRowResponse build() {
       com.google.bigtable.v2.MutateRowResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -287,46 +273,38 @@ public com.google.bigtable.v2.MutateRowResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.MutateRowResponse buildPartial() {
       com.google.bigtable.v2.MutateRowResponse result = new com.google.bigtable.v2.MutateRowResponse(this);
       onBuilt();
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.v2.MutateRowResponse) {
         return mergeFrom((com.google.bigtable.v2.MutateRowResponse)other);
@@ -343,12 +321,10 @@ public Builder mergeFrom(com.google.bigtable.v2.MutateRowResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -366,13 +342,11 @@ public Builder mergeFrom(
       }
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -394,12 +368,11 @@ public static com.google.bigtable.v2.MutateRowResponse getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public MutateRowResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new MutateRowResponse(input, extensionRegistry);
+        return new MutateRowResponse(input, extensionRegistry);
     }
   };
 
@@ -412,7 +385,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.v2.MutateRowResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsRequest.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsRequest.java
index e0cc71cb332f..15184ebbd8ff 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsRequest.java
@@ -35,9 +35,6 @@ private MutateRowsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private MutateRowsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -70,13 +74,6 @@ private MutateRowsRequest(
             appProfileId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private MutateRowsRequest(
     return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_MutateRowsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_MutateRowsRequest_fieldAccessorTable
@@ -204,9 +200,6 @@ private Entry(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -218,6 +211,13 @@ private Entry(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
 
               rowKey_ = input.readBytes();
@@ -232,13 +232,6 @@ private Entry(
                   input.readMessage(com.google.bigtable.v2.Mutation.parser(), extensionRegistry));
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -259,7 +252,6 @@ private Entry(
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_MutateRowsRequest_Entry_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_MutateRowsRequest_Entry_fieldAccessorTable
@@ -352,7 +344,6 @@ public com.google.bigtable.v2.MutationOrBuilder getMutationsOrBuilder(
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -362,7 +353,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!rowKey_.isEmpty()) {
@@ -374,7 +364,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -500,7 +489,6 @@ public static com.google.bigtable.v2.MutateRowsRequest.Entry parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -508,7 +496,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.bigtable.v2.MutateRowsRequest.Entry prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -532,7 +519,6 @@ public static final class Builder extends
         return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_MutateRowsRequest_Entry_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_MutateRowsRequest_Entry_fieldAccessorTable
@@ -556,7 +542,6 @@ private void maybeForceBuilderInitialization() {
           getMutationsFieldBuilder();
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         rowKey_ = com.google.protobuf.ByteString.EMPTY;
@@ -570,18 +555,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_MutateRowsRequest_Entry_descriptor;
       }
 
-      @java.lang.Override
       public com.google.bigtable.v2.MutateRowsRequest.Entry getDefaultInstanceForType() {
         return com.google.bigtable.v2.MutateRowsRequest.Entry.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.bigtable.v2.MutateRowsRequest.Entry build() {
         com.google.bigtable.v2.MutateRowsRequest.Entry result = buildPartial();
         if (!result.isInitialized()) {
@@ -590,7 +572,6 @@ public com.google.bigtable.v2.MutateRowsRequest.Entry build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.bigtable.v2.MutateRowsRequest.Entry buildPartial() {
         com.google.bigtable.v2.MutateRowsRequest.Entry result = new com.google.bigtable.v2.MutateRowsRequest.Entry(this);
         int from_bitField0_ = bitField0_;
@@ -610,39 +591,32 @@ public com.google.bigtable.v2.MutateRowsRequest.Entry buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.bigtable.v2.MutateRowsRequest.Entry) {
           return mergeFrom((com.google.bigtable.v2.MutateRowsRequest.Entry)other);
@@ -688,12 +662,10 @@ public Builder mergeFrom(com.google.bigtable.v2.MutateRowsRequest.Entry other) {
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1119,13 +1091,11 @@ public com.google.bigtable.v2.Mutation.Builder addMutationsBuilder(
         }
         return mutationsBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1147,12 +1117,11 @@ public static com.google.bigtable.v2.MutateRowsRequest.Entry getDefaultInstance(
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Entry parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Entry(input, extensionRegistry);
+          return new Entry(input, extensionRegistry);
       }
     };
 
@@ -1165,7 +1134,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.MutateRowsRequest.Entry getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1335,7 +1303,6 @@ public com.google.bigtable.v2.MutateRowsRequest.EntryOrBuilder getEntriesOrBuild
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1345,7 +1312,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getTableNameBytes().isEmpty()) {
@@ -1360,7 +1326,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1492,7 +1457,6 @@ public static com.google.bigtable.v2.MutateRowsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1500,7 +1464,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.v2.MutateRowsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1528,7 +1491,6 @@ public static final class Builder extends
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_MutateRowsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_MutateRowsRequest_fieldAccessorTable
@@ -1552,7 +1514,6 @@ private void maybeForceBuilderInitialization() {
         getEntriesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       tableName_ = "";
@@ -1568,18 +1529,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_MutateRowsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.MutateRowsRequest getDefaultInstanceForType() {
       return com.google.bigtable.v2.MutateRowsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.MutateRowsRequest build() {
       com.google.bigtable.v2.MutateRowsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -1588,7 +1546,6 @@ public com.google.bigtable.v2.MutateRowsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.MutateRowsRequest buildPartial() {
       com.google.bigtable.v2.MutateRowsRequest result = new com.google.bigtable.v2.MutateRowsRequest(this);
       int from_bitField0_ = bitField0_;
@@ -1609,39 +1566,32 @@ public com.google.bigtable.v2.MutateRowsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.v2.MutateRowsRequest) {
         return mergeFrom((com.google.bigtable.v2.MutateRowsRequest)other);
@@ -1692,12 +1642,10 @@ public Builder mergeFrom(com.google.bigtable.v2.MutateRowsRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2283,13 +2231,11 @@ public com.google.bigtable.v2.MutateRowsRequest.Entry.Builder addEntriesBuilder(
       }
       return entriesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2311,12 +2257,11 @@ public static com.google.bigtable.v2.MutateRowsRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public MutateRowsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new MutateRowsRequest(input, extensionRegistry);
+        return new MutateRowsRequest(input, extensionRegistry);
     }
   };
 
@@ -2329,7 +2274,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.v2.MutateRowsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsResponse.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsResponse.java
index 7366454ebc81..d4d7aec5e6d1 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsResponse.java
@@ -33,9 +33,6 @@ private MutateRowsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private MutateRowsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               entries_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private MutateRowsResponse(
                 input.readMessage(com.google.bigtable.v2.MutateRowsResponse.Entry.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private MutateRowsResponse(
     return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_MutateRowsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_MutateRowsResponse_fieldAccessorTable
@@ -165,9 +161,6 @@ private Entry(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -179,6 +172,13 @@ private Entry(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 8: {
 
               index_ = input.readInt64();
@@ -197,13 +197,6 @@ private Entry(
 
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -221,7 +214,6 @@ private Entry(
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_MutateRowsResponse_Entry_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_MutateRowsResponse_Entry_fieldAccessorTable
@@ -286,7 +278,6 @@ public com.google.rpc.StatusOrBuilder getStatusOrBuilder() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -296,7 +287,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (index_ != 0L) {
@@ -308,7 +298,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -438,7 +427,6 @@ public static com.google.bigtable.v2.MutateRowsResponse.Entry parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -446,7 +434,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.bigtable.v2.MutateRowsResponse.Entry prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -470,7 +457,6 @@ public static final class Builder extends
         return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_MutateRowsResponse_Entry_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_MutateRowsResponse_Entry_fieldAccessorTable
@@ -493,7 +479,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         index_ = 0L;
@@ -507,18 +492,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_MutateRowsResponse_Entry_descriptor;
       }
 
-      @java.lang.Override
       public com.google.bigtable.v2.MutateRowsResponse.Entry getDefaultInstanceForType() {
         return com.google.bigtable.v2.MutateRowsResponse.Entry.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.bigtable.v2.MutateRowsResponse.Entry build() {
         com.google.bigtable.v2.MutateRowsResponse.Entry result = buildPartial();
         if (!result.isInitialized()) {
@@ -527,7 +509,6 @@ public com.google.bigtable.v2.MutateRowsResponse.Entry build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.bigtable.v2.MutateRowsResponse.Entry buildPartial() {
         com.google.bigtable.v2.MutateRowsResponse.Entry result = new com.google.bigtable.v2.MutateRowsResponse.Entry(this);
         result.index_ = index_;
@@ -540,39 +521,32 @@ public com.google.bigtable.v2.MutateRowsResponse.Entry buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.bigtable.v2.MutateRowsResponse.Entry) {
           return mergeFrom((com.google.bigtable.v2.MutateRowsResponse.Entry)other);
@@ -595,12 +569,10 @@ public Builder mergeFrom(com.google.bigtable.v2.MutateRowsResponse.Entry other)
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -839,13 +811,11 @@ public com.google.rpc.StatusOrBuilder getStatusOrBuilder() {
         }
         return statusBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -867,12 +837,11 @@ public static com.google.bigtable.v2.MutateRowsResponse.Entry getDefaultInstance
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Entry parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Entry(input, extensionRegistry);
+          return new Entry(input, extensionRegistry);
       }
     };
 
@@ -885,7 +854,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.MutateRowsResponse.Entry getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -948,7 +916,6 @@ public com.google.bigtable.v2.MutateRowsResponse.EntryOrBuilder getEntriesOrBuil
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -958,7 +925,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < entries_.size(); i++) {
@@ -967,7 +933,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1085,7 +1050,6 @@ public static com.google.bigtable.v2.MutateRowsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1093,7 +1057,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.v2.MutateRowsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1121,7 +1084,6 @@ public static final class Builder extends
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_MutateRowsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_MutateRowsResponse_fieldAccessorTable
@@ -1145,7 +1107,6 @@ private void maybeForceBuilderInitialization() {
         getEntriesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (entriesBuilder_ == null) {
@@ -1157,18 +1118,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_MutateRowsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.MutateRowsResponse getDefaultInstanceForType() {
       return com.google.bigtable.v2.MutateRowsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.MutateRowsResponse build() {
       com.google.bigtable.v2.MutateRowsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -1177,7 +1135,6 @@ public com.google.bigtable.v2.MutateRowsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.MutateRowsResponse buildPartial() {
       com.google.bigtable.v2.MutateRowsResponse result = new com.google.bigtable.v2.MutateRowsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -1194,39 +1151,32 @@ public com.google.bigtable.v2.MutateRowsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.v2.MutateRowsResponse) {
         return mergeFrom((com.google.bigtable.v2.MutateRowsResponse)other);
@@ -1269,12 +1219,10 @@ public Builder mergeFrom(com.google.bigtable.v2.MutateRowsResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1605,13 +1553,11 @@ public com.google.bigtable.v2.MutateRowsResponse.Entry.Builder addEntriesBuilder
       }
       return entriesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1633,12 +1579,11 @@ public static com.google.bigtable.v2.MutateRowsResponse getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public MutateRowsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new MutateRowsResponse(input, extensionRegistry);
+        return new MutateRowsResponse(input, extensionRegistry);
     }
   };
 
@@ -1651,7 +1596,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.v2.MutateRowsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Mutation.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Mutation.java
index b428d24c1e0c..79ee175d3fbe 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Mutation.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Mutation.java
@@ -32,9 +32,6 @@ private Mutation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private Mutation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.bigtable.v2.Mutation.SetCell.Builder subBuilder = null;
             if (mutationCase_ == 1) {
@@ -102,13 +106,6 @@ private Mutation(
             mutationCase_ = 4;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -126,7 +123,6 @@ private Mutation(
     return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Mutation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Mutation_fieldAccessorTable
@@ -223,9 +219,6 @@ private SetCell(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -237,6 +230,13 @@ private SetCell(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -258,13 +258,6 @@ private SetCell(
               value_ = input.readBytes();
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -282,7 +275,6 @@ private SetCell(
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Mutation_SetCell_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Mutation_SetCell_fieldAccessorTable
@@ -379,7 +371,6 @@ public com.google.protobuf.ByteString getValue() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -389,7 +380,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getFamilyNameBytes().isEmpty()) {
@@ -407,7 +397,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -547,7 +536,6 @@ public static com.google.bigtable.v2.Mutation.SetCell parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -555,7 +543,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.bigtable.v2.Mutation.SetCell prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -583,7 +570,6 @@ public static final class Builder extends
         return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Mutation_SetCell_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Mutation_SetCell_fieldAccessorTable
@@ -606,7 +592,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         familyName_ = "";
@@ -620,18 +605,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Mutation_SetCell_descriptor;
       }
 
-      @java.lang.Override
       public com.google.bigtable.v2.Mutation.SetCell getDefaultInstanceForType() {
         return com.google.bigtable.v2.Mutation.SetCell.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.bigtable.v2.Mutation.SetCell build() {
         com.google.bigtable.v2.Mutation.SetCell result = buildPartial();
         if (!result.isInitialized()) {
@@ -640,7 +622,6 @@ public com.google.bigtable.v2.Mutation.SetCell build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.bigtable.v2.Mutation.SetCell buildPartial() {
         com.google.bigtable.v2.Mutation.SetCell result = new com.google.bigtable.v2.Mutation.SetCell(this);
         result.familyName_ = familyName_;
@@ -651,39 +632,32 @@ public com.google.bigtable.v2.Mutation.SetCell buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.bigtable.v2.Mutation.SetCell) {
           return mergeFrom((com.google.bigtable.v2.Mutation.SetCell)other);
@@ -713,12 +687,10 @@ public Builder mergeFrom(com.google.bigtable.v2.Mutation.SetCell other) {
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -965,13 +937,11 @@ public Builder clearValue() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -993,12 +963,11 @@ public static com.google.bigtable.v2.Mutation.SetCell getDefaultInstance() {
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public SetCell parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new SetCell(input, extensionRegistry);
+          return new SetCell(input, extensionRegistry);
       }
     };
 
@@ -1011,7 +980,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.Mutation.SetCell getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1109,9 +1077,6 @@ private DeleteFromColumn(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1123,6 +1088,13 @@ private DeleteFromColumn(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -1147,13 +1119,6 @@ private DeleteFromColumn(
 
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1171,7 +1136,6 @@ private DeleteFromColumn(
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Mutation_DeleteFromColumn_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Mutation_DeleteFromColumn_fieldAccessorTable
@@ -1271,7 +1235,6 @@ public com.google.bigtable.v2.TimestampRangeOrBuilder getTimeRangeOrBuilder() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1281,7 +1244,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getFamilyNameBytes().isEmpty()) {
@@ -1296,7 +1258,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -1432,7 +1393,6 @@ public static com.google.bigtable.v2.Mutation.DeleteFromColumn parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -1440,7 +1400,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.bigtable.v2.Mutation.DeleteFromColumn prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -1469,7 +1428,6 @@ public static final class Builder extends
         return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Mutation_DeleteFromColumn_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Mutation_DeleteFromColumn_fieldAccessorTable
@@ -1492,7 +1450,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         familyName_ = "";
@@ -1508,18 +1465,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Mutation_DeleteFromColumn_descriptor;
       }
 
-      @java.lang.Override
       public com.google.bigtable.v2.Mutation.DeleteFromColumn getDefaultInstanceForType() {
         return com.google.bigtable.v2.Mutation.DeleteFromColumn.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.bigtable.v2.Mutation.DeleteFromColumn build() {
         com.google.bigtable.v2.Mutation.DeleteFromColumn result = buildPartial();
         if (!result.isInitialized()) {
@@ -1528,7 +1482,6 @@ public com.google.bigtable.v2.Mutation.DeleteFromColumn build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.bigtable.v2.Mutation.DeleteFromColumn buildPartial() {
         com.google.bigtable.v2.Mutation.DeleteFromColumn result = new com.google.bigtable.v2.Mutation.DeleteFromColumn(this);
         result.familyName_ = familyName_;
@@ -1542,39 +1495,32 @@ public com.google.bigtable.v2.Mutation.DeleteFromColumn buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.bigtable.v2.Mutation.DeleteFromColumn) {
           return mergeFrom((com.google.bigtable.v2.Mutation.DeleteFromColumn)other);
@@ -1601,12 +1547,10 @@ public Builder mergeFrom(com.google.bigtable.v2.Mutation.DeleteFromColumn other)
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1915,13 +1859,11 @@ public com.google.bigtable.v2.TimestampRangeOrBuilder getTimeRangeOrBuilder() {
         }
         return timeRangeBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1943,12 +1885,11 @@ public static com.google.bigtable.v2.Mutation.DeleteFromColumn getDefaultInstanc
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public DeleteFromColumn parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new DeleteFromColumn(input, extensionRegistry);
+          return new DeleteFromColumn(input, extensionRegistry);
       }
     };
 
@@ -1961,7 +1902,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.Mutation.DeleteFromColumn getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -2022,9 +1962,6 @@ private DeleteFromFamily(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2036,12 +1973,6 @@ private DeleteFromFamily(
             case 0:
               done = true;
               break;
-            case 10: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              familyName_ = s;
-              break;
-            }
             default: {
               if (!parseUnknownFieldProto3(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -2049,6 +1980,12 @@ private DeleteFromFamily(
               }
               break;
             }
+            case 10: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              familyName_ = s;
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -2066,7 +2003,6 @@ private DeleteFromFamily(
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Mutation_DeleteFromFamily_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Mutation_DeleteFromFamily_fieldAccessorTable
@@ -2119,7 +2055,6 @@ public java.lang.String getFamilyName() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -2129,7 +2064,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getFamilyNameBytes().isEmpty()) {
@@ -2138,7 +2072,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -2253,7 +2186,6 @@ public static com.google.bigtable.v2.Mutation.DeleteFromFamily parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -2261,7 +2193,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.bigtable.v2.Mutation.DeleteFromFamily prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -2289,7 +2220,6 @@ public static final class Builder extends
         return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Mutation_DeleteFromFamily_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Mutation_DeleteFromFamily_fieldAccessorTable
@@ -2312,7 +2242,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         familyName_ = "";
@@ -2320,18 +2249,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Mutation_DeleteFromFamily_descriptor;
       }
 
-      @java.lang.Override
       public com.google.bigtable.v2.Mutation.DeleteFromFamily getDefaultInstanceForType() {
         return com.google.bigtable.v2.Mutation.DeleteFromFamily.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.bigtable.v2.Mutation.DeleteFromFamily build() {
         com.google.bigtable.v2.Mutation.DeleteFromFamily result = buildPartial();
         if (!result.isInitialized()) {
@@ -2340,7 +2266,6 @@ public com.google.bigtable.v2.Mutation.DeleteFromFamily build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.bigtable.v2.Mutation.DeleteFromFamily buildPartial() {
         com.google.bigtable.v2.Mutation.DeleteFromFamily result = new com.google.bigtable.v2.Mutation.DeleteFromFamily(this);
         result.familyName_ = familyName_;
@@ -2348,39 +2273,32 @@ public com.google.bigtable.v2.Mutation.DeleteFromFamily buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.bigtable.v2.Mutation.DeleteFromFamily) {
           return mergeFrom((com.google.bigtable.v2.Mutation.DeleteFromFamily)other);
@@ -2401,12 +2319,10 @@ public Builder mergeFrom(com.google.bigtable.v2.Mutation.DeleteFromFamily other)
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2518,13 +2434,11 @@ public Builder setFamilyNameBytes(
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -2546,12 +2460,11 @@ public static com.google.bigtable.v2.Mutation.DeleteFromFamily getDefaultInstanc
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public DeleteFromFamily parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new DeleteFromFamily(input, extensionRegistry);
+          return new DeleteFromFamily(input, extensionRegistry);
       }
     };
 
@@ -2564,7 +2477,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.Mutation.DeleteFromFamily getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -2604,9 +2516,6 @@ private DeleteFromRow(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -2641,7 +2550,6 @@ private DeleteFromRow(
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Mutation_DeleteFromRow_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Mutation_DeleteFromRow_fieldAccessorTable
@@ -2650,7 +2558,6 @@ private DeleteFromRow(
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -2660,13 +2567,11 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -2774,7 +2679,6 @@ public static com.google.bigtable.v2.Mutation.DeleteFromRow parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -2782,7 +2686,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.bigtable.v2.Mutation.DeleteFromRow prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -2810,7 +2713,6 @@ public static final class Builder extends
         return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Mutation_DeleteFromRow_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Mutation_DeleteFromRow_fieldAccessorTable
@@ -2833,24 +2735,20 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Mutation_DeleteFromRow_descriptor;
       }
 
-      @java.lang.Override
       public com.google.bigtable.v2.Mutation.DeleteFromRow getDefaultInstanceForType() {
         return com.google.bigtable.v2.Mutation.DeleteFromRow.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.bigtable.v2.Mutation.DeleteFromRow build() {
         com.google.bigtable.v2.Mutation.DeleteFromRow result = buildPartial();
         if (!result.isInitialized()) {
@@ -2859,46 +2757,38 @@ public com.google.bigtable.v2.Mutation.DeleteFromRow build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.bigtable.v2.Mutation.DeleteFromRow buildPartial() {
         com.google.bigtable.v2.Mutation.DeleteFromRow result = new com.google.bigtable.v2.Mutation.DeleteFromRow(this);
         onBuilt();
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.bigtable.v2.Mutation.DeleteFromRow) {
           return mergeFrom((com.google.bigtable.v2.Mutation.DeleteFromRow)other);
@@ -2915,12 +2805,10 @@ public Builder mergeFrom(com.google.bigtable.v2.Mutation.DeleteFromRow other) {
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2938,13 +2826,11 @@ public Builder mergeFrom(
         }
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -2966,12 +2852,11 @@ public static com.google.bigtable.v2.Mutation.DeleteFromRow getDefaultInstance()
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public DeleteFromRow parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new DeleteFromRow(input, extensionRegistry);
+          return new DeleteFromRow(input, extensionRegistry);
       }
     };
 
@@ -2984,7 +2869,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.Mutation.DeleteFromRow getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -3186,7 +3070,6 @@ public com.google.bigtable.v2.Mutation.DeleteFromRowOrBuilder getDeleteFromRowOr
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -3196,7 +3079,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (mutationCase_ == 1) {
@@ -3214,7 +3096,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -3381,7 +3262,6 @@ public static com.google.bigtable.v2.Mutation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -3389,7 +3269,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.v2.Mutation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -3417,7 +3296,6 @@ public static final class Builder extends
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Mutation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Mutation_fieldAccessorTable
@@ -3440,7 +3318,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       mutationCase_ = 0;
@@ -3448,18 +3325,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Mutation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.Mutation getDefaultInstanceForType() {
       return com.google.bigtable.v2.Mutation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.Mutation build() {
       com.google.bigtable.v2.Mutation result = buildPartial();
       if (!result.isInitialized()) {
@@ -3468,7 +3342,6 @@ public com.google.bigtable.v2.Mutation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.Mutation buildPartial() {
       com.google.bigtable.v2.Mutation result = new com.google.bigtable.v2.Mutation(this);
       if (mutationCase_ == 1) {
@@ -3504,39 +3377,32 @@ public com.google.bigtable.v2.Mutation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.v2.Mutation) {
         return mergeFrom((com.google.bigtable.v2.Mutation)other);
@@ -3574,12 +3440,10 @@ public Builder mergeFrom(com.google.bigtable.v2.Mutation other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4300,13 +4164,11 @@ public com.google.bigtable.v2.Mutation.DeleteFromRowOrBuilder getDeleteFromRowOr
       onChanged();;
       return deleteFromRowBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -4328,12 +4190,11 @@ public static com.google.bigtable.v2.Mutation getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Mutation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Mutation(input, extensionRegistry);
+        return new Mutation(input, extensionRegistry);
     }
   };
 
@@ -4346,7 +4207,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.v2.Mutation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowRequest.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowRequest.java
index aa0dd9cf604c..720adf0d11d5 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowRequest.java
@@ -36,9 +36,6 @@ private ReadModifyWriteRowRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private ReadModifyWriteRowRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -76,13 +80,6 @@ private ReadModifyWriteRowRequest(
             appProfileId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private ReadModifyWriteRowRequest(
     return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_ReadModifyWriteRowRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_ReadModifyWriteRowRequest_fieldAccessorTable
@@ -283,7 +279,6 @@ public com.google.bigtable.v2.ReadModifyWriteRuleOrBuilder getRulesOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -293,7 +288,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getTableNameBytes().isEmpty()) {
@@ -311,7 +305,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -451,7 +444,6 @@ public static com.google.bigtable.v2.ReadModifyWriteRowRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -459,7 +451,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.v2.ReadModifyWriteRowRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -487,7 +478,6 @@ public static final class Builder extends
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_ReadModifyWriteRowRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_ReadModifyWriteRowRequest_fieldAccessorTable
@@ -511,7 +501,6 @@ private void maybeForceBuilderInitialization() {
         getRulesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       tableName_ = "";
@@ -529,18 +518,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_ReadModifyWriteRowRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.ReadModifyWriteRowRequest getDefaultInstanceForType() {
       return com.google.bigtable.v2.ReadModifyWriteRowRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.ReadModifyWriteRowRequest build() {
       com.google.bigtable.v2.ReadModifyWriteRowRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -549,7 +535,6 @@ public com.google.bigtable.v2.ReadModifyWriteRowRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.ReadModifyWriteRowRequest buildPartial() {
       com.google.bigtable.v2.ReadModifyWriteRowRequest result = new com.google.bigtable.v2.ReadModifyWriteRowRequest(this);
       int from_bitField0_ = bitField0_;
@@ -571,39 +556,32 @@ public com.google.bigtable.v2.ReadModifyWriteRowRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.v2.ReadModifyWriteRowRequest) {
         return mergeFrom((com.google.bigtable.v2.ReadModifyWriteRowRequest)other);
@@ -657,12 +635,10 @@ public Builder mergeFrom(com.google.bigtable.v2.ReadModifyWriteRowRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1268,13 +1244,11 @@ public com.google.bigtable.v2.ReadModifyWriteRule.Builder addRulesBuilder(
       }
       return rulesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1296,12 +1270,11 @@ public static com.google.bigtable.v2.ReadModifyWriteRowRequest getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ReadModifyWriteRowRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReadModifyWriteRowRequest(input, extensionRegistry);
+        return new ReadModifyWriteRowRequest(input, extensionRegistry);
     }
   };
 
@@ -1314,7 +1287,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.v2.ReadModifyWriteRowRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowResponse.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowResponse.java
index d19c80e6c4ad..e2d9741940f1 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowResponse.java
@@ -32,9 +32,6 @@ private ReadModifyWriteRowResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private ReadModifyWriteRowResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.bigtable.v2.Row.Builder subBuilder = null;
             if (row_ != null) {
@@ -59,13 +63,6 @@ private ReadModifyWriteRowResponse(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private ReadModifyWriteRowResponse(
     return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_ReadModifyWriteRowResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_ReadModifyWriteRowResponse_fieldAccessorTable
@@ -125,7 +121,6 @@ public com.google.bigtable.v2.RowOrBuilder getRowOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -135,7 +130,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (row_ != null) {
@@ -144,7 +138,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static com.google.bigtable.v2.ReadModifyWriteRowResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.v2.ReadModifyWriteRowResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_ReadModifyWriteRowResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_ReadModifyWriteRowResponse_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (rowBuilder_ == null) {
@@ -336,18 +325,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_ReadModifyWriteRowResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.ReadModifyWriteRowResponse getDefaultInstanceForType() {
       return com.google.bigtable.v2.ReadModifyWriteRowResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.ReadModifyWriteRowResponse build() {
       com.google.bigtable.v2.ReadModifyWriteRowResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -356,7 +342,6 @@ public com.google.bigtable.v2.ReadModifyWriteRowResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.ReadModifyWriteRowResponse buildPartial() {
       com.google.bigtable.v2.ReadModifyWriteRowResponse result = new com.google.bigtable.v2.ReadModifyWriteRowResponse(this);
       if (rowBuilder_ == null) {
@@ -368,39 +353,32 @@ public com.google.bigtable.v2.ReadModifyWriteRowResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.v2.ReadModifyWriteRowResponse) {
         return mergeFrom((com.google.bigtable.v2.ReadModifyWriteRowResponse)other);
@@ -420,12 +398,10 @@ public Builder mergeFrom(com.google.bigtable.v2.ReadModifyWriteRowResponse other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -596,13 +572,11 @@ public com.google.bigtable.v2.RowOrBuilder getRowOrBuilder() {
       }
       return rowBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -624,12 +598,11 @@ public static com.google.bigtable.v2.ReadModifyWriteRowResponse getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ReadModifyWriteRowResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReadModifyWriteRowResponse(input, extensionRegistry);
+        return new ReadModifyWriteRowResponse(input, extensionRegistry);
     }
   };
 
@@ -642,7 +615,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.v2.ReadModifyWriteRowResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRule.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRule.java
index d7b4574e8574..97e6a916dee4 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRule.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRule.java
@@ -35,9 +35,6 @@ private ReadModifyWriteRule(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ReadModifyWriteRule(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -70,13 +74,6 @@ private ReadModifyWriteRule(
             rule_ = input.readInt64();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -94,7 +91,6 @@ private ReadModifyWriteRule(
     return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_ReadModifyWriteRule_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_ReadModifyWriteRule_fieldAccessorTable
@@ -235,7 +231,6 @@ public long getIncrementAmount() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -245,7 +240,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getFamilyNameBytes().isEmpty()) {
@@ -265,7 +259,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -426,7 +419,6 @@ public static com.google.bigtable.v2.ReadModifyWriteRule parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -434,7 +426,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.v2.ReadModifyWriteRule prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -463,7 +454,6 @@ public static final class Builder extends
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_ReadModifyWriteRule_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_ReadModifyWriteRule_fieldAccessorTable
@@ -486,7 +476,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       familyName_ = "";
@@ -498,18 +487,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_ReadModifyWriteRule_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.ReadModifyWriteRule getDefaultInstanceForType() {
       return com.google.bigtable.v2.ReadModifyWriteRule.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.ReadModifyWriteRule build() {
       com.google.bigtable.v2.ReadModifyWriteRule result = buildPartial();
       if (!result.isInitialized()) {
@@ -518,7 +504,6 @@ public com.google.bigtable.v2.ReadModifyWriteRule build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.ReadModifyWriteRule buildPartial() {
       com.google.bigtable.v2.ReadModifyWriteRule result = new com.google.bigtable.v2.ReadModifyWriteRule(this);
       result.familyName_ = familyName_;
@@ -534,39 +519,32 @@ public com.google.bigtable.v2.ReadModifyWriteRule buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.v2.ReadModifyWriteRule) {
         return mergeFrom((com.google.bigtable.v2.ReadModifyWriteRule)other);
@@ -603,12 +581,10 @@ public Builder mergeFrom(com.google.bigtable.v2.ReadModifyWriteRule other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -884,13 +860,11 @@ public Builder clearIncrementAmount() {
       }
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -912,12 +886,11 @@ public static com.google.bigtable.v2.ReadModifyWriteRule getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ReadModifyWriteRule parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReadModifyWriteRule(input, extensionRegistry);
+        return new ReadModifyWriteRule(input, extensionRegistry);
     }
   };
 
@@ -930,7 +903,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.v2.ReadModifyWriteRule getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsRequest.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsRequest.java
index 3f5fe4e616be..cb400e6fd80b 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsRequest.java
@@ -35,9 +35,6 @@ private ReadRowsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ReadRowsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -92,13 +96,6 @@ private ReadRowsRequest(
             appProfileId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -116,7 +113,6 @@ private ReadRowsRequest(
     return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_ReadRowsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_ReadRowsRequest_fieldAccessorTable
@@ -298,7 +294,6 @@ public long getRowsLimit() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -308,7 +303,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getTableNameBytes().isEmpty()) {
@@ -329,7 +323,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -486,7 +479,6 @@ public static com.google.bigtable.v2.ReadRowsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -494,7 +486,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.v2.ReadRowsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -522,7 +513,6 @@ public static final class Builder extends
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_ReadRowsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_ReadRowsRequest_fieldAccessorTable
@@ -545,7 +535,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       tableName_ = "";
@@ -569,18 +558,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_ReadRowsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.ReadRowsRequest getDefaultInstanceForType() {
       return com.google.bigtable.v2.ReadRowsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.ReadRowsRequest build() {
       com.google.bigtable.v2.ReadRowsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -589,7 +575,6 @@ public com.google.bigtable.v2.ReadRowsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.ReadRowsRequest buildPartial() {
       com.google.bigtable.v2.ReadRowsRequest result = new com.google.bigtable.v2.ReadRowsRequest(this);
       result.tableName_ = tableName_;
@@ -609,39 +594,32 @@ public com.google.bigtable.v2.ReadRowsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.v2.ReadRowsRequest) {
         return mergeFrom((com.google.bigtable.v2.ReadRowsRequest)other);
@@ -675,12 +653,10 @@ public Builder mergeFrom(com.google.bigtable.v2.ReadRowsRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1247,13 +1223,11 @@ public Builder clearRowsLimit() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1275,12 +1249,11 @@ public static com.google.bigtable.v2.ReadRowsRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ReadRowsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReadRowsRequest(input, extensionRegistry);
+        return new ReadRowsRequest(input, extensionRegistry);
     }
   };
 
@@ -1293,7 +1266,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.v2.ReadRowsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsResponse.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsResponse.java
index d2e4794c37ca..e3b59a2e539a 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsResponse.java
@@ -34,9 +34,6 @@ private ReadRowsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ReadRowsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               chunks_ = new java.util.ArrayList();
@@ -62,13 +66,6 @@ private ReadRowsResponse(
             lastScannedRowKey_ = input.readBytes();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -89,7 +86,6 @@ private ReadRowsResponse(
     return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_ReadRowsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_ReadRowsResponse_fieldAccessorTable
@@ -331,9 +327,6 @@ private CellChunk(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -345,6 +338,13 @@ private CellChunk(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
 
               rowKey_ = input.readBytes();
@@ -410,13 +410,6 @@ private CellChunk(
               rowStatus_ = input.readBool();
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -437,7 +430,6 @@ private CellChunk(
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_ReadRowsResponse_CellChunk_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_ReadRowsResponse_CellChunk_fieldAccessorTable
@@ -732,7 +724,6 @@ public boolean getCommitRow() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -742,7 +733,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!rowKey_.isEmpty()) {
@@ -777,7 +767,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -997,7 +986,6 @@ public static com.google.bigtable.v2.ReadRowsResponse.CellChunk parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -1005,7 +993,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.bigtable.v2.ReadRowsResponse.CellChunk prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -1034,7 +1021,6 @@ public static final class Builder extends
         return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_ReadRowsResponse_CellChunk_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_ReadRowsResponse_CellChunk_fieldAccessorTable
@@ -1057,7 +1043,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         rowKey_ = com.google.protobuf.ByteString.EMPTY;
@@ -1087,18 +1072,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_ReadRowsResponse_CellChunk_descriptor;
       }
 
-      @java.lang.Override
       public com.google.bigtable.v2.ReadRowsResponse.CellChunk getDefaultInstanceForType() {
         return com.google.bigtable.v2.ReadRowsResponse.CellChunk.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.bigtable.v2.ReadRowsResponse.CellChunk build() {
         com.google.bigtable.v2.ReadRowsResponse.CellChunk result = buildPartial();
         if (!result.isInitialized()) {
@@ -1107,7 +1089,6 @@ public com.google.bigtable.v2.ReadRowsResponse.CellChunk build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.bigtable.v2.ReadRowsResponse.CellChunk buildPartial() {
         com.google.bigtable.v2.ReadRowsResponse.CellChunk result = new com.google.bigtable.v2.ReadRowsResponse.CellChunk(this);
         int from_bitField0_ = bitField0_;
@@ -1143,39 +1124,32 @@ public com.google.bigtable.v2.ReadRowsResponse.CellChunk buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.bigtable.v2.ReadRowsResponse.CellChunk) {
           return mergeFrom((com.google.bigtable.v2.ReadRowsResponse.CellChunk)other);
@@ -1233,12 +1207,10 @@ public Builder mergeFrom(com.google.bigtable.v2.ReadRowsResponse.CellChunk other
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2106,13 +2078,11 @@ public Builder clearCommitRow() {
         }
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -2134,12 +2104,11 @@ public static com.google.bigtable.v2.ReadRowsResponse.CellChunk getDefaultInstan
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public CellChunk parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new CellChunk(input, extensionRegistry);
+          return new CellChunk(input, extensionRegistry);
       }
     };
 
@@ -2152,7 +2121,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.ReadRowsResponse.CellChunk getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -2215,7 +2183,6 @@ public com.google.protobuf.ByteString getLastScannedRowKey() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -2225,7 +2192,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < chunks_.size(); i++) {
@@ -2237,7 +2203,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -2363,7 +2328,6 @@ public static com.google.bigtable.v2.ReadRowsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -2371,7 +2335,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.v2.ReadRowsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -2399,7 +2362,6 @@ public static final class Builder extends
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_ReadRowsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_ReadRowsResponse_fieldAccessorTable
@@ -2423,7 +2385,6 @@ private void maybeForceBuilderInitialization() {
         getChunksFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (chunksBuilder_ == null) {
@@ -2437,18 +2398,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_ReadRowsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.ReadRowsResponse getDefaultInstanceForType() {
       return com.google.bigtable.v2.ReadRowsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.ReadRowsResponse build() {
       com.google.bigtable.v2.ReadRowsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -2457,7 +2415,6 @@ public com.google.bigtable.v2.ReadRowsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.ReadRowsResponse buildPartial() {
       com.google.bigtable.v2.ReadRowsResponse result = new com.google.bigtable.v2.ReadRowsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -2477,39 +2434,32 @@ public com.google.bigtable.v2.ReadRowsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.v2.ReadRowsResponse) {
         return mergeFrom((com.google.bigtable.v2.ReadRowsResponse)other);
@@ -2555,12 +2505,10 @@ public Builder mergeFrom(com.google.bigtable.v2.ReadRowsResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2878,13 +2826,11 @@ public Builder clearLastScannedRowKey() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2906,12 +2852,11 @@ public static com.google.bigtable.v2.ReadRowsResponse getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ReadRowsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReadRowsResponse(input, extensionRegistry);
+        return new ReadRowsResponse(input, extensionRegistry);
     }
   };
 
@@ -2924,7 +2869,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.v2.ReadRowsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Row.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Row.java
index c4ec22d5dbb8..acf007311031 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Row.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Row.java
@@ -35,9 +35,6 @@ private Row(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private Row(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
 
             key_ = input.readBytes();
@@ -63,13 +67,6 @@ private Row(
                 input.readMessage(com.google.bigtable.v2.Family.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private Row(
     return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Row_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Row_fieldAccessorTable
@@ -175,7 +171,6 @@ public com.google.bigtable.v2.FamilyOrBuilder getFamiliesOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -185,7 +180,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!key_.isEmpty()) {
@@ -197,7 +191,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -323,7 +316,6 @@ public static com.google.bigtable.v2.Row parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -331,7 +323,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.v2.Row prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -360,7 +351,6 @@ public static final class Builder extends
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Row_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Row_fieldAccessorTable
@@ -384,7 +374,6 @@ private void maybeForceBuilderInitialization() {
         getFamiliesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       key_ = com.google.protobuf.ByteString.EMPTY;
@@ -398,18 +387,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_Row_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.Row getDefaultInstanceForType() {
       return com.google.bigtable.v2.Row.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.Row build() {
       com.google.bigtable.v2.Row result = buildPartial();
       if (!result.isInitialized()) {
@@ -418,7 +404,6 @@ public com.google.bigtable.v2.Row build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.Row buildPartial() {
       com.google.bigtable.v2.Row result = new com.google.bigtable.v2.Row(this);
       int from_bitField0_ = bitField0_;
@@ -438,39 +423,32 @@ public com.google.bigtable.v2.Row buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.v2.Row) {
         return mergeFrom((com.google.bigtable.v2.Row)other);
@@ -516,12 +494,10 @@ public Builder mergeFrom(com.google.bigtable.v2.Row other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -917,13 +893,11 @@ public com.google.bigtable.v2.Family.Builder addFamiliesBuilder(
       }
       return familiesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -945,12 +919,11 @@ public static com.google.bigtable.v2.Row getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Row parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Row(input, extensionRegistry);
+        return new Row(input, extensionRegistry);
     }
   };
 
@@ -963,7 +936,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.v2.Row getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowFilter.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowFilter.java
index 5e52fd1ccc0d..abec9a5916a4 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowFilter.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowFilter.java
@@ -59,9 +59,6 @@ private RowFilter(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -73,6 +70,13 @@ private RowFilter(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.bigtable.v2.RowFilter.Chain.Builder subBuilder = null;
             if (filterCase_ == 1) {
@@ -224,13 +228,6 @@ private RowFilter(
             filter_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -248,7 +245,6 @@ private RowFilter(
     return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_RowFilter_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_RowFilter_fieldAccessorTable
@@ -344,9 +340,6 @@ private Chain(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -358,6 +351,13 @@ private Chain(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
                 filters_ = new java.util.ArrayList();
@@ -367,13 +367,6 @@ private Chain(
                   input.readMessage(com.google.bigtable.v2.RowFilter.parser(), extensionRegistry));
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -394,7 +387,6 @@ private Chain(
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_RowFilter_Chain_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_RowFilter_Chain_fieldAccessorTable
@@ -468,7 +460,6 @@ public com.google.bigtable.v2.RowFilterOrBuilder getFiltersOrBuilder(
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -478,7 +469,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < filters_.size(); i++) {
@@ -487,7 +477,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -605,7 +594,6 @@ public static com.google.bigtable.v2.RowFilter.Chain parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -613,7 +601,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.bigtable.v2.RowFilter.Chain prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -641,7 +628,6 @@ public static final class Builder extends
         return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_RowFilter_Chain_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_RowFilter_Chain_fieldAccessorTable
@@ -665,7 +651,6 @@ private void maybeForceBuilderInitialization() {
           getFiltersFieldBuilder();
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         if (filtersBuilder_ == null) {
@@ -677,18 +662,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_RowFilter_Chain_descriptor;
       }
 
-      @java.lang.Override
       public com.google.bigtable.v2.RowFilter.Chain getDefaultInstanceForType() {
         return com.google.bigtable.v2.RowFilter.Chain.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.bigtable.v2.RowFilter.Chain build() {
         com.google.bigtable.v2.RowFilter.Chain result = buildPartial();
         if (!result.isInitialized()) {
@@ -697,7 +679,6 @@ public com.google.bigtable.v2.RowFilter.Chain build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.bigtable.v2.RowFilter.Chain buildPartial() {
         com.google.bigtable.v2.RowFilter.Chain result = new com.google.bigtable.v2.RowFilter.Chain(this);
         int from_bitField0_ = bitField0_;
@@ -714,39 +695,32 @@ public com.google.bigtable.v2.RowFilter.Chain buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.bigtable.v2.RowFilter.Chain) {
           return mergeFrom((com.google.bigtable.v2.RowFilter.Chain)other);
@@ -789,12 +763,10 @@ public Builder mergeFrom(com.google.bigtable.v2.RowFilter.Chain other) {
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1161,13 +1133,11 @@ public com.google.bigtable.v2.RowFilter.Builder addFiltersBuilder(
         }
         return filtersBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1189,12 +1159,11 @@ public static com.google.bigtable.v2.RowFilter.Chain getDefaultInstance() {
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Chain parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Chain(input, extensionRegistry);
+          return new Chain(input, extensionRegistry);
       }
     };
 
@@ -1207,7 +1176,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.RowFilter.Chain getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1403,9 +1371,6 @@ private Interleave(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1417,6 +1382,13 @@ private Interleave(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
                 filters_ = new java.util.ArrayList();
@@ -1426,13 +1398,6 @@ private Interleave(
                   input.readMessage(com.google.bigtable.v2.RowFilter.parser(), extensionRegistry));
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1453,7 +1418,6 @@ private Interleave(
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_RowFilter_Interleave_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_RowFilter_Interleave_fieldAccessorTable
@@ -1627,7 +1591,6 @@ public com.google.bigtable.v2.RowFilterOrBuilder getFiltersOrBuilder(
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1637,7 +1600,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < filters_.size(); i++) {
@@ -1646,7 +1608,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -1764,7 +1725,6 @@ public static com.google.bigtable.v2.RowFilter.Interleave parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -1772,7 +1732,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.bigtable.v2.RowFilter.Interleave prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -1801,7 +1760,6 @@ public static final class Builder extends
         return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_RowFilter_Interleave_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_RowFilter_Interleave_fieldAccessorTable
@@ -1825,7 +1783,6 @@ private void maybeForceBuilderInitialization() {
           getFiltersFieldBuilder();
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         if (filtersBuilder_ == null) {
@@ -1837,18 +1794,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_RowFilter_Interleave_descriptor;
       }
 
-      @java.lang.Override
       public com.google.bigtable.v2.RowFilter.Interleave getDefaultInstanceForType() {
         return com.google.bigtable.v2.RowFilter.Interleave.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.bigtable.v2.RowFilter.Interleave build() {
         com.google.bigtable.v2.RowFilter.Interleave result = buildPartial();
         if (!result.isInitialized()) {
@@ -1857,7 +1811,6 @@ public com.google.bigtable.v2.RowFilter.Interleave build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.bigtable.v2.RowFilter.Interleave buildPartial() {
         com.google.bigtable.v2.RowFilter.Interleave result = new com.google.bigtable.v2.RowFilter.Interleave(this);
         int from_bitField0_ = bitField0_;
@@ -1874,39 +1827,32 @@ public com.google.bigtable.v2.RowFilter.Interleave buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.bigtable.v2.RowFilter.Interleave) {
           return mergeFrom((com.google.bigtable.v2.RowFilter.Interleave)other);
@@ -1949,12 +1895,10 @@ public Builder mergeFrom(com.google.bigtable.v2.RowFilter.Interleave other) {
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2681,13 +2625,11 @@ public com.google.bigtable.v2.RowFilter.Builder addFiltersBuilder(
         }
         return filtersBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -2709,12 +2651,11 @@ public static com.google.bigtable.v2.RowFilter.Interleave getDefaultInstance() {
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Interleave parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Interleave(input, extensionRegistry);
+          return new Interleave(input, extensionRegistry);
       }
     };
 
@@ -2727,7 +2668,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.RowFilter.Interleave getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -2859,9 +2799,6 @@ private Condition(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2873,6 +2810,13 @@ private Condition(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               com.google.bigtable.v2.RowFilter.Builder subBuilder = null;
               if (predicateFilter_ != null) {
@@ -2912,13 +2856,6 @@ private Condition(
 
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -2936,7 +2873,6 @@ private Condition(
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_RowFilter_Condition_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_RowFilter_Condition_fieldAccessorTable
@@ -3056,7 +2992,6 @@ public com.google.bigtable.v2.RowFilterOrBuilder getFalseFilterOrBuilder() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -3066,7 +3001,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (predicateFilter_ != null) {
@@ -3081,7 +3015,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -3228,7 +3161,6 @@ public static com.google.bigtable.v2.RowFilter.Condition parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -3236,7 +3168,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.bigtable.v2.RowFilter.Condition prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -3269,7 +3200,6 @@ public static final class Builder extends
         return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_RowFilter_Condition_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_RowFilter_Condition_fieldAccessorTable
@@ -3292,7 +3222,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         if (predicateFilterBuilder_ == null) {
@@ -3316,18 +3245,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_RowFilter_Condition_descriptor;
       }
 
-      @java.lang.Override
       public com.google.bigtable.v2.RowFilter.Condition getDefaultInstanceForType() {
         return com.google.bigtable.v2.RowFilter.Condition.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.bigtable.v2.RowFilter.Condition build() {
         com.google.bigtable.v2.RowFilter.Condition result = buildPartial();
         if (!result.isInitialized()) {
@@ -3336,7 +3262,6 @@ public com.google.bigtable.v2.RowFilter.Condition build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.bigtable.v2.RowFilter.Condition buildPartial() {
         com.google.bigtable.v2.RowFilter.Condition result = new com.google.bigtable.v2.RowFilter.Condition(this);
         if (predicateFilterBuilder_ == null) {
@@ -3358,39 +3283,32 @@ public com.google.bigtable.v2.RowFilter.Condition buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.bigtable.v2.RowFilter.Condition) {
           return mergeFrom((com.google.bigtable.v2.RowFilter.Condition)other);
@@ -3416,12 +3334,10 @@ public Builder mergeFrom(com.google.bigtable.v2.RowFilter.Condition other) {
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3934,13 +3850,11 @@ public com.google.bigtable.v2.RowFilterOrBuilder getFalseFilterOrBuilder() {
         }
         return falseFilterBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -3962,12 +3876,11 @@ public static com.google.bigtable.v2.RowFilter.Condition getDefaultInstance() {
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Condition parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Condition(input, extensionRegistry);
+          return new Condition(input, extensionRegistry);
       }
     };
 
@@ -3980,7 +3893,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.RowFilter.Condition getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -4674,7 +4586,6 @@ public java.lang.String getApplyLabelTransformer() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -4684,7 +4595,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (filterCase_ == 1) {
@@ -4758,7 +4668,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -5121,7 +5030,6 @@ public static com.google.bigtable.v2.RowFilter parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -5129,7 +5037,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.v2.RowFilter prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -5184,7 +5091,6 @@ public static final class Builder extends
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_RowFilter_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_RowFilter_fieldAccessorTable
@@ -5207,7 +5113,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       filterCase_ = 0;
@@ -5215,18 +5120,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_RowFilter_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.RowFilter getDefaultInstanceForType() {
       return com.google.bigtable.v2.RowFilter.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.RowFilter build() {
       com.google.bigtable.v2.RowFilter result = buildPartial();
       if (!result.isInitialized()) {
@@ -5235,7 +5137,6 @@ public com.google.bigtable.v2.RowFilter build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.RowFilter buildPartial() {
       com.google.bigtable.v2.RowFilter result = new com.google.bigtable.v2.RowFilter(this);
       if (filterCase_ == 1) {
@@ -5324,39 +5225,32 @@ public com.google.bigtable.v2.RowFilter buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.v2.RowFilter) {
         return mergeFrom((com.google.bigtable.v2.RowFilter)other);
@@ -5458,12 +5352,10 @@ public Builder mergeFrom(com.google.bigtable.v2.RowFilter other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -7541,13 +7433,11 @@ public Builder setApplyLabelTransformerBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -7569,12 +7459,11 @@ public static com.google.bigtable.v2.RowFilter getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RowFilter parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RowFilter(input, extensionRegistry);
+        return new RowFilter(input, extensionRegistry);
     }
   };
 
@@ -7587,7 +7476,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.v2.RowFilter getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowRange.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowRange.java
index 624b02f9dfd8..b7d94fafa71a 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowRange.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowRange.java
@@ -32,9 +32,6 @@ private RowRange(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private RowRange(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             startKeyCase_ = 1;
             startKey_ = input.readBytes();
@@ -66,13 +70,6 @@ private RowRange(
             endKey_ = input.readBytes();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private RowRange(
     return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_RowRange_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_RowRange_fieldAccessorTable
@@ -235,7 +231,6 @@ public com.google.protobuf.ByteString getEndKeyClosed() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -245,7 +240,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (startKeyCase_ == 1) {
@@ -267,7 +261,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -449,7 +442,6 @@ public static com.google.bigtable.v2.RowRange parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -457,7 +449,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.v2.RowRange prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -485,7 +476,6 @@ public static final class Builder extends
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_RowRange_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_RowRange_fieldAccessorTable
@@ -508,7 +498,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       startKeyCase_ = 0;
@@ -518,18 +507,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_RowRange_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.RowRange getDefaultInstanceForType() {
       return com.google.bigtable.v2.RowRange.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.RowRange build() {
       com.google.bigtable.v2.RowRange result = buildPartial();
       if (!result.isInitialized()) {
@@ -538,7 +524,6 @@ public com.google.bigtable.v2.RowRange build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.RowRange buildPartial() {
       com.google.bigtable.v2.RowRange result = new com.google.bigtable.v2.RowRange(this);
       if (startKeyCase_ == 1) {
@@ -559,39 +544,32 @@ public com.google.bigtable.v2.RowRange buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.v2.RowRange) {
         return mergeFrom((com.google.bigtable.v2.RowRange)other);
@@ -634,12 +612,10 @@ public Builder mergeFrom(com.google.bigtable.v2.RowRange other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -867,13 +843,11 @@ public Builder clearEndKeyClosed() {
       }
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -895,12 +869,11 @@ public static com.google.bigtable.v2.RowRange getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RowRange parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RowRange(input, extensionRegistry);
+        return new RowRange(input, extensionRegistry);
     }
   };
 
@@ -913,7 +886,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.v2.RowRange getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowSet.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowSet.java
index dea072f29f58..b9f053098ec0 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowSet.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowSet.java
@@ -34,9 +34,6 @@ private RowSet(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private RowSet(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               rowKeys_ = new java.util.ArrayList();
@@ -65,13 +69,6 @@ private RowSet(
                 input.readMessage(com.google.bigtable.v2.RowRange.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -95,7 +92,6 @@ private RowSet(
     return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_RowSet_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_RowSet_fieldAccessorTable
@@ -193,7 +189,6 @@ public com.google.bigtable.v2.RowRangeOrBuilder getRowRangesOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -203,7 +198,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < rowKeys_.size(); i++) {
@@ -215,7 +209,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.bigtable.v2.RowSet parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.v2.RowSet prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_RowSet_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_RowSet_fieldAccessorTable
@@ -408,7 +398,6 @@ private void maybeForceBuilderInitialization() {
         getRowRangesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       rowKeys_ = java.util.Collections.emptyList();
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_RowSet_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.RowSet getDefaultInstanceForType() {
       return com.google.bigtable.v2.RowSet.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.RowSet build() {
       com.google.bigtable.v2.RowSet result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public com.google.bigtable.v2.RowSet build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.RowSet buildPartial() {
       com.google.bigtable.v2.RowSet result = new com.google.bigtable.v2.RowSet(this);
       int from_bitField0_ = bitField0_;
@@ -464,39 +449,32 @@ public com.google.bigtable.v2.RowSet buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.v2.RowSet) {
         return mergeFrom((com.google.bigtable.v2.RowSet)other);
@@ -549,12 +527,10 @@ public Builder mergeFrom(com.google.bigtable.v2.RowSet other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -985,13 +961,11 @@ public com.google.bigtable.v2.RowRange.Builder addRowRangesBuilder(
       }
       return rowRangesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1013,12 +987,11 @@ public static com.google.bigtable.v2.RowSet getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RowSet parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RowSet(input, extensionRegistry);
+        return new RowSet(input, extensionRegistry);
     }
   };
 
@@ -1031,7 +1004,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.v2.RowSet getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysRequest.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysRequest.java
index ae28a2396fa2..4edbb7e3ae6d 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysRequest.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysRequest.java
@@ -34,9 +34,6 @@ private SampleRowKeysRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private SampleRowKeysRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private SampleRowKeysRequest(
             appProfileId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private SampleRowKeysRequest(
     return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_SampleRowKeysRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_SampleRowKeysRequest_fieldAccessorTable
@@ -183,7 +179,6 @@ public java.lang.String getAppProfileId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -193,7 +188,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getTableNameBytes().isEmpty()) {
@@ -205,7 +199,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -327,7 +320,6 @@ public static com.google.bigtable.v2.SampleRowKeysRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -335,7 +327,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.v2.SampleRowKeysRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -363,7 +354,6 @@ public static final class Builder extends
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_SampleRowKeysRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_SampleRowKeysRequest_fieldAccessorTable
@@ -386,7 +376,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       tableName_ = "";
@@ -396,18 +385,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_SampleRowKeysRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.SampleRowKeysRequest getDefaultInstanceForType() {
       return com.google.bigtable.v2.SampleRowKeysRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.SampleRowKeysRequest build() {
       com.google.bigtable.v2.SampleRowKeysRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -416,7 +402,6 @@ public com.google.bigtable.v2.SampleRowKeysRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.SampleRowKeysRequest buildPartial() {
       com.google.bigtable.v2.SampleRowKeysRequest result = new com.google.bigtable.v2.SampleRowKeysRequest(this);
       result.tableName_ = tableName_;
@@ -425,39 +410,32 @@ public com.google.bigtable.v2.SampleRowKeysRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.v2.SampleRowKeysRequest) {
         return mergeFrom((com.google.bigtable.v2.SampleRowKeysRequest)other);
@@ -482,12 +460,10 @@ public Builder mergeFrom(com.google.bigtable.v2.SampleRowKeysRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -698,13 +674,11 @@ public Builder setAppProfileIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -726,12 +700,11 @@ public static com.google.bigtable.v2.SampleRowKeysRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SampleRowKeysRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SampleRowKeysRequest(input, extensionRegistry);
+        return new SampleRowKeysRequest(input, extensionRegistry);
     }
   };
 
@@ -744,7 +717,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.v2.SampleRowKeysRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysResponse.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysResponse.java
index 5ef0d3af6cc9..7477200ca710 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysResponse.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysResponse.java
@@ -34,9 +34,6 @@ private SampleRowKeysResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private SampleRowKeysResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
 
             rowKey_ = input.readBytes();
@@ -58,13 +62,6 @@ private SampleRowKeysResponse(
             offsetBytes_ = input.readInt64();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -82,7 +79,6 @@ private SampleRowKeysResponse(
     return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_SampleRowKeysResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_SampleRowKeysResponse_fieldAccessorTable
@@ -126,7 +122,6 @@ public long getOffsetBytes() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -136,7 +131,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!rowKey_.isEmpty()) {
@@ -148,7 +142,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -273,7 +266,6 @@ public static com.google.bigtable.v2.SampleRowKeysResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -281,7 +273,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.v2.SampleRowKeysResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -309,7 +300,6 @@ public static final class Builder extends
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_SampleRowKeysResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_SampleRowKeysResponse_fieldAccessorTable
@@ -332,7 +322,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       rowKey_ = com.google.protobuf.ByteString.EMPTY;
@@ -342,18 +331,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.v2.BigtableProto.internal_static_google_bigtable_v2_SampleRowKeysResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.SampleRowKeysResponse getDefaultInstanceForType() {
       return com.google.bigtable.v2.SampleRowKeysResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.SampleRowKeysResponse build() {
       com.google.bigtable.v2.SampleRowKeysResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -362,7 +348,6 @@ public com.google.bigtable.v2.SampleRowKeysResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.SampleRowKeysResponse buildPartial() {
       com.google.bigtable.v2.SampleRowKeysResponse result = new com.google.bigtable.v2.SampleRowKeysResponse(this);
       result.rowKey_ = rowKey_;
@@ -371,39 +356,32 @@ public com.google.bigtable.v2.SampleRowKeysResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.v2.SampleRowKeysResponse) {
         return mergeFrom((com.google.bigtable.v2.SampleRowKeysResponse)other);
@@ -426,12 +404,10 @@ public Builder mergeFrom(com.google.bigtable.v2.SampleRowKeysResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -555,13 +531,11 @@ public Builder clearOffsetBytes() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -583,12 +557,11 @@ public static com.google.bigtable.v2.SampleRowKeysResponse getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SampleRowKeysResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SampleRowKeysResponse(input, extensionRegistry);
+        return new SampleRowKeysResponse(input, extensionRegistry);
     }
   };
 
@@ -601,7 +574,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.v2.SampleRowKeysResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/TimestampRange.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/TimestampRange.java
index 9ab1f1dc09d8..9a3959c8381d 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/TimestampRange.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/TimestampRange.java
@@ -34,9 +34,6 @@ private TimestampRange(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private TimestampRange(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
 
             startTimestampMicros_ = input.readInt64();
@@ -58,13 +62,6 @@ private TimestampRange(
             endTimestampMicros_ = input.readInt64();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -82,7 +79,6 @@ private TimestampRange(
     return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_TimestampRange_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_TimestampRange_fieldAccessorTable
@@ -117,7 +113,6 @@ public long getEndTimestampMicros() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -127,7 +122,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (startTimestampMicros_ != 0L) {
@@ -139,7 +133,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static com.google.bigtable.v2.TimestampRange parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.v2.TimestampRange prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_TimestampRange_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_TimestampRange_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       startTimestampMicros_ = 0L;
@@ -334,18 +323,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_TimestampRange_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.TimestampRange getDefaultInstanceForType() {
       return com.google.bigtable.v2.TimestampRange.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.TimestampRange build() {
       com.google.bigtable.v2.TimestampRange result = buildPartial();
       if (!result.isInitialized()) {
@@ -354,7 +340,6 @@ public com.google.bigtable.v2.TimestampRange build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.TimestampRange buildPartial() {
       com.google.bigtable.v2.TimestampRange result = new com.google.bigtable.v2.TimestampRange(this);
       result.startTimestampMicros_ = startTimestampMicros_;
@@ -363,39 +348,32 @@ public com.google.bigtable.v2.TimestampRange buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.v2.TimestampRange) {
         return mergeFrom((com.google.bigtable.v2.TimestampRange)other);
@@ -418,12 +396,10 @@ public Builder mergeFrom(com.google.bigtable.v2.TimestampRange other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -517,13 +493,11 @@ public Builder clearEndTimestampMicros() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -545,12 +519,11 @@ public static com.google.bigtable.v2.TimestampRange getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TimestampRange parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TimestampRange(input, extensionRegistry);
+        return new TimestampRange(input, extensionRegistry);
     }
   };
 
@@ -563,7 +536,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.v2.TimestampRange getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ValueRange.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ValueRange.java
index 72489a1eddb0..9ee037cc9b2d 100644
--- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ValueRange.java
+++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ValueRange.java
@@ -32,9 +32,6 @@ private ValueRange(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private ValueRange(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             startValueCase_ = 1;
             startValue_ = input.readBytes();
@@ -66,13 +70,6 @@ private ValueRange(
             endValue_ = input.readBytes();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ValueRange(
     return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_ValueRange_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_ValueRange_fieldAccessorTable
@@ -235,7 +231,6 @@ public com.google.protobuf.ByteString getEndValueOpen() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -245,7 +240,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (startValueCase_ == 1) {
@@ -267,7 +261,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -449,7 +442,6 @@ public static com.google.bigtable.v2.ValueRange parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -457,7 +449,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.bigtable.v2.ValueRange prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -485,7 +476,6 @@ public static final class Builder extends
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_ValueRange_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_ValueRange_fieldAccessorTable
@@ -508,7 +498,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       startValueCase_ = 0;
@@ -518,18 +507,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.bigtable.v2.DataProto.internal_static_google_bigtable_v2_ValueRange_descriptor;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.ValueRange getDefaultInstanceForType() {
       return com.google.bigtable.v2.ValueRange.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.ValueRange build() {
       com.google.bigtable.v2.ValueRange result = buildPartial();
       if (!result.isInitialized()) {
@@ -538,7 +524,6 @@ public com.google.bigtable.v2.ValueRange build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.bigtable.v2.ValueRange buildPartial() {
       com.google.bigtable.v2.ValueRange result = new com.google.bigtable.v2.ValueRange(this);
       if (startValueCase_ == 1) {
@@ -559,39 +544,32 @@ public com.google.bigtable.v2.ValueRange buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.bigtable.v2.ValueRange) {
         return mergeFrom((com.google.bigtable.v2.ValueRange)other);
@@ -634,12 +612,10 @@ public Builder mergeFrom(com.google.bigtable.v2.ValueRange other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -867,13 +843,11 @@ public Builder clearEndValueOpen() {
       }
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -895,12 +869,11 @@ public static com.google.bigtable.v2.ValueRange getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ValueRange parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ValueRange(input, extensionRegistry);
+        return new ValueRange(input, extensionRegistry);
     }
   };
 
@@ -913,7 +886,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.bigtable.v2.ValueRange getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AcceleratorConfig.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AcceleratorConfig.java
index 76745e8e28ad..108b4d7ec8b0 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AcceleratorConfig.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AcceleratorConfig.java
@@ -34,9 +34,6 @@ private AcceleratorConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private AcceleratorConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
 
             acceleratorCount_ = input.readInt64();
@@ -59,13 +63,6 @@ private AcceleratorConfig(
             acceleratorType_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private AcceleratorConfig(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_AcceleratorConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_AcceleratorConfig_fieldAccessorTable
@@ -149,7 +145,6 @@ public java.lang.String getAcceleratorType() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -159,7 +154,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (acceleratorCount_ != 0L) {
@@ -171,7 +165,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -295,7 +288,6 @@ public static com.google.container.v1.AcceleratorConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -303,7 +295,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.AcceleratorConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -331,7 +322,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_AcceleratorConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_AcceleratorConfig_fieldAccessorTable
@@ -354,7 +344,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       acceleratorCount_ = 0L;
@@ -364,18 +353,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_AcceleratorConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.AcceleratorConfig getDefaultInstanceForType() {
       return com.google.container.v1.AcceleratorConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.AcceleratorConfig build() {
       com.google.container.v1.AcceleratorConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -384,7 +370,6 @@ public com.google.container.v1.AcceleratorConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.AcceleratorConfig buildPartial() {
       com.google.container.v1.AcceleratorConfig result = new com.google.container.v1.AcceleratorConfig(this);
       result.acceleratorCount_ = acceleratorCount_;
@@ -393,39 +378,32 @@ public com.google.container.v1.AcceleratorConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.AcceleratorConfig) {
         return mergeFrom((com.google.container.v1.AcceleratorConfig)other);
@@ -449,12 +427,10 @@ public Builder mergeFrom(com.google.container.v1.AcceleratorConfig other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -604,13 +580,11 @@ public Builder setAcceleratorTypeBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -632,12 +606,11 @@ public static com.google.container.v1.AcceleratorConfig getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AcceleratorConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AcceleratorConfig(input, extensionRegistry);
+        return new AcceleratorConfig(input, extensionRegistry);
     }
   };
 
@@ -650,7 +623,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.AcceleratorConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AddonsConfig.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AddonsConfig.java
index d60ea9126f0e..0696f7d6f5d5 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AddonsConfig.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AddonsConfig.java
@@ -33,9 +33,6 @@ private AddonsConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private AddonsConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.container.v1.HttpLoadBalancing.Builder subBuilder = null;
             if (httpLoadBalancing_ != null) {
@@ -99,13 +103,6 @@ private AddonsConfig(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -123,7 +120,6 @@ private AddonsConfig(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_AddonsConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_AddonsConfig_fieldAccessorTable
@@ -279,7 +275,6 @@ public com.google.container.v1.NetworkPolicyConfigOrBuilder getNetworkPolicyConf
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -289,7 +284,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (httpLoadBalancing_ != null) {
@@ -307,7 +301,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -467,7 +460,6 @@ public static com.google.container.v1.AddonsConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -475,7 +467,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.AddonsConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -504,7 +495,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_AddonsConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_AddonsConfig_fieldAccessorTable
@@ -527,7 +517,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (httpLoadBalancingBuilder_ == null) {
@@ -557,18 +546,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_AddonsConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.AddonsConfig getDefaultInstanceForType() {
       return com.google.container.v1.AddonsConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.AddonsConfig build() {
       com.google.container.v1.AddonsConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -577,7 +563,6 @@ public com.google.container.v1.AddonsConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.AddonsConfig buildPartial() {
       com.google.container.v1.AddonsConfig result = new com.google.container.v1.AddonsConfig(this);
       if (httpLoadBalancingBuilder_ == null) {
@@ -604,39 +589,32 @@ public com.google.container.v1.AddonsConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.AddonsConfig) {
         return mergeFrom((com.google.container.v1.AddonsConfig)other);
@@ -665,12 +643,10 @@ public Builder mergeFrom(com.google.container.v1.AddonsConfig other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1345,13 +1321,11 @@ public com.google.container.v1.NetworkPolicyConfigOrBuilder getNetworkPolicyConf
       }
       return networkPolicyConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1373,12 +1347,11 @@ public static com.google.container.v1.AddonsConfig getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AddonsConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AddonsConfig(input, extensionRegistry);
+        return new AddonsConfig(input, extensionRegistry);
     }
   };
 
@@ -1391,7 +1364,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.AddonsConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AutoUpgradeOptions.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AutoUpgradeOptions.java
index 7f56e3635194..7b38eafa1ae0 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AutoUpgradeOptions.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/AutoUpgradeOptions.java
@@ -35,9 +35,6 @@ private AutoUpgradeOptions(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private AutoUpgradeOptions(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -61,13 +65,6 @@ private AutoUpgradeOptions(
             description_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -85,7 +82,6 @@ private AutoUpgradeOptions(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_AutoUpgradeOptions_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_AutoUpgradeOptions_fieldAccessorTable
@@ -184,7 +180,6 @@ public java.lang.String getDescription() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -194,7 +189,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getAutoUpgradeStartTimeBytes().isEmpty()) {
@@ -206,7 +200,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -328,7 +321,6 @@ public static com.google.container.v1.AutoUpgradeOptions parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -336,7 +328,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.AutoUpgradeOptions prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -365,7 +356,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_AutoUpgradeOptions_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_AutoUpgradeOptions_fieldAccessorTable
@@ -388,7 +378,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       autoUpgradeStartTime_ = "";
@@ -398,18 +387,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_AutoUpgradeOptions_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.AutoUpgradeOptions getDefaultInstanceForType() {
       return com.google.container.v1.AutoUpgradeOptions.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.AutoUpgradeOptions build() {
       com.google.container.v1.AutoUpgradeOptions result = buildPartial();
       if (!result.isInitialized()) {
@@ -418,7 +404,6 @@ public com.google.container.v1.AutoUpgradeOptions build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.AutoUpgradeOptions buildPartial() {
       com.google.container.v1.AutoUpgradeOptions result = new com.google.container.v1.AutoUpgradeOptions(this);
       result.autoUpgradeStartTime_ = autoUpgradeStartTime_;
@@ -427,39 +412,32 @@ public com.google.container.v1.AutoUpgradeOptions buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.AutoUpgradeOptions) {
         return mergeFrom((com.google.container.v1.AutoUpgradeOptions)other);
@@ -484,12 +462,10 @@ public Builder mergeFrom(com.google.container.v1.AutoUpgradeOptions other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -700,13 +676,11 @@ public Builder setDescriptionBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -728,12 +702,11 @@ public static com.google.container.v1.AutoUpgradeOptions getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AutoUpgradeOptions parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AutoUpgradeOptions(input, extensionRegistry);
+        return new AutoUpgradeOptions(input, extensionRegistry);
     }
   };
 
@@ -746,7 +719,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.AutoUpgradeOptions getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CancelOperationRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CancelOperationRequest.java
index 7648604cacc9..4a681be022a1 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CancelOperationRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CancelOperationRequest.java
@@ -35,9 +35,6 @@ private CancelOperationRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private CancelOperationRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -67,13 +71,6 @@ private CancelOperationRequest(
             operationId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private CancelOperationRequest(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_CancelOperationRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_CancelOperationRequest_fieldAccessorTable
@@ -230,7 +226,6 @@ public java.lang.String getOperationId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -240,7 +235,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -255,7 +249,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -384,7 +377,6 @@ public static com.google.container.v1.CancelOperationRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -392,7 +384,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.CancelOperationRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -420,7 +411,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_CancelOperationRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_CancelOperationRequest_fieldAccessorTable
@@ -443,7 +433,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -455,18 +444,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_CancelOperationRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.CancelOperationRequest getDefaultInstanceForType() {
       return com.google.container.v1.CancelOperationRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.CancelOperationRequest build() {
       com.google.container.v1.CancelOperationRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -475,7 +461,6 @@ public com.google.container.v1.CancelOperationRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.CancelOperationRequest buildPartial() {
       com.google.container.v1.CancelOperationRequest result = new com.google.container.v1.CancelOperationRequest(this);
       result.projectId_ = projectId_;
@@ -485,39 +470,32 @@ public com.google.container.v1.CancelOperationRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.CancelOperationRequest) {
         return mergeFrom((com.google.container.v1.CancelOperationRequest)other);
@@ -546,12 +524,10 @@ public Builder mergeFrom(com.google.container.v1.CancelOperationRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -846,13 +822,11 @@ public Builder setOperationIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -874,12 +848,11 @@ public static com.google.container.v1.CancelOperationRequest getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CancelOperationRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CancelOperationRequest(input, extensionRegistry);
+        return new CancelOperationRequest(input, extensionRegistry);
     }
   };
 
@@ -892,7 +865,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.CancelOperationRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClientCertificateConfig.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClientCertificateConfig.java
index e6d86cde547f..93cde82763ae 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClientCertificateConfig.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClientCertificateConfig.java
@@ -33,9 +33,6 @@ private ClientCertificateConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,11 +44,6 @@ private ClientCertificateConfig(
           case 0:
             done = true;
             break;
-          case 8: {
-
-            issueClientCertificate_ = input.readBool();
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -59,6 +51,11 @@ private ClientCertificateConfig(
             }
             break;
           }
+          case 8: {
+
+            issueClientCertificate_ = input.readBool();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -76,7 +73,6 @@ private ClientCertificateConfig(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ClientCertificateConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ClientCertificateConfig_fieldAccessorTable
@@ -98,7 +94,6 @@ public boolean getIssueClientCertificate() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -108,7 +103,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (issueClientCertificate_ != false) {
@@ -117,7 +111,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -234,7 +227,6 @@ public static com.google.container.v1.ClientCertificateConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -242,7 +234,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.ClientCertificateConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -270,7 +261,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ClientCertificateConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ClientCertificateConfig_fieldAccessorTable
@@ -293,7 +283,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       issueClientCertificate_ = false;
@@ -301,18 +290,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ClientCertificateConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.ClientCertificateConfig getDefaultInstanceForType() {
       return com.google.container.v1.ClientCertificateConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.ClientCertificateConfig build() {
       com.google.container.v1.ClientCertificateConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -321,7 +307,6 @@ public com.google.container.v1.ClientCertificateConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.ClientCertificateConfig buildPartial() {
       com.google.container.v1.ClientCertificateConfig result = new com.google.container.v1.ClientCertificateConfig(this);
       result.issueClientCertificate_ = issueClientCertificate_;
@@ -329,39 +314,32 @@ public com.google.container.v1.ClientCertificateConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.ClientCertificateConfig) {
         return mergeFrom((com.google.container.v1.ClientCertificateConfig)other);
@@ -381,12 +359,10 @@ public Builder mergeFrom(com.google.container.v1.ClientCertificateConfig other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -442,13 +418,11 @@ public Builder clearIssueClientCertificate() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -470,12 +444,11 @@ public static com.google.container.v1.ClientCertificateConfig getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ClientCertificateConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ClientCertificateConfig(input, extensionRegistry);
+        return new ClientCertificateConfig(input, extensionRegistry);
     }
   };
 
@@ -488,7 +461,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.ClientCertificateConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/Cluster.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/Cluster.java
index 6c1c4a2a859c..e5a763b1ceea 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/Cluster.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/Cluster.java
@@ -58,9 +58,6 @@ private Cluster(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     int mutable_bitField1_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
@@ -73,6 +70,13 @@ private Cluster(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -351,13 +355,6 @@ private Cluster(
             expireTime_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -385,7 +382,6 @@ private Cluster(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -396,7 +392,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_Cluster_fieldAccessorTable
@@ -1856,7 +1851,6 @@ public int getStatusValue() {
    * .google.container.v1.Cluster.Status status = 107;
    */
   public com.google.container.v1.Cluster.Status getStatus() {
-    @SuppressWarnings("deprecation")
     com.google.container.v1.Cluster.Status result = com.google.container.v1.Cluster.Status.valueOf(status_);
     return result == null ? com.google.container.v1.Cluster.Status.UNRECOGNIZED : result;
   }
@@ -2073,7 +2067,6 @@ public java.lang.String getExpireTime() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -2083,7 +2076,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -2197,7 +2189,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -2629,7 +2620,6 @@ public static com.google.container.v1.Cluster parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -2637,7 +2627,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.Cluster prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -2687,7 +2676,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_Cluster_fieldAccessorTable
@@ -2711,7 +2699,6 @@ private void maybeForceBuilderInitialization() {
         getNodePoolsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -2822,18 +2809,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_Cluster_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.Cluster getDefaultInstanceForType() {
       return com.google.container.v1.Cluster.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.Cluster build() {
       com.google.container.v1.Cluster result = buildPartial();
       if (!result.isInitialized()) {
@@ -2842,7 +2826,6 @@ public com.google.container.v1.Cluster build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.Cluster buildPartial() {
       com.google.container.v1.Cluster result = new com.google.container.v1.Cluster(this);
       int from_bitField0_ = bitField0_;
@@ -2937,39 +2920,32 @@ public com.google.container.v1.Cluster buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.Cluster) {
         return mergeFrom((com.google.container.v1.Cluster)other);
@@ -3145,12 +3121,10 @@ public Builder mergeFrom(com.google.container.v1.Cluster other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -6768,7 +6742,6 @@ public Builder setStatusValue(int value) {
      * .google.container.v1.Cluster.Status status = 107;
      */
     public com.google.container.v1.Cluster.Status getStatus() {
-      @SuppressWarnings("deprecation")
       com.google.container.v1.Cluster.Status result = com.google.container.v1.Cluster.Status.valueOf(status_);
       return result == null ? com.google.container.v1.Cluster.Status.UNRECOGNIZED : result;
     }
@@ -7310,13 +7283,11 @@ public Builder setExpireTimeBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -7338,12 +7309,11 @@ public static com.google.container.v1.Cluster getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Cluster parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Cluster(input, extensionRegistry);
+        return new Cluster(input, extensionRegistry);
     }
   };
 
@@ -7356,7 +7326,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.Cluster getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClusterServiceProto.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClusterServiceProto.java
index 81671c0542bc..4df6650c2763 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClusterServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ClusterServiceProto.java
@@ -342,7 +342,7 @@ public static void registerAllExtensions(
       "a\030\004 \003(\0132-.google.container.v1.NodeConfig" +
       ".MetadataEntry\022\022\n\nimage_type\030\005 \001(\t\022;\n\006la" +
       "bels\030\006 \003(\0132+.google.container.v1.NodeCon" +
-      "fig.LabelsEntry\022\027\n\017local_ssd_count\030\007 \001(\005" +
+      "fig.LabelsEntry\022\027\n\017local_ssd_count\030\007 \001(\005",
       "\022\014\n\004tags\030\010 \003(\t\022\023\n\013preemptible\030\n \001(\010\022<\n\014a" +
       "ccelerators\030\013 \003(\0132&.google.container.v1." +
       "AcceleratorConfig\022\030\n\020min_cpu_platform\030\r " +
@@ -352,7 +352,7 @@ public static void registerAllExtensions(
       "ername\030\001 \001(\t\022\020\n\010password\030\002 \001(\t\022O\n\031client" +
       "_certificate_config\030\003 \001(\0132,.google.conta" +
       "iner.v1.ClientCertificateConfig\022\036\n\026clust" +
-      "er_ca_certificate\030d \001(\t\022\032\n\022client_certif" +
+      "er_ca_certificate\030d \001(\t\022\032\n\022client_certif",
       "icate\030e \001(\t\022\022\n\nclient_key\030f \001(\t\";\n\027Clien" +
       "tCertificateConfig\022 \n\030issue_client_certi" +
       "ficate\030\001 \001(\010\"\267\002\n\014AddonsConfig\022C\n\023http_lo" +
@@ -362,7 +362,7 @@ public static void registerAllExtensions(
       "izontalPodAutoscaling\022F\n\024kubernetes_dash" +
       "board\030\003 \001(\0132(.google.container.v1.Kubern" +
       "etesDashboard\022G\n\025network_policy_config\030\004" +
-      " \001(\0132(.google.container.v1.NetworkPolicy" +
+      " \001(\0132(.google.container.v1.NetworkPolicy",
       "Config\"%\n\021HttpLoadBalancing\022\020\n\010disabled\030" +
       "\001 \001(\010\",\n\030HorizontalPodAutoscaling\022\020\n\010dis" +
       "abled\030\001 \001(\010\"\'\n\023KubernetesDashboard\022\020\n\010di" +
@@ -372,7 +372,7 @@ public static void registerAllExtensions(
       "\030\002 \003(\0132=.google.container.v1.MasterAutho" +
       "rizedNetworksConfig.CidrBlock\0325\n\tCidrBlo" +
       "ck\022\024\n\014display_name\030\001 \001(\t\022\022\n\ncidr_block\030\002" +
-      " \001(\t\"\035\n\nLegacyAbac\022\017\n\007enabled\030\001 \001(\010\"\221\001\n\r" +
+      " \001(\t\"\035\n\nLegacyAbac\022\017\n\007enabled\030\001 \001(\010\"\221\001\n\r",
       "NetworkPolicy\022=\n\010provider\030\001 \001(\0162+.google" +
       ".container.v1.NetworkPolicy.Provider\022\017\n\007" +
       "enabled\030\002 \001(\010\"0\n\010Provider\022\030\n\024PROVIDER_UN" +
@@ -382,7 +382,7 @@ public static void registerAllExtensions(
       "(\t\022\031\n\021cluster_ipv4_cidr\030\004 \001(\t\022\026\n\016node_ip" +
       "v4_cidr\030\005 \001(\t\022\032\n\022services_ipv4_cidr\030\006 \001(" +
       "\t\022$\n\034cluster_secondary_range_name\030\007 \001(\t\022" +
-      "%\n\035services_secondary_range_name\030\010 \001(\t\022\037" +
+      "%\n\035services_secondary_range_name\030\010 \001(\t\022\037",
       "\n\027cluster_ipv4_cidr_block\030\t \001(\t\022\034\n\024node_" +
       "ipv4_cidr_block\030\n \001(\t\022 \n\030services_ipv4_c" +
       "idr_block\030\013 \001(\t\"\252\013\n\007Cluster\022\014\n\004name\030\001 \001(" +
@@ -392,7 +392,7 @@ public static void registerAllExtensions(
       "\005 \001(\0132\037.google.container.v1.MasterAuth\022\027" +
       "\n\017logging_service\030\006 \001(\t\022\032\n\022monitoring_se" +
       "rvice\030\007 \001(\t\022\017\n\007network\030\010 \001(\t\022\031\n\021cluster_" +
-      "ipv4_cidr\030\t \001(\t\0228\n\raddons_config\030\n \001(\0132!" +
+      "ipv4_cidr\030\t \001(\t\0228\n\raddons_config\030\n \001(\0132!",
       ".google.container.v1.AddonsConfig\022\022\n\nsub" +
       "network\030\013 \001(\t\0221\n\nnode_pools\030\014 \003(\0132\035.goog" +
       "le.container.v1.NodePool\022\021\n\tlocations\030\r " +
@@ -402,7 +402,7 @@ public static void registerAllExtensions(
       "_fingerprint\030\020 \001(\t\0224\n\013legacy_abac\030\022 \001(\0132" +
       "\037.google.container.v1.LegacyAbac\022:\n\016netw" +
       "ork_policy\030\023 \001(\0132\".google.container.v1.N" +
-      "etworkPolicy\022E\n\024ip_allocation_policy\030\024 \001" +
+      "etworkPolicy\022E\n\024ip_allocation_policy\030\024 \001",
       "(\0132\'.google.container.v1.IPAllocationPol" +
       "icy\022^\n!master_authorized_networks_config" +
       "\030\026 \001(\01323.google.container.v1.MasterAutho" +
@@ -412,7 +412,7 @@ public static void registerAllExtensions(
       "\022\020\n\010endpoint\030f \001(\t\022\037\n\027initial_cluster_ve" +
       "rsion\030g \001(\t\022\036\n\026current_master_version\030h " +
       "\001(\t\022\034\n\024current_node_version\030i \001(\t\022\023\n\013cre" +
-      "ate_time\030j \001(\t\0223\n\006status\030k \001(\0162#.google." +
+      "ate_time\030j \001(\t\0223\n\006status\030k \001(\0162#.google.",
       "container.v1.Cluster.Status\022\026\n\016status_me" +
       "ssage\030l \001(\t\022\033\n\023node_ipv4_cidr_size\030m \001(\005" +
       "\022\032\n\022services_ipv4_cidr\030n \001(\t\022\033\n\023instance" +
@@ -422,7 +422,7 @@ public static void registerAllExtensions(
       "\001\"i\n\006Status\022\026\n\022STATUS_UNSPECIFIED\020\000\022\020\n\014P" +
       "ROVISIONING\020\001\022\013\n\007RUNNING\020\002\022\017\n\013RECONCILIN" +
       "G\020\003\022\014\n\010STOPPING\020\004\022\t\n\005ERROR\020\005\"\301\003\n\rCluster" +
-      "Update\022\034\n\024desired_node_version\030\004 \001(\t\022\"\n\032" +
+      "Update\022\034\n\024desired_node_version\030\004 \001(\t\022\"\n\032",
       "desired_monitoring_service\030\005 \001(\t\022@\n\025desi" +
       "red_addons_config\030\006 \001(\0132!.google.contain" +
       "er.v1.AddonsConfig\022\034\n\024desired_node_pool_" +
@@ -432,7 +432,7 @@ public static void registerAllExtensions(
       "\021desired_locations\030\n \003(\t\022f\n)desired_mast" +
       "er_authorized_networks_config\030\014 \001(\01323.go" +
       "ogle.container.v1.MasterAuthorizedNetwor" +
-      "ksConfig\022\036\n\026desired_master_version\030d \001(\t" +
+      "ksConfig\022\036\n\026desired_master_version\030d \001(\t",
       "\"\345\005\n\tOperation\022\014\n\004name\030\001 \001(\t\022\014\n\004zone\030\002 \001" +
       "(\t\022;\n\016operation_type\030\003 \001(\0162#.google.cont" +
       "ainer.v1.Operation.Type\0225\n\006status\030\004 \001(\0162" +
@@ -442,7 +442,7 @@ public static void registerAllExtensions(
       "\n\nstart_time\030\n \001(\t\022\020\n\010end_time\030\013 \001(\t\"R\n\006" +
       "Status\022\026\n\022STATUS_UNSPECIFIED\020\000\022\013\n\007PENDIN" +
       "G\020\001\022\013\n\007RUNNING\020\002\022\010\n\004DONE\020\003\022\014\n\010ABORTING\020\004" +
-      "\"\375\002\n\004Type\022\024\n\020TYPE_UNSPECIFIED\020\000\022\022\n\016CREAT" +
+      "\"\375\002\n\004Type\022\024\n\020TYPE_UNSPECIFIED\020\000\022\022\n\016CREAT",
       "E_CLUSTER\020\001\022\022\n\016DELETE_CLUSTER\020\002\022\022\n\016UPGRA" +
       "DE_MASTER\020\003\022\021\n\rUPGRADE_NODES\020\004\022\022\n\016REPAIR" +
       "_CLUSTER\020\005\022\022\n\016UPDATE_CLUSTER\020\006\022\024\n\020CREATE" +
@@ -452,7 +452,7 @@ public static void registerAllExtensions(
       "ABELS\020\014\022\023\n\017SET_MASTER_AUTH\020\r\022\026\n\022SET_NODE" +
       "_POOL_SIZE\020\016\022\026\n\022SET_NETWORK_POLICY\020\017\022\032\n\026" +
       "SET_MAINTENANCE_POLICY\020\020\"g\n\024CreateCluste" +
-      "rRequest\022\022\n\nproject_id\030\001 \001(\t\022\014\n\004zone\030\002 \001" +
+      "rRequest\022\022\n\nproject_id\030\001 \001(\t\022\014\n\004zone\030\002 \001",
       "(\t\022-\n\007cluster\030\003 \001(\0132\034.google.container.v" +
       "1.Cluster\"I\n\021GetClusterRequest\022\022\n\nprojec" +
       "t_id\030\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_id\030\003" +
@@ -462,7 +462,7 @@ public static void registerAllExtensions(
       "1.ClusterUpdate\"\215\001\n\025UpdateNodePoolReques" +
       "t\022\022\n\nproject_id\030\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\nc" +
       "luster_id\030\003 \001(\t\022\024\n\014node_pool_id\030\004 \001(\t\022\024\n" +
-      "\014node_version\030\005 \001(\t\022\022\n\nimage_type\030\006 \001(\t\"" +
+      "\014node_version\030\005 \001(\t\022\022\n\nimage_type\030\006 \001(\t\"",
       "\252\001\n\035SetNodePoolAutoscalingRequest\022\022\n\npro" +
       "ject_id\030\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_i" +
       "d\030\003 \001(\t\022\024\n\014node_pool_id\030\004 \001(\t\022=\n\013autosca" +
@@ -472,7 +472,7 @@ public static void registerAllExtensions(
       "uster_id\030\003 \001(\t\022\027\n\017logging_service\030\004 \001(\t\"" +
       "o\n\033SetMonitoringServiceRequest\022\022\n\nprojec" +
       "t_id\030\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_id\030\003" +
-      " \001(\t\022\032\n\022monitoring_service\030\004 \001(\t\"\210\001\n\026Set" +
+      " \001(\t\022\032\n\022monitoring_service\030\004 \001(\t\"\210\001\n\026Set",
       "AddonsConfigRequest\022\022\n\nproject_id\030\001 \001(\t\022" +
       "\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_id\030\003 \001(\t\0228\n\radd" +
       "ons_config\030\004 \001(\0132!.google.container.v1.A" +
@@ -482,7 +482,7 @@ public static void registerAllExtensions(
       "terRequest\022\022\n\nproject_id\030\001 \001(\t\022\014\n\004zone\030\002" +
       " \001(\t\022\022\n\ncluster_id\030\003 \001(\t\022\026\n\016master_versi" +
       "on\030\004 \001(\t\"\221\002\n\024SetMasterAuthRequest\022\022\n\npro" +
-      "ject_id\030\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_i" +
+      "ject_id\030\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_i",
       "d\030\003 \001(\t\022@\n\006action\030\004 \001(\01620.google.contain" +
       "er.v1.SetMasterAuthRequest.Action\022/\n\006upd" +
       "ate\030\005 \001(\0132\037.google.container.v1.MasterAu" +
@@ -492,7 +492,7 @@ public static void registerAllExtensions(
       "id\030\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_id\030\003 \001" +
       "(\t\"7\n\023ListClustersRequest\022\022\n\nproject_id\030" +
       "\001 \001(\t\022\014\n\004zone\030\002 \001(\t\"]\n\024ListClustersRespo" +
-      "nse\022.\n\010clusters\030\001 \003(\0132\034.google.container" +
+      "nse\022.\n\010clusters\030\001 \003(\0132\034.google.container",
       ".v1.Cluster\022\025\n\rmissing_zones\030\002 \003(\t\"M\n\023Ge" +
       "tOperationRequest\022\022\n\nproject_id\030\001 \001(\t\022\014\n" +
       "\004zone\030\002 \001(\t\022\024\n\014operation_id\030\003 \001(\t\"9\n\025Lis" +
@@ -502,7 +502,7 @@ public static void registerAllExtensions(
       "ation_id\030\003 \001(\t\"c\n\026ListOperationsResponse" +
       "\0222\n\noperations\030\001 \003(\0132\036.google.container." +
       "v1.Operation\022\025\n\rmissing_zones\030\002 \003(\t\":\n\026G" +
-      "etServerConfigRequest\022\022\n\nproject_id\030\001 \001(" +
+      "etServerConfigRequest\022\022\n\nproject_id\030\001 \001(",
       "\t\022\014\n\004zone\030\002 \001(\t\"\242\001\n\014ServerConfig\022\037\n\027defa" +
       "ult_cluster_version\030\001 \001(\t\022\033\n\023valid_node_" +
       "versions\030\003 \003(\t\022\032\n\022default_image_type\030\004 \001" +
@@ -512,7 +512,7 @@ public static void registerAllExtensions(
       "\022\n\ncluster_id\030\003 \001(\t\0220\n\tnode_pool\030\004 \001(\0132\035" +
       ".google.container.v1.NodePool\"c\n\025DeleteN" +
       "odePoolRequest\022\022\n\nproject_id\030\001 \001(\t\022\014\n\004zo" +
-      "ne\030\002 \001(\t\022\022\n\ncluster_id\030\003 \001(\t\022\024\n\014node_poo" +
+      "ne\030\002 \001(\t\022\022\n\ncluster_id\030\003 \001(\t\022\024\n\014node_poo",
       "l_id\030\004 \001(\t\"L\n\024ListNodePoolsRequest\022\022\n\npr" +
       "oject_id\030\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_" +
       "id\030\003 \001(\t\"`\n\022GetNodePoolRequest\022\022\n\nprojec" +
@@ -522,7 +522,7 @@ public static void registerAllExtensions(
       "ontainer.v1.NodeConfig\022\032\n\022initial_node_c" +
       "ount\030\003 \001(\005\022\021\n\tself_link\030d \001(\t\022\017\n\007version" +
       "\030e \001(\t\022\033\n\023instance_group_urls\030f \003(\t\0224\n\006s" +
-      "tatus\030g \001(\0162$.google.container.v1.NodePo" +
+      "tatus\030g \001(\0162$.google.container.v1.NodePo",
       "ol.Status\022\026\n\016status_message\030h \001(\t\022=\n\013aut" +
       "oscaling\030\004 \001(\0132(.google.container.v1.Nod" +
       "ePoolAutoscaling\0227\n\nmanagement\030\005 \001(\0132#.g" +
@@ -532,7 +532,7 @@ public static void registerAllExtensions(
       "R\020\003\022\017\n\013RECONCILING\020\004\022\014\n\010STOPPING\020\005\022\t\n\005ER" +
       "ROR\020\006\"}\n\016NodeManagement\022\024\n\014auto_upgrade\030" +
       "\001 \001(\010\022\023\n\013auto_repair\030\002 \001(\010\022@\n\017upgrade_op" +
-      "tions\030\n \001(\0132\'.google.container.v1.AutoUp" +
+      "tions\030\n \001(\0132\'.google.container.v1.AutoUp",
       "gradeOptions\"J\n\022AutoUpgradeOptions\022\037\n\027au" +
       "to_upgrade_start_time\030\001 \001(\t\022\023\n\013descripti" +
       "on\030\002 \001(\t\"K\n\021MaintenancePolicy\0226\n\006window\030" +
@@ -542,7 +542,7 @@ public static void registerAllExtensions(
       "v1.DailyMaintenanceWindowH\000B\010\n\006policy\">\n" +
       "\026DailyMaintenanceWindow\022\022\n\nstart_time\030\002 " +
       "\001(\t\022\020\n\010duration\030\003 \001(\t\"\243\001\n\034SetNodePoolMan" +
-      "agementRequest\022\022\n\nproject_id\030\001 \001(\t\022\014\n\004zo" +
+      "agementRequest\022\022\n\nproject_id\030\001 \001(\t\022\014\n\004zo",
       "ne\030\002 \001(\t\022\022\n\ncluster_id\030\003 \001(\t\022\024\n\014node_poo" +
       "l_id\030\004 \001(\t\0227\n\nmanagement\030\005 \001(\0132#.google." +
       "container.v1.NodeManagement\"x\n\026SetNodePo" +
@@ -552,7 +552,7 @@ public static void registerAllExtensions(
       "kNodePoolUpgradeRequest\022\022\n\nproject_id\030\001 " +
       "\001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_id\030\003 \001(\t\022\024\n" +
       "\014node_pool_id\030\004 \001(\t\"J\n\025ListNodePoolsResp" +
-      "onse\0221\n\nnode_pools\030\001 \003(\0132\035.google.contai" +
+      "onse\0221\n\nnode_pools\030\001 \003(\0132\035.google.contai",
       "ner.v1.NodePool\"V\n\023NodePoolAutoscaling\022\017" +
       "\n\007enabled\030\001 \001(\010\022\026\n\016min_node_count\030\002 \001(\005\022" +
       "\026\n\016max_node_count\030\003 \001(\005\"\356\001\n\020SetLabelsReq" +
@@ -562,7 +562,7 @@ public static void registerAllExtensions(
       "st.ResourceLabelsEntry\022\031\n\021label_fingerpr" +
       "int\030\005 \001(\t\0325\n\023ResourceLabelsEntry\022\013\n\003key\030" +
       "\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"]\n\024SetLegacyAba" +
-      "cRequest\022\022\n\nproject_id\030\001 \001(\t\022\014\n\004zone\030\002 \001" +
+      "cRequest\022\022\n\nproject_id\030\001 \001(\t\022\014\n\004zone\030\002 \001",
       "(\t\022\022\n\ncluster_id\030\003 \001(\t\022\017\n\007enabled\030\004 \001(\010\"" +
       "N\n\026StartIPRotationRequest\022\022\n\nproject_id\030" +
       "\001 \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_id\030\003 \001(\t\"" +
@@ -572,7 +572,7 @@ public static void registerAllExtensions(
       "ount\030\001 \001(\003\022\030\n\020accelerator_type\030\002 \001(\t\"\213\001\n" +
       "\027SetNetworkPolicyRequest\022\022\n\nproject_id\030\001" +
       " \001(\t\022\014\n\004zone\030\002 \001(\t\022\022\n\ncluster_id\030\003 \001(\t\022:" +
-      "\n\016network_policy\030\004 \001(\0132\".google.containe" +
+      "\n\016network_policy\030\004 \001(\0132\".google.containe",
       "r.v1.NetworkPolicy\"\227\001\n\033SetMaintenancePol" +
       "icyRequest\022\022\n\nproject_id\030\001 \001(\t\022\014\n\004zone\030\002" +
       " \001(\t\022\022\n\ncluster_id\030\003 \001(\t\022B\n\022maintenance_" +
@@ -582,7 +582,7 @@ public static void registerAllExtensions(
       "ersRequest\032).google.container.v1.ListClu" +
       "stersResponse\"7\202\323\344\223\0021\022//v1/projects/{pro" +
       "ject_id}/zones/{zone}/clusters\022\230\001\n\nGetCl" +
-      "uster\022&.google.container.v1.GetClusterRe" +
+      "uster\022&.google.container.v1.GetClusterRe",
       "quest\032\034.google.container.v1.Cluster\"D\202\323\344" +
       "\223\002>\022*
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ClusterUpdate parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ClusterUpdate(input, extensionRegistry);
+        return new ClusterUpdate(input, extensionRegistry);
     }
   };
 
@@ -2296,7 +2269,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.ClusterUpdate getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CompleteIPRotationRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CompleteIPRotationRequest.java
index 4802c2e75408..dd66c5bc8b2d 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CompleteIPRotationRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CompleteIPRotationRequest.java
@@ -35,9 +35,6 @@ private CompleteIPRotationRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private CompleteIPRotationRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -67,13 +71,6 @@ private CompleteIPRotationRequest(
             clusterId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private CompleteIPRotationRequest(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_CompleteIPRotationRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_CompleteIPRotationRequest_fieldAccessorTable
@@ -232,7 +228,6 @@ public java.lang.String getClusterId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -242,7 +237,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -257,7 +251,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -386,7 +379,6 @@ public static com.google.container.v1.CompleteIPRotationRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -394,7 +386,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.CompleteIPRotationRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -422,7 +413,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_CompleteIPRotationRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_CompleteIPRotationRequest_fieldAccessorTable
@@ -445,7 +435,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -457,18 +446,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_CompleteIPRotationRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.CompleteIPRotationRequest getDefaultInstanceForType() {
       return com.google.container.v1.CompleteIPRotationRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.CompleteIPRotationRequest build() {
       com.google.container.v1.CompleteIPRotationRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -477,7 +463,6 @@ public com.google.container.v1.CompleteIPRotationRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.CompleteIPRotationRequest buildPartial() {
       com.google.container.v1.CompleteIPRotationRequest result = new com.google.container.v1.CompleteIPRotationRequest(this);
       result.projectId_ = projectId_;
@@ -487,39 +472,32 @@ public com.google.container.v1.CompleteIPRotationRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.CompleteIPRotationRequest) {
         return mergeFrom((com.google.container.v1.CompleteIPRotationRequest)other);
@@ -548,12 +526,10 @@ public Builder mergeFrom(com.google.container.v1.CompleteIPRotationRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -853,13 +829,11 @@ public Builder setClusterIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -881,12 +855,11 @@ public static com.google.container.v1.CompleteIPRotationRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CompleteIPRotationRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CompleteIPRotationRequest(input, extensionRegistry);
+        return new CompleteIPRotationRequest(input, extensionRegistry);
     }
   };
 
@@ -899,7 +872,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.CompleteIPRotationRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateClusterRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateClusterRequest.java
index 46fd92c290c4..8008997f43ba 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateClusterRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateClusterRequest.java
@@ -34,9 +34,6 @@ private CreateClusterRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private CreateClusterRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private CreateClusterRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private CreateClusterRequest(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_CreateClusterRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_CreateClusterRequest_fieldAccessorTable
@@ -232,7 +228,6 @@ public com.google.container.v1.ClusterOrBuilder getClusterOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -242,7 +237,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -257,7 +251,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -392,7 +385,6 @@ public static com.google.container.v1.CreateClusterRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -400,7 +392,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.CreateClusterRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -428,7 +419,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_CreateClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_CreateClusterRequest_fieldAccessorTable
@@ -451,7 +441,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -467,18 +456,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_CreateClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.CreateClusterRequest getDefaultInstanceForType() {
       return com.google.container.v1.CreateClusterRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.CreateClusterRequest build() {
       com.google.container.v1.CreateClusterRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -487,7 +473,6 @@ public com.google.container.v1.CreateClusterRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.CreateClusterRequest buildPartial() {
       com.google.container.v1.CreateClusterRequest result = new com.google.container.v1.CreateClusterRequest(this);
       result.projectId_ = projectId_;
@@ -501,39 +486,32 @@ public com.google.container.v1.CreateClusterRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.CreateClusterRequest) {
         return mergeFrom((com.google.container.v1.CreateClusterRequest)other);
@@ -561,12 +539,10 @@ public Builder mergeFrom(com.google.container.v1.CreateClusterRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -939,13 +915,11 @@ public com.google.container.v1.ClusterOrBuilder getClusterOrBuilder() {
       }
       return clusterBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -967,12 +941,11 @@ public static com.google.container.v1.CreateClusterRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateClusterRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateClusterRequest(input, extensionRegistry);
+        return new CreateClusterRequest(input, extensionRegistry);
     }
   };
 
@@ -985,7 +958,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.CreateClusterRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateNodePoolRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateNodePoolRequest.java
index fc274acee746..3396550d3f52 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateNodePoolRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/CreateNodePoolRequest.java
@@ -35,9 +35,6 @@ private CreateNodePoolRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private CreateNodePoolRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -80,13 +84,6 @@ private CreateNodePoolRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private CreateNodePoolRequest(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_CreateNodePoolRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_CreateNodePoolRequest_fieldAccessorTable
@@ -278,7 +274,6 @@ public com.google.container.v1.NodePoolOrBuilder getNodePoolOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -288,7 +283,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -306,7 +300,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -448,7 +441,6 @@ public static com.google.container.v1.CreateNodePoolRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -456,7 +448,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.CreateNodePoolRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -484,7 +475,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_CreateNodePoolRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_CreateNodePoolRequest_fieldAccessorTable
@@ -507,7 +497,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -525,18 +514,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_CreateNodePoolRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.CreateNodePoolRequest getDefaultInstanceForType() {
       return com.google.container.v1.CreateNodePoolRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.CreateNodePoolRequest build() {
       com.google.container.v1.CreateNodePoolRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -545,7 +531,6 @@ public com.google.container.v1.CreateNodePoolRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.CreateNodePoolRequest buildPartial() {
       com.google.container.v1.CreateNodePoolRequest result = new com.google.container.v1.CreateNodePoolRequest(this);
       result.projectId_ = projectId_;
@@ -560,39 +545,32 @@ public com.google.container.v1.CreateNodePoolRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.CreateNodePoolRequest) {
         return mergeFrom((com.google.container.v1.CreateNodePoolRequest)other);
@@ -624,12 +602,10 @@ public Builder mergeFrom(com.google.container.v1.CreateNodePoolRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1082,13 +1058,11 @@ public com.google.container.v1.NodePoolOrBuilder getNodePoolOrBuilder() {
       }
       return nodePoolBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1110,12 +1084,11 @@ public static com.google.container.v1.CreateNodePoolRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateNodePoolRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateNodePoolRequest(input, extensionRegistry);
+        return new CreateNodePoolRequest(input, extensionRegistry);
     }
   };
 
@@ -1128,7 +1101,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.CreateNodePoolRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DailyMaintenanceWindow.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DailyMaintenanceWindow.java
index 6e65be405c13..8da6a120622f 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DailyMaintenanceWindow.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DailyMaintenanceWindow.java
@@ -34,9 +34,6 @@ private DailyMaintenanceWindow(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private DailyMaintenanceWindow(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private DailyMaintenanceWindow(
             duration_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private DailyMaintenanceWindow(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_DailyMaintenanceWindow_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_DailyMaintenanceWindow_fieldAccessorTable
@@ -187,7 +183,6 @@ public java.lang.String getDuration() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -197,7 +192,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getStartTimeBytes().isEmpty()) {
@@ -209,7 +203,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -331,7 +324,6 @@ public static com.google.container.v1.DailyMaintenanceWindow parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -339,7 +331,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.DailyMaintenanceWindow prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -367,7 +358,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_DailyMaintenanceWindow_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_DailyMaintenanceWindow_fieldAccessorTable
@@ -390,7 +380,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       startTime_ = "";
@@ -400,18 +389,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_DailyMaintenanceWindow_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.DailyMaintenanceWindow getDefaultInstanceForType() {
       return com.google.container.v1.DailyMaintenanceWindow.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.DailyMaintenanceWindow build() {
       com.google.container.v1.DailyMaintenanceWindow result = buildPartial();
       if (!result.isInitialized()) {
@@ -420,7 +406,6 @@ public com.google.container.v1.DailyMaintenanceWindow build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.DailyMaintenanceWindow buildPartial() {
       com.google.container.v1.DailyMaintenanceWindow result = new com.google.container.v1.DailyMaintenanceWindow(this);
       result.startTime_ = startTime_;
@@ -429,39 +414,32 @@ public com.google.container.v1.DailyMaintenanceWindow buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.DailyMaintenanceWindow) {
         return mergeFrom((com.google.container.v1.DailyMaintenanceWindow)other);
@@ -486,12 +464,10 @@ public Builder mergeFrom(com.google.container.v1.DailyMaintenanceWindow other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -712,13 +688,11 @@ public Builder setDurationBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -740,12 +714,11 @@ public static com.google.container.v1.DailyMaintenanceWindow getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DailyMaintenanceWindow parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DailyMaintenanceWindow(input, extensionRegistry);
+        return new DailyMaintenanceWindow(input, extensionRegistry);
     }
   };
 
@@ -758,7 +731,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.DailyMaintenanceWindow getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteClusterRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteClusterRequest.java
index 8cd0b57026d8..c58cd7900e60 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteClusterRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteClusterRequest.java
@@ -35,9 +35,6 @@ private DeleteClusterRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private DeleteClusterRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -67,13 +71,6 @@ private DeleteClusterRequest(
             clusterId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private DeleteClusterRequest(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_DeleteClusterRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_DeleteClusterRequest_fieldAccessorTable
@@ -232,7 +228,6 @@ public java.lang.String getClusterId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -242,7 +237,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -257,7 +251,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -386,7 +379,6 @@ public static com.google.container.v1.DeleteClusterRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -394,7 +386,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.DeleteClusterRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -422,7 +413,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_DeleteClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_DeleteClusterRequest_fieldAccessorTable
@@ -445,7 +435,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -457,18 +446,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_DeleteClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.DeleteClusterRequest getDefaultInstanceForType() {
       return com.google.container.v1.DeleteClusterRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.DeleteClusterRequest build() {
       com.google.container.v1.DeleteClusterRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -477,7 +463,6 @@ public com.google.container.v1.DeleteClusterRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.DeleteClusterRequest buildPartial() {
       com.google.container.v1.DeleteClusterRequest result = new com.google.container.v1.DeleteClusterRequest(this);
       result.projectId_ = projectId_;
@@ -487,39 +472,32 @@ public com.google.container.v1.DeleteClusterRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.DeleteClusterRequest) {
         return mergeFrom((com.google.container.v1.DeleteClusterRequest)other);
@@ -548,12 +526,10 @@ public Builder mergeFrom(com.google.container.v1.DeleteClusterRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -853,13 +829,11 @@ public Builder setClusterIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -881,12 +855,11 @@ public static com.google.container.v1.DeleteClusterRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteClusterRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteClusterRequest(input, extensionRegistry);
+        return new DeleteClusterRequest(input, extensionRegistry);
     }
   };
 
@@ -899,7 +872,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.DeleteClusterRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteNodePoolRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteNodePoolRequest.java
index 4bc98edc9cc6..35cb0462f281 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteNodePoolRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/DeleteNodePoolRequest.java
@@ -36,9 +36,6 @@ private DeleteNodePoolRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private DeleteNodePoolRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -74,13 +78,6 @@ private DeleteNodePoolRequest(
             nodePoolId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -98,7 +95,6 @@ private DeleteNodePoolRequest(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_DeleteNodePoolRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_DeleteNodePoolRequest_fieldAccessorTable
@@ -281,7 +277,6 @@ public java.lang.String getNodePoolId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -291,7 +286,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -309,7 +303,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -445,7 +438,6 @@ public static com.google.container.v1.DeleteNodePoolRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -453,7 +445,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.DeleteNodePoolRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -481,7 +472,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_DeleteNodePoolRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_DeleteNodePoolRequest_fieldAccessorTable
@@ -504,7 +494,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -518,18 +507,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_DeleteNodePoolRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.DeleteNodePoolRequest getDefaultInstanceForType() {
       return com.google.container.v1.DeleteNodePoolRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.DeleteNodePoolRequest build() {
       com.google.container.v1.DeleteNodePoolRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -538,7 +524,6 @@ public com.google.container.v1.DeleteNodePoolRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.DeleteNodePoolRequest buildPartial() {
       com.google.container.v1.DeleteNodePoolRequest result = new com.google.container.v1.DeleteNodePoolRequest(this);
       result.projectId_ = projectId_;
@@ -549,39 +534,32 @@ public com.google.container.v1.DeleteNodePoolRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.DeleteNodePoolRequest) {
         return mergeFrom((com.google.container.v1.DeleteNodePoolRequest)other);
@@ -614,12 +592,10 @@ public Builder mergeFrom(com.google.container.v1.DeleteNodePoolRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1008,13 +984,11 @@ public Builder setNodePoolIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1036,12 +1010,11 @@ public static com.google.container.v1.DeleteNodePoolRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteNodePoolRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteNodePoolRequest(input, extensionRegistry);
+        return new DeleteNodePoolRequest(input, extensionRegistry);
     }
   };
 
@@ -1054,7 +1027,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.DeleteNodePoolRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetClusterRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetClusterRequest.java
index 8640ec81a6a7..99e15185f86b 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetClusterRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetClusterRequest.java
@@ -35,9 +35,6 @@ private GetClusterRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private GetClusterRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -67,13 +71,6 @@ private GetClusterRequest(
             clusterId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private GetClusterRequest(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_GetClusterRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_GetClusterRequest_fieldAccessorTable
@@ -232,7 +228,6 @@ public java.lang.String getClusterId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -242,7 +237,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -257,7 +251,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -386,7 +379,6 @@ public static com.google.container.v1.GetClusterRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -394,7 +386,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.GetClusterRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -422,7 +413,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_GetClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_GetClusterRequest_fieldAccessorTable
@@ -445,7 +435,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -457,18 +446,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_GetClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.GetClusterRequest getDefaultInstanceForType() {
       return com.google.container.v1.GetClusterRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.GetClusterRequest build() {
       com.google.container.v1.GetClusterRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -477,7 +463,6 @@ public com.google.container.v1.GetClusterRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.GetClusterRequest buildPartial() {
       com.google.container.v1.GetClusterRequest result = new com.google.container.v1.GetClusterRequest(this);
       result.projectId_ = projectId_;
@@ -487,39 +472,32 @@ public com.google.container.v1.GetClusterRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.GetClusterRequest) {
         return mergeFrom((com.google.container.v1.GetClusterRequest)other);
@@ -548,12 +526,10 @@ public Builder mergeFrom(com.google.container.v1.GetClusterRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -853,13 +829,11 @@ public Builder setClusterIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -881,12 +855,11 @@ public static com.google.container.v1.GetClusterRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetClusterRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetClusterRequest(input, extensionRegistry);
+        return new GetClusterRequest(input, extensionRegistry);
     }
   };
 
@@ -899,7 +872,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.GetClusterRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetNodePoolRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetNodePoolRequest.java
index a8f4bdd1df96..b6bc2bebf167 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetNodePoolRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetNodePoolRequest.java
@@ -36,9 +36,6 @@ private GetNodePoolRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private GetNodePoolRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -74,13 +78,6 @@ private GetNodePoolRequest(
             nodePoolId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -98,7 +95,6 @@ private GetNodePoolRequest(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_GetNodePoolRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_GetNodePoolRequest_fieldAccessorTable
@@ -281,7 +277,6 @@ public java.lang.String getNodePoolId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -291,7 +286,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -309,7 +303,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -445,7 +438,6 @@ public static com.google.container.v1.GetNodePoolRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -453,7 +445,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.GetNodePoolRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -481,7 +472,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_GetNodePoolRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_GetNodePoolRequest_fieldAccessorTable
@@ -504,7 +494,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -518,18 +507,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_GetNodePoolRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.GetNodePoolRequest getDefaultInstanceForType() {
       return com.google.container.v1.GetNodePoolRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.GetNodePoolRequest build() {
       com.google.container.v1.GetNodePoolRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -538,7 +524,6 @@ public com.google.container.v1.GetNodePoolRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.GetNodePoolRequest buildPartial() {
       com.google.container.v1.GetNodePoolRequest result = new com.google.container.v1.GetNodePoolRequest(this);
       result.projectId_ = projectId_;
@@ -549,39 +534,32 @@ public com.google.container.v1.GetNodePoolRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.GetNodePoolRequest) {
         return mergeFrom((com.google.container.v1.GetNodePoolRequest)other);
@@ -614,12 +592,10 @@ public Builder mergeFrom(com.google.container.v1.GetNodePoolRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1008,13 +984,11 @@ public Builder setNodePoolIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1036,12 +1010,11 @@ public static com.google.container.v1.GetNodePoolRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetNodePoolRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetNodePoolRequest(input, extensionRegistry);
+        return new GetNodePoolRequest(input, extensionRegistry);
     }
   };
 
@@ -1054,7 +1027,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.GetNodePoolRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetOperationRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetOperationRequest.java
index 47a0aa14c117..a2531fc7a7fe 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetOperationRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetOperationRequest.java
@@ -35,9 +35,6 @@ private GetOperationRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private GetOperationRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -67,13 +71,6 @@ private GetOperationRequest(
             operationId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private GetOperationRequest(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_GetOperationRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_GetOperationRequest_fieldAccessorTable
@@ -232,7 +228,6 @@ public java.lang.String getOperationId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -242,7 +237,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -257,7 +251,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -386,7 +379,6 @@ public static com.google.container.v1.GetOperationRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -394,7 +386,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.GetOperationRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -422,7 +413,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_GetOperationRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_GetOperationRequest_fieldAccessorTable
@@ -445,7 +435,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -457,18 +446,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_GetOperationRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.GetOperationRequest getDefaultInstanceForType() {
       return com.google.container.v1.GetOperationRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.GetOperationRequest build() {
       com.google.container.v1.GetOperationRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -477,7 +463,6 @@ public com.google.container.v1.GetOperationRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.GetOperationRequest buildPartial() {
       com.google.container.v1.GetOperationRequest result = new com.google.container.v1.GetOperationRequest(this);
       result.projectId_ = projectId_;
@@ -487,39 +472,32 @@ public com.google.container.v1.GetOperationRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.GetOperationRequest) {
         return mergeFrom((com.google.container.v1.GetOperationRequest)other);
@@ -548,12 +526,10 @@ public Builder mergeFrom(com.google.container.v1.GetOperationRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -853,13 +829,11 @@ public Builder setOperationIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -881,12 +855,11 @@ public static com.google.container.v1.GetOperationRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetOperationRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetOperationRequest(input, extensionRegistry);
+        return new GetOperationRequest(input, extensionRegistry);
     }
   };
 
@@ -899,7 +872,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.GetOperationRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetServerConfigRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetServerConfigRequest.java
index 7f6f50880700..d3650f18e3ed 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetServerConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/GetServerConfigRequest.java
@@ -34,9 +34,6 @@ private GetServerConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private GetServerConfigRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private GetServerConfigRequest(
             zone_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private GetServerConfigRequest(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_GetServerConfigRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_GetServerConfigRequest_fieldAccessorTable
@@ -181,7 +177,6 @@ public java.lang.String getZone() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -191,7 +186,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -203,7 +197,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -325,7 +318,6 @@ public static com.google.container.v1.GetServerConfigRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -333,7 +325,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.GetServerConfigRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -361,7 +352,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_GetServerConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_GetServerConfigRequest_fieldAccessorTable
@@ -384,7 +374,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -394,18 +383,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_GetServerConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.GetServerConfigRequest getDefaultInstanceForType() {
       return com.google.container.v1.GetServerConfigRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.GetServerConfigRequest build() {
       com.google.container.v1.GetServerConfigRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -414,7 +400,6 @@ public com.google.container.v1.GetServerConfigRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.GetServerConfigRequest buildPartial() {
       com.google.container.v1.GetServerConfigRequest result = new com.google.container.v1.GetServerConfigRequest(this);
       result.projectId_ = projectId_;
@@ -423,39 +408,32 @@ public com.google.container.v1.GetServerConfigRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.GetServerConfigRequest) {
         return mergeFrom((com.google.container.v1.GetServerConfigRequest)other);
@@ -480,12 +458,10 @@ public Builder mergeFrom(com.google.container.v1.GetServerConfigRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -691,13 +667,11 @@ public Builder setZoneBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -719,12 +693,11 @@ public static com.google.container.v1.GetServerConfigRequest getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetServerConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetServerConfigRequest(input, extensionRegistry);
+        return new GetServerConfigRequest(input, extensionRegistry);
     }
   };
 
@@ -737,7 +710,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.GetServerConfigRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/HorizontalPodAutoscaling.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/HorizontalPodAutoscaling.java
index 0cb4182e1536..28703cd783e6 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/HorizontalPodAutoscaling.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/HorizontalPodAutoscaling.java
@@ -35,9 +35,6 @@ private HorizontalPodAutoscaling(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,11 +46,6 @@ private HorizontalPodAutoscaling(
           case 0:
             done = true;
             break;
-          case 8: {
-
-            disabled_ = input.readBool();
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -61,6 +53,11 @@ private HorizontalPodAutoscaling(
             }
             break;
           }
+          case 8: {
+
+            disabled_ = input.readBool();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -78,7 +75,6 @@ private HorizontalPodAutoscaling(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_HorizontalPodAutoscaling_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_HorizontalPodAutoscaling_fieldAccessorTable
@@ -102,7 +98,6 @@ public boolean getDisabled() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -112,7 +107,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (disabled_ != false) {
@@ -121,7 +115,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -238,7 +231,6 @@ public static com.google.container.v1.HorizontalPodAutoscaling parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -246,7 +238,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.HorizontalPodAutoscaling prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -276,7 +267,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_HorizontalPodAutoscaling_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_HorizontalPodAutoscaling_fieldAccessorTable
@@ -299,7 +289,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       disabled_ = false;
@@ -307,18 +296,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_HorizontalPodAutoscaling_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.HorizontalPodAutoscaling getDefaultInstanceForType() {
       return com.google.container.v1.HorizontalPodAutoscaling.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.HorizontalPodAutoscaling build() {
       com.google.container.v1.HorizontalPodAutoscaling result = buildPartial();
       if (!result.isInitialized()) {
@@ -327,7 +313,6 @@ public com.google.container.v1.HorizontalPodAutoscaling build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.HorizontalPodAutoscaling buildPartial() {
       com.google.container.v1.HorizontalPodAutoscaling result = new com.google.container.v1.HorizontalPodAutoscaling(this);
       result.disabled_ = disabled_;
@@ -335,39 +320,32 @@ public com.google.container.v1.HorizontalPodAutoscaling buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.HorizontalPodAutoscaling) {
         return mergeFrom((com.google.container.v1.HorizontalPodAutoscaling)other);
@@ -387,12 +365,10 @@ public Builder mergeFrom(com.google.container.v1.HorizontalPodAutoscaling other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -454,13 +430,11 @@ public Builder clearDisabled() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -482,12 +456,11 @@ public static com.google.container.v1.HorizontalPodAutoscaling getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public HorizontalPodAutoscaling parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new HorizontalPodAutoscaling(input, extensionRegistry);
+        return new HorizontalPodAutoscaling(input, extensionRegistry);
     }
   };
 
@@ -500,7 +473,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.HorizontalPodAutoscaling getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/HttpLoadBalancing.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/HttpLoadBalancing.java
index 4d0113fa4ae9..e465ba8125db 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/HttpLoadBalancing.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/HttpLoadBalancing.java
@@ -34,9 +34,6 @@ private HttpLoadBalancing(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,11 +45,6 @@ private HttpLoadBalancing(
           case 0:
             done = true;
             break;
-          case 8: {
-
-            disabled_ = input.readBool();
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +52,11 @@ private HttpLoadBalancing(
             }
             break;
           }
+          case 8: {
+
+            disabled_ = input.readBool();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private HttpLoadBalancing(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_HttpLoadBalancing_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_HttpLoadBalancing_fieldAccessorTable
@@ -101,7 +97,6 @@ public boolean getDisabled() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -111,7 +106,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (disabled_ != false) {
@@ -120,7 +114,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -237,7 +230,6 @@ public static com.google.container.v1.HttpLoadBalancing parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -245,7 +237,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.HttpLoadBalancing prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -274,7 +265,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_HttpLoadBalancing_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_HttpLoadBalancing_fieldAccessorTable
@@ -297,7 +287,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       disabled_ = false;
@@ -305,18 +294,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_HttpLoadBalancing_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.HttpLoadBalancing getDefaultInstanceForType() {
       return com.google.container.v1.HttpLoadBalancing.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.HttpLoadBalancing build() {
       com.google.container.v1.HttpLoadBalancing result = buildPartial();
       if (!result.isInitialized()) {
@@ -325,7 +311,6 @@ public com.google.container.v1.HttpLoadBalancing build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.HttpLoadBalancing buildPartial() {
       com.google.container.v1.HttpLoadBalancing result = new com.google.container.v1.HttpLoadBalancing(this);
       result.disabled_ = disabled_;
@@ -333,39 +318,32 @@ public com.google.container.v1.HttpLoadBalancing buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.HttpLoadBalancing) {
         return mergeFrom((com.google.container.v1.HttpLoadBalancing)other);
@@ -385,12 +363,10 @@ public Builder mergeFrom(com.google.container.v1.HttpLoadBalancing other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -452,13 +428,11 @@ public Builder clearDisabled() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -480,12 +454,11 @@ public static com.google.container.v1.HttpLoadBalancing getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public HttpLoadBalancing parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new HttpLoadBalancing(input, extensionRegistry);
+        return new HttpLoadBalancing(input, extensionRegistry);
     }
   };
 
@@ -498,7 +471,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.HttpLoadBalancing getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/IPAllocationPolicy.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/IPAllocationPolicy.java
index 8f630a000903..2fbfe59e1f91 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/IPAllocationPolicy.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/IPAllocationPolicy.java
@@ -43,9 +43,6 @@ private IPAllocationPolicy(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -57,6 +54,13 @@ private IPAllocationPolicy(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
 
             useIpAliases_ = input.readBool();
@@ -121,13 +125,6 @@ private IPAllocationPolicy(
             servicesIpv4CidrBlock_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -145,7 +142,6 @@ private IPAllocationPolicy(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_IPAllocationPolicy_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_IPAllocationPolicy_fieldAccessorTable
@@ -641,7 +637,6 @@ public java.lang.String getServicesIpv4CidrBlock() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -651,7 +646,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (useIpAliases_ != false) {
@@ -690,7 +684,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -879,7 +872,6 @@ public static com.google.container.v1.IPAllocationPolicy parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -887,7 +879,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.IPAllocationPolicy prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -915,7 +906,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_IPAllocationPolicy_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_IPAllocationPolicy_fieldAccessorTable
@@ -938,7 +928,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       useIpAliases_ = false;
@@ -966,18 +955,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_IPAllocationPolicy_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.IPAllocationPolicy getDefaultInstanceForType() {
       return com.google.container.v1.IPAllocationPolicy.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.IPAllocationPolicy build() {
       com.google.container.v1.IPAllocationPolicy result = buildPartial();
       if (!result.isInitialized()) {
@@ -986,7 +972,6 @@ public com.google.container.v1.IPAllocationPolicy build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.IPAllocationPolicy buildPartial() {
       com.google.container.v1.IPAllocationPolicy result = new com.google.container.v1.IPAllocationPolicy(this);
       result.useIpAliases_ = useIpAliases_;
@@ -1004,39 +989,32 @@ public com.google.container.v1.IPAllocationPolicy buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.IPAllocationPolicy) {
         return mergeFrom((com.google.container.v1.IPAllocationPolicy)other);
@@ -1095,12 +1073,10 @@ public Builder mergeFrom(com.google.container.v1.IPAllocationPolicy other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2203,13 +2179,11 @@ public Builder setServicesIpv4CidrBlockBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2231,12 +2205,11 @@ public static com.google.container.v1.IPAllocationPolicy getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public IPAllocationPolicy parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new IPAllocationPolicy(input, extensionRegistry);
+        return new IPAllocationPolicy(input, extensionRegistry);
     }
   };
 
@@ -2249,7 +2222,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.IPAllocationPolicy getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/KubernetesDashboard.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/KubernetesDashboard.java
index 5d38bf09e7d4..44b5b2051aad 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/KubernetesDashboard.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/KubernetesDashboard.java
@@ -33,9 +33,6 @@ private KubernetesDashboard(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,11 +44,6 @@ private KubernetesDashboard(
           case 0:
             done = true;
             break;
-          case 8: {
-
-            disabled_ = input.readBool();
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -59,6 +51,11 @@ private KubernetesDashboard(
             }
             break;
           }
+          case 8: {
+
+            disabled_ = input.readBool();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -76,7 +73,6 @@ private KubernetesDashboard(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_KubernetesDashboard_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_KubernetesDashboard_fieldAccessorTable
@@ -98,7 +94,6 @@ public boolean getDisabled() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -108,7 +103,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (disabled_ != false) {
@@ -117,7 +111,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -234,7 +227,6 @@ public static com.google.container.v1.KubernetesDashboard parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -242,7 +234,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.KubernetesDashboard prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -270,7 +261,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_KubernetesDashboard_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_KubernetesDashboard_fieldAccessorTable
@@ -293,7 +283,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       disabled_ = false;
@@ -301,18 +290,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_KubernetesDashboard_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.KubernetesDashboard getDefaultInstanceForType() {
       return com.google.container.v1.KubernetesDashboard.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.KubernetesDashboard build() {
       com.google.container.v1.KubernetesDashboard result = buildPartial();
       if (!result.isInitialized()) {
@@ -321,7 +307,6 @@ public com.google.container.v1.KubernetesDashboard build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.KubernetesDashboard buildPartial() {
       com.google.container.v1.KubernetesDashboard result = new com.google.container.v1.KubernetesDashboard(this);
       result.disabled_ = disabled_;
@@ -329,39 +314,32 @@ public com.google.container.v1.KubernetesDashboard buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.KubernetesDashboard) {
         return mergeFrom((com.google.container.v1.KubernetesDashboard)other);
@@ -381,12 +359,10 @@ public Builder mergeFrom(com.google.container.v1.KubernetesDashboard other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -442,13 +418,11 @@ public Builder clearDisabled() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -470,12 +444,11 @@ public static com.google.container.v1.KubernetesDashboard getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public KubernetesDashboard parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new KubernetesDashboard(input, extensionRegistry);
+        return new KubernetesDashboard(input, extensionRegistry);
     }
   };
 
@@ -488,7 +461,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.KubernetesDashboard getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/LegacyAbac.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/LegacyAbac.java
index a70b8cce9b07..d9298a653b0c 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/LegacyAbac.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/LegacyAbac.java
@@ -34,9 +34,6 @@ private LegacyAbac(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,11 +45,6 @@ private LegacyAbac(
           case 0:
             done = true;
             break;
-          case 8: {
-
-            enabled_ = input.readBool();
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +52,11 @@ private LegacyAbac(
             }
             break;
           }
+          case 8: {
+
+            enabled_ = input.readBool();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private LegacyAbac(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_LegacyAbac_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_LegacyAbac_fieldAccessorTable
@@ -102,7 +98,6 @@ public boolean getEnabled() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -112,7 +107,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (enabled_ != false) {
@@ -121,7 +115,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -238,7 +231,6 @@ public static com.google.container.v1.LegacyAbac parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -246,7 +238,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.LegacyAbac prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -275,7 +266,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_LegacyAbac_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_LegacyAbac_fieldAccessorTable
@@ -298,7 +288,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       enabled_ = false;
@@ -306,18 +295,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_LegacyAbac_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.LegacyAbac getDefaultInstanceForType() {
       return com.google.container.v1.LegacyAbac.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.LegacyAbac build() {
       com.google.container.v1.LegacyAbac result = buildPartial();
       if (!result.isInitialized()) {
@@ -326,7 +312,6 @@ public com.google.container.v1.LegacyAbac build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.LegacyAbac buildPartial() {
       com.google.container.v1.LegacyAbac result = new com.google.container.v1.LegacyAbac(this);
       result.enabled_ = enabled_;
@@ -334,39 +319,32 @@ public com.google.container.v1.LegacyAbac buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.LegacyAbac) {
         return mergeFrom((com.google.container.v1.LegacyAbac)other);
@@ -386,12 +364,10 @@ public Builder mergeFrom(com.google.container.v1.LegacyAbac other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -456,13 +432,11 @@ public Builder clearEnabled() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -484,12 +458,11 @@ public static com.google.container.v1.LegacyAbac getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LegacyAbac parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LegacyAbac(input, extensionRegistry);
+        return new LegacyAbac(input, extensionRegistry);
     }
   };
 
@@ -502,7 +475,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.LegacyAbac getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListClustersRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListClustersRequest.java
index 31b0669c0706..c11d5018dc3c 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListClustersRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListClustersRequest.java
@@ -34,9 +34,6 @@ private ListClustersRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListClustersRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private ListClustersRequest(
             zone_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private ListClustersRequest(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ListClustersRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ListClustersRequest_fieldAccessorTable
@@ -183,7 +179,6 @@ public java.lang.String getZone() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -193,7 +188,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -205,7 +199,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -327,7 +320,6 @@ public static com.google.container.v1.ListClustersRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -335,7 +327,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.ListClustersRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -363,7 +354,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ListClustersRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ListClustersRequest_fieldAccessorTable
@@ -386,7 +376,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -396,18 +385,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ListClustersRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.ListClustersRequest getDefaultInstanceForType() {
       return com.google.container.v1.ListClustersRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.ListClustersRequest build() {
       com.google.container.v1.ListClustersRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -416,7 +402,6 @@ public com.google.container.v1.ListClustersRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.ListClustersRequest buildPartial() {
       com.google.container.v1.ListClustersRequest result = new com.google.container.v1.ListClustersRequest(this);
       result.projectId_ = projectId_;
@@ -425,39 +410,32 @@ public com.google.container.v1.ListClustersRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.ListClustersRequest) {
         return mergeFrom((com.google.container.v1.ListClustersRequest)other);
@@ -482,12 +460,10 @@ public Builder mergeFrom(com.google.container.v1.ListClustersRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -698,13 +674,11 @@ public Builder setZoneBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -726,12 +700,11 @@ public static com.google.container.v1.ListClustersRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListClustersRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListClustersRequest(input, extensionRegistry);
+        return new ListClustersRequest(input, extensionRegistry);
     }
   };
 
@@ -744,7 +717,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.ListClustersRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListClustersResponse.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListClustersResponse.java
index a81a3bfe2e82..f3af1e4cc21d 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListClustersResponse.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListClustersResponse.java
@@ -34,9 +34,6 @@ private ListClustersResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListClustersResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               clusters_ = new java.util.ArrayList();
@@ -66,13 +70,6 @@ private ListClustersResponse(
             missingZones_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private ListClustersResponse(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ListClustersResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ListClustersResponse_fieldAccessorTable
@@ -214,7 +210,6 @@ public java.lang.String getMissingZones(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -224,7 +219,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < clusters_.size(); i++) {
@@ -236,7 +230,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -368,7 +361,6 @@ public static com.google.container.v1.ListClustersResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -376,7 +368,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.ListClustersResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -404,7 +395,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ListClustersResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ListClustersResponse_fieldAccessorTable
@@ -428,7 +418,6 @@ private void maybeForceBuilderInitialization() {
         getClustersFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (clustersBuilder_ == null) {
@@ -442,18 +431,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ListClustersResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.ListClustersResponse getDefaultInstanceForType() {
       return com.google.container.v1.ListClustersResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.ListClustersResponse build() {
       com.google.container.v1.ListClustersResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -462,7 +448,6 @@ public com.google.container.v1.ListClustersResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.ListClustersResponse buildPartial() {
       com.google.container.v1.ListClustersResponse result = new com.google.container.v1.ListClustersResponse(this);
       int from_bitField0_ = bitField0_;
@@ -484,39 +469,32 @@ public com.google.container.v1.ListClustersResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.ListClustersResponse) {
         return mergeFrom((com.google.container.v1.ListClustersResponse)other);
@@ -569,12 +547,10 @@ public Builder mergeFrom(com.google.container.v1.ListClustersResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1062,13 +1038,11 @@ public Builder addMissingZonesBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1090,12 +1064,11 @@ public static com.google.container.v1.ListClustersResponse getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListClustersResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListClustersResponse(input, extensionRegistry);
+        return new ListClustersResponse(input, extensionRegistry);
     }
   };
 
@@ -1108,7 +1081,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.ListClustersResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListNodePoolsRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListNodePoolsRequest.java
index c546a9e003e6..1df051d33ef9 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListNodePoolsRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListNodePoolsRequest.java
@@ -35,9 +35,6 @@ private ListNodePoolsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListNodePoolsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -67,13 +71,6 @@ private ListNodePoolsRequest(
             clusterId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private ListNodePoolsRequest(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ListNodePoolsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ListNodePoolsRequest_fieldAccessorTable
@@ -232,7 +228,6 @@ public java.lang.String getClusterId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -242,7 +237,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -257,7 +251,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -386,7 +379,6 @@ public static com.google.container.v1.ListNodePoolsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -394,7 +386,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.ListNodePoolsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -422,7 +413,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ListNodePoolsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ListNodePoolsRequest_fieldAccessorTable
@@ -445,7 +435,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -457,18 +446,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ListNodePoolsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.ListNodePoolsRequest getDefaultInstanceForType() {
       return com.google.container.v1.ListNodePoolsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.ListNodePoolsRequest build() {
       com.google.container.v1.ListNodePoolsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -477,7 +463,6 @@ public com.google.container.v1.ListNodePoolsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.ListNodePoolsRequest buildPartial() {
       com.google.container.v1.ListNodePoolsRequest result = new com.google.container.v1.ListNodePoolsRequest(this);
       result.projectId_ = projectId_;
@@ -487,39 +472,32 @@ public com.google.container.v1.ListNodePoolsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.ListNodePoolsRequest) {
         return mergeFrom((com.google.container.v1.ListNodePoolsRequest)other);
@@ -548,12 +526,10 @@ public Builder mergeFrom(com.google.container.v1.ListNodePoolsRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -853,13 +829,11 @@ public Builder setClusterIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -881,12 +855,11 @@ public static com.google.container.v1.ListNodePoolsRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListNodePoolsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListNodePoolsRequest(input, extensionRegistry);
+        return new ListNodePoolsRequest(input, extensionRegistry);
     }
   };
 
@@ -899,7 +872,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.ListNodePoolsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListNodePoolsResponse.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListNodePoolsResponse.java
index 5ea8e75159a1..698cfbcb2e00 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListNodePoolsResponse.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListNodePoolsResponse.java
@@ -33,9 +33,6 @@ private ListNodePoolsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ListNodePoolsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               nodePools_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private ListNodePoolsResponse(
                 input.readMessage(com.google.container.v1.NodePool.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private ListNodePoolsResponse(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ListNodePoolsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ListNodePoolsResponse_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.container.v1.NodePoolOrBuilder getNodePoolsOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < nodePools_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.container.v1.ListNodePoolsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.ListNodePoolsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ListNodePoolsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ListNodePoolsResponse_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getNodePoolsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (nodePoolsBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ListNodePoolsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.ListNodePoolsResponse getDefaultInstanceForType() {
       return com.google.container.v1.ListNodePoolsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.ListNodePoolsResponse build() {
       com.google.container.v1.ListNodePoolsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.container.v1.ListNodePoolsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.ListNodePoolsResponse buildPartial() {
       com.google.container.v1.ListNodePoolsResponse result = new com.google.container.v1.ListNodePoolsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.container.v1.ListNodePoolsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.ListNodePoolsResponse) {
         return mergeFrom((com.google.container.v1.ListNodePoolsResponse)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.container.v1.ListNodePoolsResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.container.v1.NodePool.Builder addNodePoolsBuilder(
       }
       return nodePoolsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.container.v1.ListNodePoolsResponse getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListNodePoolsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListNodePoolsResponse(input, extensionRegistry);
+        return new ListNodePoolsResponse(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.ListNodePoolsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListOperationsRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListOperationsRequest.java
index 01b6db9f0c88..588e23b14b4f 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListOperationsRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListOperationsRequest.java
@@ -34,9 +34,6 @@ private ListOperationsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListOperationsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private ListOperationsRequest(
             zone_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private ListOperationsRequest(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ListOperationsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ListOperationsRequest_fieldAccessorTable
@@ -181,7 +177,6 @@ public java.lang.String getZone() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -191,7 +186,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -203,7 +197,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -325,7 +318,6 @@ public static com.google.container.v1.ListOperationsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -333,7 +325,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.ListOperationsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -361,7 +352,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ListOperationsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ListOperationsRequest_fieldAccessorTable
@@ -384,7 +374,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -394,18 +383,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ListOperationsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.ListOperationsRequest getDefaultInstanceForType() {
       return com.google.container.v1.ListOperationsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.ListOperationsRequest build() {
       com.google.container.v1.ListOperationsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -414,7 +400,6 @@ public com.google.container.v1.ListOperationsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.ListOperationsRequest buildPartial() {
       com.google.container.v1.ListOperationsRequest result = new com.google.container.v1.ListOperationsRequest(this);
       result.projectId_ = projectId_;
@@ -423,39 +408,32 @@ public com.google.container.v1.ListOperationsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.ListOperationsRequest) {
         return mergeFrom((com.google.container.v1.ListOperationsRequest)other);
@@ -480,12 +458,10 @@ public Builder mergeFrom(com.google.container.v1.ListOperationsRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -691,13 +667,11 @@ public Builder setZoneBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -719,12 +693,11 @@ public static com.google.container.v1.ListOperationsRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListOperationsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListOperationsRequest(input, extensionRegistry);
+        return new ListOperationsRequest(input, extensionRegistry);
     }
   };
 
@@ -737,7 +710,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.ListOperationsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListOperationsResponse.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListOperationsResponse.java
index a9296a740a27..424fffd806a4 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListOperationsResponse.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ListOperationsResponse.java
@@ -34,9 +34,6 @@ private ListOperationsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListOperationsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               operations_ = new java.util.ArrayList();
@@ -66,13 +70,6 @@ private ListOperationsResponse(
             missingZones_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private ListOperationsResponse(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ListOperationsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ListOperationsResponse_fieldAccessorTable
@@ -209,7 +205,6 @@ public java.lang.String getMissingZones(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -219,7 +214,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < operations_.size(); i++) {
@@ -231,7 +225,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -363,7 +356,6 @@ public static com.google.container.v1.ListOperationsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -371,7 +363,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.ListOperationsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -399,7 +390,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ListOperationsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ListOperationsResponse_fieldAccessorTable
@@ -423,7 +413,6 @@ private void maybeForceBuilderInitialization() {
         getOperationsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (operationsBuilder_ == null) {
@@ -437,18 +426,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ListOperationsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.ListOperationsResponse getDefaultInstanceForType() {
       return com.google.container.v1.ListOperationsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.ListOperationsResponse build() {
       com.google.container.v1.ListOperationsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -457,7 +443,6 @@ public com.google.container.v1.ListOperationsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.ListOperationsResponse buildPartial() {
       com.google.container.v1.ListOperationsResponse result = new com.google.container.v1.ListOperationsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -479,39 +464,32 @@ public com.google.container.v1.ListOperationsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.ListOperationsResponse) {
         return mergeFrom((com.google.container.v1.ListOperationsResponse)other);
@@ -564,12 +542,10 @@ public Builder mergeFrom(com.google.container.v1.ListOperationsResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1039,13 +1015,11 @@ public Builder addMissingZonesBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1067,12 +1041,11 @@ public static com.google.container.v1.ListOperationsResponse getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListOperationsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListOperationsResponse(input, extensionRegistry);
+        return new ListOperationsResponse(input, extensionRegistry);
     }
   };
 
@@ -1085,7 +1058,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.ListOperationsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MaintenancePolicy.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MaintenancePolicy.java
index dc04e4f265d9..86dd7243f5d8 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MaintenancePolicy.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MaintenancePolicy.java
@@ -32,9 +32,6 @@ private MaintenancePolicy(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private MaintenancePolicy(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.container.v1.MaintenanceWindow.Builder subBuilder = null;
             if (window_ != null) {
@@ -59,13 +63,6 @@ private MaintenancePolicy(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private MaintenancePolicy(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_MaintenancePolicy_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_MaintenancePolicy_fieldAccessorTable
@@ -125,7 +121,6 @@ public com.google.container.v1.MaintenanceWindowOrBuilder getWindowOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -135,7 +130,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (window_ != null) {
@@ -144,7 +138,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static com.google.container.v1.MaintenancePolicy parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.MaintenancePolicy prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_MaintenancePolicy_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_MaintenancePolicy_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (windowBuilder_ == null) {
@@ -336,18 +325,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_MaintenancePolicy_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.MaintenancePolicy getDefaultInstanceForType() {
       return com.google.container.v1.MaintenancePolicy.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.MaintenancePolicy build() {
       com.google.container.v1.MaintenancePolicy result = buildPartial();
       if (!result.isInitialized()) {
@@ -356,7 +342,6 @@ public com.google.container.v1.MaintenancePolicy build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.MaintenancePolicy buildPartial() {
       com.google.container.v1.MaintenancePolicy result = new com.google.container.v1.MaintenancePolicy(this);
       if (windowBuilder_ == null) {
@@ -368,39 +353,32 @@ public com.google.container.v1.MaintenancePolicy buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.MaintenancePolicy) {
         return mergeFrom((com.google.container.v1.MaintenancePolicy)other);
@@ -420,12 +398,10 @@ public Builder mergeFrom(com.google.container.v1.MaintenancePolicy other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -596,13 +572,11 @@ public com.google.container.v1.MaintenanceWindowOrBuilder getWindowOrBuilder() {
       }
       return windowBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -624,12 +598,11 @@ public static com.google.container.v1.MaintenancePolicy getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public MaintenancePolicy parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new MaintenancePolicy(input, extensionRegistry);
+        return new MaintenancePolicy(input, extensionRegistry);
     }
   };
 
@@ -642,7 +615,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.MaintenancePolicy getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MaintenanceWindow.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MaintenanceWindow.java
index 1bce0d05b1eb..c35e5fd969c6 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MaintenanceWindow.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MaintenanceWindow.java
@@ -32,9 +32,6 @@ private MaintenanceWindow(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private MaintenanceWindow(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             com.google.container.v1.DailyMaintenanceWindow.Builder subBuilder = null;
             if (policyCase_ == 2) {
@@ -60,13 +64,6 @@ private MaintenanceWindow(
             policyCase_ = 2;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private MaintenanceWindow(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_MaintenanceWindow_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_MaintenanceWindow_fieldAccessorTable
@@ -167,7 +163,6 @@ public com.google.container.v1.DailyMaintenanceWindowOrBuilder getDailyMaintenan
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -177,7 +172,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (policyCase_ == 2) {
@@ -186,7 +180,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -317,7 +310,6 @@ public static com.google.container.v1.MaintenanceWindow parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -325,7 +317,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.MaintenanceWindow prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -353,7 +344,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_MaintenanceWindow_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_MaintenanceWindow_fieldAccessorTable
@@ -376,7 +366,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       policyCase_ = 0;
@@ -384,18 +373,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_MaintenanceWindow_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.MaintenanceWindow getDefaultInstanceForType() {
       return com.google.container.v1.MaintenanceWindow.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.MaintenanceWindow build() {
       com.google.container.v1.MaintenanceWindow result = buildPartial();
       if (!result.isInitialized()) {
@@ -404,7 +390,6 @@ public com.google.container.v1.MaintenanceWindow build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.MaintenanceWindow buildPartial() {
       com.google.container.v1.MaintenanceWindow result = new com.google.container.v1.MaintenanceWindow(this);
       if (policyCase_ == 2) {
@@ -419,39 +404,32 @@ public com.google.container.v1.MaintenanceWindow buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.MaintenanceWindow) {
         return mergeFrom((com.google.container.v1.MaintenanceWindow)other);
@@ -477,12 +455,10 @@ public Builder mergeFrom(com.google.container.v1.MaintenanceWindow other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -687,13 +663,11 @@ public com.google.container.v1.DailyMaintenanceWindowOrBuilder getDailyMaintenan
       onChanged();;
       return dailyMaintenanceWindowBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -715,12 +689,11 @@ public static com.google.container.v1.MaintenanceWindow getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public MaintenanceWindow parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new MaintenanceWindow(input, extensionRegistry);
+        return new MaintenanceWindow(input, extensionRegistry);
     }
   };
 
@@ -733,7 +706,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.MaintenanceWindow getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MasterAuth.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MasterAuth.java
index 8c93bc434d92..b66a2ced0f20 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MasterAuth.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MasterAuth.java
@@ -39,9 +39,6 @@ private MasterAuth(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private MasterAuth(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -96,13 +100,6 @@ private MasterAuth(
             clientKey_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -120,7 +117,6 @@ private MasterAuth(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_MasterAuth_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_MasterAuth_fieldAccessorTable
@@ -391,7 +387,6 @@ public java.lang.String getClientKey() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -401,7 +396,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getUsernameBytes().isEmpty()) {
@@ -425,7 +419,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -581,7 +574,6 @@ public static com.google.container.v1.MasterAuth parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -589,7 +581,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.MasterAuth prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -619,7 +610,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_MasterAuth_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_MasterAuth_fieldAccessorTable
@@ -642,7 +632,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       username_ = "";
@@ -664,18 +653,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_MasterAuth_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.MasterAuth getDefaultInstanceForType() {
       return com.google.container.v1.MasterAuth.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.MasterAuth build() {
       com.google.container.v1.MasterAuth result = buildPartial();
       if (!result.isInitialized()) {
@@ -684,7 +670,6 @@ public com.google.container.v1.MasterAuth build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.MasterAuth buildPartial() {
       com.google.container.v1.MasterAuth result = new com.google.container.v1.MasterAuth(this);
       result.username_ = username_;
@@ -701,39 +686,32 @@ public com.google.container.v1.MasterAuth buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.MasterAuth) {
         return mergeFrom((com.google.container.v1.MasterAuth)other);
@@ -773,12 +751,10 @@ public Builder mergeFrom(com.google.container.v1.MasterAuth other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1443,13 +1419,11 @@ public Builder setClientKeyBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1471,12 +1445,11 @@ public static com.google.container.v1.MasterAuth getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public MasterAuth parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new MasterAuth(input, extensionRegistry);
+        return new MasterAuth(input, extensionRegistry);
     }
   };
 
@@ -1489,7 +1462,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.MasterAuth getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MasterAuthorizedNetworksConfig.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MasterAuthorizedNetworksConfig.java
index 0e4e5e766948..bd580acfe85c 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MasterAuthorizedNetworksConfig.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/MasterAuthorizedNetworksConfig.java
@@ -38,9 +38,6 @@ private MasterAuthorizedNetworksConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private MasterAuthorizedNetworksConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
 
             enabled_ = input.readBool();
@@ -66,13 +70,6 @@ private MasterAuthorizedNetworksConfig(
                 input.readMessage(com.google.container.v1.MasterAuthorizedNetworksConfig.CidrBlock.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -93,7 +90,6 @@ private MasterAuthorizedNetworksConfig(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_MasterAuthorizedNetworksConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_MasterAuthorizedNetworksConfig_fieldAccessorTable
@@ -172,9 +168,6 @@ private CidrBlock(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -186,6 +179,13 @@ private CidrBlock(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -198,13 +198,6 @@ private CidrBlock(
               cidrBlock_ = s;
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -222,7 +215,6 @@ private CidrBlock(
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_MasterAuthorizedNetworksConfig_CidrBlock_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_MasterAuthorizedNetworksConfig_CidrBlock_fieldAccessorTable
@@ -315,7 +307,6 @@ public java.lang.String getCidrBlock() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -325,7 +316,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getDisplayNameBytes().isEmpty()) {
@@ -337,7 +327,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -459,7 +448,6 @@ public static com.google.container.v1.MasterAuthorizedNetworksConfig.CidrBlock p
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -467,7 +455,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.container.v1.MasterAuthorizedNetworksConfig.CidrBlock prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -495,7 +482,6 @@ public static final class Builder extends
         return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_MasterAuthorizedNetworksConfig_CidrBlock_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_MasterAuthorizedNetworksConfig_CidrBlock_fieldAccessorTable
@@ -518,7 +504,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         displayName_ = "";
@@ -528,18 +513,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_MasterAuthorizedNetworksConfig_CidrBlock_descriptor;
       }
 
-      @java.lang.Override
       public com.google.container.v1.MasterAuthorizedNetworksConfig.CidrBlock getDefaultInstanceForType() {
         return com.google.container.v1.MasterAuthorizedNetworksConfig.CidrBlock.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.container.v1.MasterAuthorizedNetworksConfig.CidrBlock build() {
         com.google.container.v1.MasterAuthorizedNetworksConfig.CidrBlock result = buildPartial();
         if (!result.isInitialized()) {
@@ -548,7 +530,6 @@ public com.google.container.v1.MasterAuthorizedNetworksConfig.CidrBlock build()
         return result;
       }
 
-      @java.lang.Override
       public com.google.container.v1.MasterAuthorizedNetworksConfig.CidrBlock buildPartial() {
         com.google.container.v1.MasterAuthorizedNetworksConfig.CidrBlock result = new com.google.container.v1.MasterAuthorizedNetworksConfig.CidrBlock(this);
         result.displayName_ = displayName_;
@@ -557,39 +538,32 @@ public com.google.container.v1.MasterAuthorizedNetworksConfig.CidrBlock buildPar
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.container.v1.MasterAuthorizedNetworksConfig.CidrBlock) {
           return mergeFrom((com.google.container.v1.MasterAuthorizedNetworksConfig.CidrBlock)other);
@@ -614,12 +588,10 @@ public Builder mergeFrom(com.google.container.v1.MasterAuthorizedNetworksConfig.
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -815,13 +787,11 @@ public Builder setCidrBlockBytes(
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -843,12 +813,11 @@ public static com.google.container.v1.MasterAuthorizedNetworksConfig.CidrBlock g
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public CidrBlock parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new CidrBlock(input, extensionRegistry);
+          return new CidrBlock(input, extensionRegistry);
       }
     };
 
@@ -861,7 +830,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.container.v1.MasterAuthorizedNetworksConfig.CidrBlock getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -943,7 +911,6 @@ public com.google.container.v1.MasterAuthorizedNetworksConfig.CidrBlockOrBuilder
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -953,7 +920,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (enabled_ != false) {
@@ -965,7 +931,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1092,7 +1057,6 @@ public static com.google.container.v1.MasterAuthorizedNetworksConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1100,7 +1064,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.MasterAuthorizedNetworksConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1132,7 +1095,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_MasterAuthorizedNetworksConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_MasterAuthorizedNetworksConfig_fieldAccessorTable
@@ -1156,7 +1118,6 @@ private void maybeForceBuilderInitialization() {
         getCidrBlocksFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       enabled_ = false;
@@ -1170,18 +1131,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_MasterAuthorizedNetworksConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.MasterAuthorizedNetworksConfig getDefaultInstanceForType() {
       return com.google.container.v1.MasterAuthorizedNetworksConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.MasterAuthorizedNetworksConfig build() {
       com.google.container.v1.MasterAuthorizedNetworksConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -1190,7 +1148,6 @@ public com.google.container.v1.MasterAuthorizedNetworksConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.MasterAuthorizedNetworksConfig buildPartial() {
       com.google.container.v1.MasterAuthorizedNetworksConfig result = new com.google.container.v1.MasterAuthorizedNetworksConfig(this);
       int from_bitField0_ = bitField0_;
@@ -1210,39 +1167,32 @@ public com.google.container.v1.MasterAuthorizedNetworksConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.MasterAuthorizedNetworksConfig) {
         return mergeFrom((com.google.container.v1.MasterAuthorizedNetworksConfig)other);
@@ -1288,12 +1238,10 @@ public Builder mergeFrom(com.google.container.v1.MasterAuthorizedNetworksConfig
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1680,13 +1628,11 @@ public com.google.container.v1.MasterAuthorizedNetworksConfig.CidrBlock.Builder
       }
       return cidrBlocksBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1708,12 +1654,11 @@ public static com.google.container.v1.MasterAuthorizedNetworksConfig getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public MasterAuthorizedNetworksConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new MasterAuthorizedNetworksConfig(input, extensionRegistry);
+        return new MasterAuthorizedNetworksConfig(input, extensionRegistry);
     }
   };
 
@@ -1726,7 +1671,6 @@ public com.google.protobuf.Parser getParserForTy
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.MasterAuthorizedNetworksConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NetworkPolicy.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NetworkPolicy.java
index a42fc358a878..7c27d3fd756d 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NetworkPolicy.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NetworkPolicy.java
@@ -35,9 +35,6 @@ private NetworkPolicy(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private NetworkPolicy(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -60,13 +64,6 @@ private NetworkPolicy(
             enabled_ = input.readBool();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private NetworkPolicy(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NetworkPolicy_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NetworkPolicy_fieldAccessorTable
@@ -230,7 +226,6 @@ public int getProviderValue() {
    * .google.container.v1.NetworkPolicy.Provider provider = 1;
    */
   public com.google.container.v1.NetworkPolicy.Provider getProvider() {
-    @SuppressWarnings("deprecation")
     com.google.container.v1.NetworkPolicy.Provider result = com.google.container.v1.NetworkPolicy.Provider.valueOf(provider_);
     return result == null ? com.google.container.v1.NetworkPolicy.Provider.UNRECOGNIZED : result;
   }
@@ -249,7 +244,6 @@ public boolean getEnabled() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -259,7 +253,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (provider_ != com.google.container.v1.NetworkPolicy.Provider.PROVIDER_UNSPECIFIED.getNumber()) {
@@ -271,7 +264,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -395,7 +387,6 @@ public static com.google.container.v1.NetworkPolicy parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -403,7 +394,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.NetworkPolicy prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -432,7 +422,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NetworkPolicy_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NetworkPolicy_fieldAccessorTable
@@ -455,7 +444,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       provider_ = 0;
@@ -465,18 +453,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NetworkPolicy_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.NetworkPolicy getDefaultInstanceForType() {
       return com.google.container.v1.NetworkPolicy.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.NetworkPolicy build() {
       com.google.container.v1.NetworkPolicy result = buildPartial();
       if (!result.isInitialized()) {
@@ -485,7 +470,6 @@ public com.google.container.v1.NetworkPolicy build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.NetworkPolicy buildPartial() {
       com.google.container.v1.NetworkPolicy result = new com.google.container.v1.NetworkPolicy(this);
       result.provider_ = provider_;
@@ -494,39 +478,32 @@ public com.google.container.v1.NetworkPolicy buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.NetworkPolicy) {
         return mergeFrom((com.google.container.v1.NetworkPolicy)other);
@@ -549,12 +526,10 @@ public Builder mergeFrom(com.google.container.v1.NetworkPolicy other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -604,7 +579,6 @@ public Builder setProviderValue(int value) {
      * .google.container.v1.NetworkPolicy.Provider provider = 1;
      */
     public com.google.container.v1.NetworkPolicy.Provider getProvider() {
-      @SuppressWarnings("deprecation")
       com.google.container.v1.NetworkPolicy.Provider result = com.google.container.v1.NetworkPolicy.Provider.valueOf(provider_);
       return result == null ? com.google.container.v1.NetworkPolicy.Provider.UNRECOGNIZED : result;
     }
@@ -675,13 +649,11 @@ public Builder clearEnabled() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -703,12 +675,11 @@ public static com.google.container.v1.NetworkPolicy getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public NetworkPolicy parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new NetworkPolicy(input, extensionRegistry);
+        return new NetworkPolicy(input, extensionRegistry);
     }
   };
 
@@ -721,7 +692,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.NetworkPolicy getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NetworkPolicyConfig.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NetworkPolicyConfig.java
index 37c23f6b7a6c..667cc14b1f6e 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NetworkPolicyConfig.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NetworkPolicyConfig.java
@@ -35,9 +35,6 @@ private NetworkPolicyConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,11 +46,6 @@ private NetworkPolicyConfig(
           case 0:
             done = true;
             break;
-          case 8: {
-
-            disabled_ = input.readBool();
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -61,6 +53,11 @@ private NetworkPolicyConfig(
             }
             break;
           }
+          case 8: {
+
+            disabled_ = input.readBool();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -78,7 +75,6 @@ private NetworkPolicyConfig(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NetworkPolicyConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NetworkPolicyConfig_fieldAccessorTable
@@ -100,7 +96,6 @@ public boolean getDisabled() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -110,7 +105,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (disabled_ != false) {
@@ -119,7 +113,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -236,7 +229,6 @@ public static com.google.container.v1.NetworkPolicyConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -244,7 +236,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.NetworkPolicyConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -274,7 +265,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NetworkPolicyConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NetworkPolicyConfig_fieldAccessorTable
@@ -297,7 +287,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       disabled_ = false;
@@ -305,18 +294,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NetworkPolicyConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.NetworkPolicyConfig getDefaultInstanceForType() {
       return com.google.container.v1.NetworkPolicyConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.NetworkPolicyConfig build() {
       com.google.container.v1.NetworkPolicyConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -325,7 +311,6 @@ public com.google.container.v1.NetworkPolicyConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.NetworkPolicyConfig buildPartial() {
       com.google.container.v1.NetworkPolicyConfig result = new com.google.container.v1.NetworkPolicyConfig(this);
       result.disabled_ = disabled_;
@@ -333,39 +318,32 @@ public com.google.container.v1.NetworkPolicyConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.NetworkPolicyConfig) {
         return mergeFrom((com.google.container.v1.NetworkPolicyConfig)other);
@@ -385,12 +363,10 @@ public Builder mergeFrom(com.google.container.v1.NetworkPolicyConfig other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -446,13 +422,11 @@ public Builder clearDisabled() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -474,12 +448,11 @@ public static com.google.container.v1.NetworkPolicyConfig getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public NetworkPolicyConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new NetworkPolicyConfig(input, extensionRegistry);
+        return new NetworkPolicyConfig(input, extensionRegistry);
     }
   };
 
@@ -492,7 +465,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.NetworkPolicyConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodeConfig.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodeConfig.java
index 3e8181ca2ed4..a119ae21e4cd 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodeConfig.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodeConfig.java
@@ -42,9 +42,6 @@ private NodeConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -56,6 +53,13 @@ private NodeConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -148,13 +152,6 @@ private NodeConfig(
             minCpuPlatform_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -182,7 +179,6 @@ private NodeConfig(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -195,7 +191,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NodeConfig_fieldAccessorTable
@@ -897,7 +892,6 @@ public java.lang.String getMinCpuPlatform() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -907,7 +901,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getMachineTypeBytes().isEmpty()) {
@@ -955,7 +948,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1186,7 +1178,6 @@ public static com.google.container.v1.NodeConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1194,7 +1185,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.NodeConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1248,7 +1238,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NodeConfig_fieldAccessorTable
@@ -1272,7 +1261,6 @@ private void maybeForceBuilderInitialization() {
         getAcceleratorsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       machineType_ = "";
@@ -1304,18 +1292,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NodeConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.NodeConfig getDefaultInstanceForType() {
       return com.google.container.v1.NodeConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.NodeConfig build() {
       com.google.container.v1.NodeConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -1324,7 +1309,6 @@ public com.google.container.v1.NodeConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.NodeConfig buildPartial() {
       com.google.container.v1.NodeConfig result = new com.google.container.v1.NodeConfig(this);
       int from_bitField0_ = bitField0_;
@@ -1364,39 +1348,32 @@ public com.google.container.v1.NodeConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.NodeConfig) {
         return mergeFrom((com.google.container.v1.NodeConfig)other);
@@ -1488,12 +1465,10 @@ public Builder mergeFrom(com.google.container.v1.NodeConfig other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3200,13 +3175,11 @@ public Builder setMinCpuPlatformBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -3228,12 +3201,11 @@ public static com.google.container.v1.NodeConfig getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public NodeConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new NodeConfig(input, extensionRegistry);
+        return new NodeConfig(input, extensionRegistry);
     }
   };
 
@@ -3246,7 +3218,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.NodeConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodeManagement.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodeManagement.java
index 7573882c42dc..6e83b1c6e41e 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodeManagement.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodeManagement.java
@@ -35,9 +35,6 @@ private NodeManagement(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private NodeManagement(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
 
             autoUpgrade_ = input.readBool();
@@ -72,13 +76,6 @@ private NodeManagement(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private NodeManagement(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NodeManagement_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NodeManagement_fieldAccessorTable
@@ -169,7 +165,6 @@ public com.google.container.v1.AutoUpgradeOptionsOrBuilder getUpgradeOptionsOrBu
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -179,7 +174,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (autoUpgrade_ != false) {
@@ -194,7 +188,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -333,7 +326,6 @@ public static com.google.container.v1.NodeManagement parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -341,7 +333,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.NodeManagement prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -370,7 +361,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NodeManagement_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NodeManagement_fieldAccessorTable
@@ -393,7 +383,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       autoUpgrade_ = false;
@@ -409,18 +398,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NodeManagement_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.NodeManagement getDefaultInstanceForType() {
       return com.google.container.v1.NodeManagement.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.NodeManagement build() {
       com.google.container.v1.NodeManagement result = buildPartial();
       if (!result.isInitialized()) {
@@ -429,7 +415,6 @@ public com.google.container.v1.NodeManagement build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.NodeManagement buildPartial() {
       com.google.container.v1.NodeManagement result = new com.google.container.v1.NodeManagement(this);
       result.autoUpgrade_ = autoUpgrade_;
@@ -443,39 +428,32 @@ public com.google.container.v1.NodeManagement buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.NodeManagement) {
         return mergeFrom((com.google.container.v1.NodeManagement)other);
@@ -501,12 +479,10 @@ public Builder mergeFrom(com.google.container.v1.NodeManagement other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -768,13 +744,11 @@ public com.google.container.v1.AutoUpgradeOptionsOrBuilder getUpgradeOptionsOrBu
       }
       return upgradeOptionsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -796,12 +770,11 @@ public static com.google.container.v1.NodeManagement getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public NodeManagement parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new NodeManagement(input, extensionRegistry);
+        return new NodeManagement(input, extensionRegistry);
     }
   };
 
@@ -814,7 +787,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.NodeManagement getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodePool.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodePool.java
index 4fc7a2279e5b..03d5ffb979eb 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodePool.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodePool.java
@@ -44,9 +44,6 @@ private NodePool(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -58,6 +55,13 @@ private NodePool(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -141,13 +145,6 @@ private NodePool(
             statusMessage_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -168,7 +165,6 @@ private NodePool(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NodePool_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NodePool_fieldAccessorTable
@@ -642,7 +638,6 @@ public int getStatusValue() {
    * .google.container.v1.NodePool.Status status = 103;
    */
   public com.google.container.v1.NodePool.Status getStatus() {
-    @SuppressWarnings("deprecation")
     com.google.container.v1.NodePool.Status result = com.google.container.v1.NodePool.Status.valueOf(status_);
     return result == null ? com.google.container.v1.NodePool.Status.UNRECOGNIZED : result;
   }
@@ -761,7 +756,6 @@ public com.google.container.v1.NodeManagementOrBuilder getManagementOrBuilder()
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -771,7 +765,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -807,7 +800,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1011,7 +1003,6 @@ public static com.google.container.v1.NodePool parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1019,7 +1010,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.NodePool prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1052,7 +1042,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NodePool_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NodePool_fieldAccessorTable
@@ -1075,7 +1064,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -1113,18 +1101,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NodePool_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.NodePool getDefaultInstanceForType() {
       return com.google.container.v1.NodePool.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.NodePool build() {
       com.google.container.v1.NodePool result = buildPartial();
       if (!result.isInitialized()) {
@@ -1133,7 +1118,6 @@ public com.google.container.v1.NodePool build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.NodePool buildPartial() {
       com.google.container.v1.NodePool result = new com.google.container.v1.NodePool(this);
       int from_bitField0_ = bitField0_;
@@ -1169,39 +1153,32 @@ public com.google.container.v1.NodePool buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.NodePool) {
         return mergeFrom((com.google.container.v1.NodePool)other);
@@ -1259,12 +1236,10 @@ public Builder mergeFrom(com.google.container.v1.NodePool other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1930,7 +1905,6 @@ public Builder setStatusValue(int value) {
      * .google.container.v1.NodePool.Status status = 103;
      */
     public com.google.container.v1.NodePool.Status getStatus() {
-      @SuppressWarnings("deprecation")
       com.google.container.v1.NodePool.Status result = com.google.container.v1.NodePool.Status.valueOf(status_);
       return result == null ? com.google.container.v1.NodePool.Status.UNRECOGNIZED : result;
     }
@@ -2372,13 +2346,11 @@ public com.google.container.v1.NodeManagementOrBuilder getManagementOrBuilder()
       }
       return managementBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2400,12 +2372,11 @@ public static com.google.container.v1.NodePool getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public NodePool parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new NodePool(input, extensionRegistry);
+        return new NodePool(input, extensionRegistry);
     }
   };
 
@@ -2418,7 +2389,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.NodePool getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodePoolAutoscaling.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodePoolAutoscaling.java
index 2f3db5927965..cd79e9006282 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodePoolAutoscaling.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/NodePoolAutoscaling.java
@@ -36,9 +36,6 @@ private NodePoolAutoscaling(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private NodePoolAutoscaling(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
 
             enabled_ = input.readBool();
@@ -65,13 +69,6 @@ private NodePoolAutoscaling(
             maxNodeCount_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -89,7 +86,6 @@ private NodePoolAutoscaling(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NodePoolAutoscaling_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NodePoolAutoscaling_fieldAccessorTable
@@ -139,7 +135,6 @@ public int getMaxNodeCount() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -149,7 +144,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (enabled_ != false) {
@@ -164,7 +158,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -297,7 +290,6 @@ public static com.google.container.v1.NodePoolAutoscaling parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -305,7 +297,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.NodePoolAutoscaling prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -334,7 +325,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NodePoolAutoscaling_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NodePoolAutoscaling_fieldAccessorTable
@@ -357,7 +347,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       enabled_ = false;
@@ -369,18 +358,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_NodePoolAutoscaling_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.NodePoolAutoscaling getDefaultInstanceForType() {
       return com.google.container.v1.NodePoolAutoscaling.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.NodePoolAutoscaling build() {
       com.google.container.v1.NodePoolAutoscaling result = buildPartial();
       if (!result.isInitialized()) {
@@ -389,7 +375,6 @@ public com.google.container.v1.NodePoolAutoscaling build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.NodePoolAutoscaling buildPartial() {
       com.google.container.v1.NodePoolAutoscaling result = new com.google.container.v1.NodePoolAutoscaling(this);
       result.enabled_ = enabled_;
@@ -399,39 +384,32 @@ public com.google.container.v1.NodePoolAutoscaling buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.NodePoolAutoscaling) {
         return mergeFrom((com.google.container.v1.NodePoolAutoscaling)other);
@@ -457,12 +435,10 @@ public Builder mergeFrom(com.google.container.v1.NodePoolAutoscaling other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -600,13 +576,11 @@ public Builder clearMaxNodeCount() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -628,12 +602,11 @@ public static com.google.container.v1.NodePoolAutoscaling getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public NodePoolAutoscaling parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new NodePoolAutoscaling(input, extensionRegistry);
+        return new NodePoolAutoscaling(input, extensionRegistry);
     }
   };
 
@@ -646,7 +619,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.NodePoolAutoscaling getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/Operation.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/Operation.java
index d267d02673e9..6d4a733c6953 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/Operation.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/Operation.java
@@ -43,9 +43,6 @@ private Operation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -57,6 +54,13 @@ private Operation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -117,13 +121,6 @@ private Operation(
             endTime_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -141,7 +138,6 @@ private Operation(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_Operation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_Operation_fieldAccessorTable
@@ -799,7 +795,6 @@ public int getOperationTypeValue() {
    * .google.container.v1.Operation.Type operation_type = 3;
    */
   public com.google.container.v1.Operation.Type getOperationType() {
-    @SuppressWarnings("deprecation")
     com.google.container.v1.Operation.Type result = com.google.container.v1.Operation.Type.valueOf(operationType_);
     return result == null ? com.google.container.v1.Operation.Type.UNRECOGNIZED : result;
   }
@@ -824,7 +819,6 @@ public int getStatusValue() {
    * .google.container.v1.Operation.Status status = 4;
    */
   public com.google.container.v1.Operation.Status getStatus() {
-    @SuppressWarnings("deprecation")
     com.google.container.v1.Operation.Status result = com.google.container.v1.Operation.Status.valueOf(status_);
     return result == null ? com.google.container.v1.Operation.Status.UNRECOGNIZED : result;
   }
@@ -1086,7 +1080,6 @@ public java.lang.String getEndTime() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1096,7 +1089,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -1132,7 +1124,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1310,7 +1301,6 @@ public static com.google.container.v1.Operation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1318,7 +1308,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.Operation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1347,7 +1336,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_Operation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_Operation_fieldAccessorTable
@@ -1370,7 +1358,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -1396,18 +1383,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_Operation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.Operation getDefaultInstanceForType() {
       return com.google.container.v1.Operation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.Operation build() {
       com.google.container.v1.Operation result = buildPartial();
       if (!result.isInitialized()) {
@@ -1416,7 +1400,6 @@ public com.google.container.v1.Operation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.Operation buildPartial() {
       com.google.container.v1.Operation result = new com.google.container.v1.Operation(this);
       result.name_ = name_;
@@ -1433,39 +1416,32 @@ public com.google.container.v1.Operation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.Operation) {
         return mergeFrom((com.google.container.v1.Operation)other);
@@ -1520,12 +1496,10 @@ public Builder mergeFrom(com.google.container.v1.Operation other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1763,7 +1737,6 @@ public Builder setOperationTypeValue(int value) {
      * .google.container.v1.Operation.Type operation_type = 3;
      */
     public com.google.container.v1.Operation.Type getOperationType() {
-      @SuppressWarnings("deprecation")
       com.google.container.v1.Operation.Type result = com.google.container.v1.Operation.Type.valueOf(operationType_);
       return result == null ? com.google.container.v1.Operation.Type.UNRECOGNIZED : result;
     }
@@ -1828,7 +1801,6 @@ public Builder setStatusValue(int value) {
      * .google.container.v1.Operation.Status status = 4;
      */
     public com.google.container.v1.Operation.Status getStatus() {
-      @SuppressWarnings("deprecation")
       com.google.container.v1.Operation.Status result = com.google.container.v1.Operation.Status.valueOf(status_);
       return result == null ? com.google.container.v1.Operation.Status.UNRECOGNIZED : result;
     }
@@ -2405,13 +2377,11 @@ public Builder setEndTimeBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2433,12 +2403,11 @@ public static com.google.container.v1.Operation getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Operation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Operation(input, extensionRegistry);
+        return new Operation(input, extensionRegistry);
     }
   };
 
@@ -2451,7 +2420,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.Operation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/RollbackNodePoolUpgradeRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/RollbackNodePoolUpgradeRequest.java
index 7777458999a0..2399306d6010 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/RollbackNodePoolUpgradeRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/RollbackNodePoolUpgradeRequest.java
@@ -38,9 +38,6 @@ private RollbackNodePoolUpgradeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private RollbackNodePoolUpgradeRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -76,13 +80,6 @@ private RollbackNodePoolUpgradeRequest(
             nodePoolId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -100,7 +97,6 @@ private RollbackNodePoolUpgradeRequest(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_RollbackNodePoolUpgradeRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_RollbackNodePoolUpgradeRequest_fieldAccessorTable
@@ -283,7 +279,6 @@ public java.lang.String getNodePoolId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -293,7 +288,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -311,7 +305,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -447,7 +440,6 @@ public static com.google.container.v1.RollbackNodePoolUpgradeRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -455,7 +447,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.RollbackNodePoolUpgradeRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -485,7 +476,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_RollbackNodePoolUpgradeRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_RollbackNodePoolUpgradeRequest_fieldAccessorTable
@@ -508,7 +498,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -522,18 +511,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_RollbackNodePoolUpgradeRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.RollbackNodePoolUpgradeRequest getDefaultInstanceForType() {
       return com.google.container.v1.RollbackNodePoolUpgradeRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.RollbackNodePoolUpgradeRequest build() {
       com.google.container.v1.RollbackNodePoolUpgradeRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -542,7 +528,6 @@ public com.google.container.v1.RollbackNodePoolUpgradeRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.RollbackNodePoolUpgradeRequest buildPartial() {
       com.google.container.v1.RollbackNodePoolUpgradeRequest result = new com.google.container.v1.RollbackNodePoolUpgradeRequest(this);
       result.projectId_ = projectId_;
@@ -553,39 +538,32 @@ public com.google.container.v1.RollbackNodePoolUpgradeRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.RollbackNodePoolUpgradeRequest) {
         return mergeFrom((com.google.container.v1.RollbackNodePoolUpgradeRequest)other);
@@ -618,12 +596,10 @@ public Builder mergeFrom(com.google.container.v1.RollbackNodePoolUpgradeRequest
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1012,13 +988,11 @@ public Builder setNodePoolIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1040,12 +1014,11 @@ public static com.google.container.v1.RollbackNodePoolUpgradeRequest getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RollbackNodePoolUpgradeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RollbackNodePoolUpgradeRequest(input, extensionRegistry);
+        return new RollbackNodePoolUpgradeRequest(input, extensionRegistry);
     }
   };
 
@@ -1058,7 +1031,6 @@ public com.google.protobuf.Parser getParserForTy
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.RollbackNodePoolUpgradeRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ServerConfig.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ServerConfig.java
index 5ec8e647e790..2120fbc1e984 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ServerConfig.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/ServerConfig.java
@@ -37,9 +37,6 @@ private ServerConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private ServerConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -90,13 +94,6 @@ private ServerConfig(
             validMasterVersions_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -123,7 +120,6 @@ private ServerConfig(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ServerConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ServerConfig_fieldAccessorTable
@@ -352,7 +348,6 @@ public java.lang.String getValidMasterVersions(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -362,7 +357,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getDefaultClusterVersionBytes().isEmpty()) {
@@ -383,7 +377,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -547,7 +540,6 @@ public static com.google.container.v1.ServerConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -555,7 +547,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.ServerConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -583,7 +574,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ServerConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ServerConfig_fieldAccessorTable
@@ -606,7 +596,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       defaultClusterVersion_ = "";
@@ -622,18 +611,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_ServerConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.ServerConfig getDefaultInstanceForType() {
       return com.google.container.v1.ServerConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.ServerConfig build() {
       com.google.container.v1.ServerConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -642,7 +628,6 @@ public com.google.container.v1.ServerConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.ServerConfig buildPartial() {
       com.google.container.v1.ServerConfig result = new com.google.container.v1.ServerConfig(this);
       int from_bitField0_ = bitField0_;
@@ -669,39 +654,32 @@ public com.google.container.v1.ServerConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.ServerConfig) {
         return mergeFrom((com.google.container.v1.ServerConfig)other);
@@ -756,12 +734,10 @@ public Builder mergeFrom(com.google.container.v1.ServerConfig other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1348,13 +1324,11 @@ public Builder addValidMasterVersionsBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1376,12 +1350,11 @@ public static com.google.container.v1.ServerConfig getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ServerConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ServerConfig(input, extensionRegistry);
+        return new ServerConfig(input, extensionRegistry);
     }
   };
 
@@ -1394,7 +1367,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.ServerConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetAddonsConfigRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetAddonsConfigRequest.java
index 0de7532c2965..7477903bb79d 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetAddonsConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetAddonsConfigRequest.java
@@ -35,9 +35,6 @@ private SetAddonsConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private SetAddonsConfigRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -80,13 +84,6 @@ private SetAddonsConfigRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private SetAddonsConfigRequest(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetAddonsConfigRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetAddonsConfigRequest_fieldAccessorTable
@@ -281,7 +277,6 @@ public com.google.container.v1.AddonsConfigOrBuilder getAddonsConfigOrBuilder()
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -291,7 +286,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -309,7 +303,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -451,7 +444,6 @@ public static com.google.container.v1.SetAddonsConfigRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -459,7 +451,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.SetAddonsConfigRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -487,7 +478,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetAddonsConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetAddonsConfigRequest_fieldAccessorTable
@@ -510,7 +500,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -528,18 +517,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetAddonsConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetAddonsConfigRequest getDefaultInstanceForType() {
       return com.google.container.v1.SetAddonsConfigRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetAddonsConfigRequest build() {
       com.google.container.v1.SetAddonsConfigRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -548,7 +534,6 @@ public com.google.container.v1.SetAddonsConfigRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetAddonsConfigRequest buildPartial() {
       com.google.container.v1.SetAddonsConfigRequest result = new com.google.container.v1.SetAddonsConfigRequest(this);
       result.projectId_ = projectId_;
@@ -563,39 +548,32 @@ public com.google.container.v1.SetAddonsConfigRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.SetAddonsConfigRequest) {
         return mergeFrom((com.google.container.v1.SetAddonsConfigRequest)other);
@@ -627,12 +605,10 @@ public Builder mergeFrom(com.google.container.v1.SetAddonsConfigRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1094,13 +1070,11 @@ public com.google.container.v1.AddonsConfigOrBuilder getAddonsConfigOrBuilder()
       }
       return addonsConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1122,12 +1096,11 @@ public static com.google.container.v1.SetAddonsConfigRequest getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SetAddonsConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SetAddonsConfigRequest(input, extensionRegistry);
+        return new SetAddonsConfigRequest(input, extensionRegistry);
     }
   };
 
@@ -1140,7 +1113,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.SetAddonsConfigRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLabelsRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLabelsRequest.java
index f72557a9ff59..0079f987deb8 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLabelsRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLabelsRequest.java
@@ -38,9 +38,6 @@ private SetLabelsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private SetLabelsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -89,13 +93,6 @@ private SetLabelsRequest(
             labelFingerprint_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -114,7 +111,6 @@ private SetLabelsRequest(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -125,7 +121,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetLabelsRequest_fieldAccessorTable
@@ -411,7 +406,6 @@ public java.lang.String getLabelFingerprint() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -421,7 +415,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -445,7 +438,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -597,7 +589,6 @@ public static com.google.container.v1.SetLabelsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -605,7 +596,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.SetLabelsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -657,7 +647,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetLabelsRequest_fieldAccessorTable
@@ -680,7 +669,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -695,18 +683,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetLabelsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetLabelsRequest getDefaultInstanceForType() {
       return com.google.container.v1.SetLabelsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetLabelsRequest build() {
       com.google.container.v1.SetLabelsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -715,7 +700,6 @@ public com.google.container.v1.SetLabelsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetLabelsRequest buildPartial() {
       com.google.container.v1.SetLabelsRequest result = new com.google.container.v1.SetLabelsRequest(this);
       int from_bitField0_ = bitField0_;
@@ -731,39 +715,32 @@ public com.google.container.v1.SetLabelsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.SetLabelsRequest) {
         return mergeFrom((com.google.container.v1.SetLabelsRequest)other);
@@ -798,12 +775,10 @@ public Builder mergeFrom(com.google.container.v1.SetLabelsRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1369,13 +1344,11 @@ public Builder setLabelFingerprintBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1397,12 +1370,11 @@ public static com.google.container.v1.SetLabelsRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SetLabelsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SetLabelsRequest(input, extensionRegistry);
+        return new SetLabelsRequest(input, extensionRegistry);
     }
   };
 
@@ -1415,7 +1387,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.SetLabelsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLegacyAbacRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLegacyAbacRequest.java
index 05cf0e132e48..fae00026d790 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLegacyAbacRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLegacyAbacRequest.java
@@ -37,9 +37,6 @@ private SetLegacyAbacRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private SetLegacyAbacRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -74,13 +78,6 @@ private SetLegacyAbacRequest(
             enabled_ = input.readBool();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -98,7 +95,6 @@ private SetLegacyAbacRequest(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetLegacyAbacRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetLegacyAbacRequest_fieldAccessorTable
@@ -252,7 +248,6 @@ public boolean getEnabled() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -262,7 +257,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -280,7 +274,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -418,7 +411,6 @@ public static com.google.container.v1.SetLegacyAbacRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -426,7 +418,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.SetLegacyAbacRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -455,7 +446,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetLegacyAbacRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetLegacyAbacRequest_fieldAccessorTable
@@ -478,7 +468,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -492,18 +481,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetLegacyAbacRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetLegacyAbacRequest getDefaultInstanceForType() {
       return com.google.container.v1.SetLegacyAbacRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetLegacyAbacRequest build() {
       com.google.container.v1.SetLegacyAbacRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -512,7 +498,6 @@ public com.google.container.v1.SetLegacyAbacRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetLegacyAbacRequest buildPartial() {
       com.google.container.v1.SetLegacyAbacRequest result = new com.google.container.v1.SetLegacyAbacRequest(this);
       result.projectId_ = projectId_;
@@ -523,39 +508,32 @@ public com.google.container.v1.SetLegacyAbacRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.SetLegacyAbacRequest) {
         return mergeFrom((com.google.container.v1.SetLegacyAbacRequest)other);
@@ -587,12 +565,10 @@ public Builder mergeFrom(com.google.container.v1.SetLegacyAbacRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -930,13 +906,11 @@ public Builder clearEnabled() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -958,12 +932,11 @@ public static com.google.container.v1.SetLegacyAbacRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SetLegacyAbacRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SetLegacyAbacRequest(input, extensionRegistry);
+        return new SetLegacyAbacRequest(input, extensionRegistry);
     }
   };
 
@@ -976,7 +949,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.SetLegacyAbacRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLocationsRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLocationsRequest.java
index a45e1d33bfc3..391c42913a56 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLocationsRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLocationsRequest.java
@@ -36,9 +36,6 @@ private SetLocationsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private SetLocationsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -77,13 +81,6 @@ private SetLocationsRequest(
             locations_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private SetLocationsRequest(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetLocationsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetLocationsRequest_fieldAccessorTable
@@ -311,7 +307,6 @@ public java.lang.String getLocations(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -321,7 +316,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -339,7 +333,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -482,7 +475,6 @@ public static com.google.container.v1.SetLocationsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -490,7 +482,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.SetLocationsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -518,7 +509,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetLocationsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetLocationsRequest_fieldAccessorTable
@@ -541,7 +531,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -555,18 +544,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetLocationsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetLocationsRequest getDefaultInstanceForType() {
       return com.google.container.v1.SetLocationsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetLocationsRequest build() {
       com.google.container.v1.SetLocationsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -575,7 +561,6 @@ public com.google.container.v1.SetLocationsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetLocationsRequest buildPartial() {
       com.google.container.v1.SetLocationsRequest result = new com.google.container.v1.SetLocationsRequest(this);
       int from_bitField0_ = bitField0_;
@@ -593,39 +578,32 @@ public com.google.container.v1.SetLocationsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.SetLocationsRequest) {
         return mergeFrom((com.google.container.v1.SetLocationsRequest)other);
@@ -664,12 +642,10 @@ public Builder mergeFrom(com.google.container.v1.SetLocationsRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1145,13 +1121,11 @@ public Builder addLocationsBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1173,12 +1147,11 @@ public static com.google.container.v1.SetLocationsRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SetLocationsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SetLocationsRequest(input, extensionRegistry);
+        return new SetLocationsRequest(input, extensionRegistry);
     }
   };
 
@@ -1191,7 +1164,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.SetLocationsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLoggingServiceRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLoggingServiceRequest.java
index 8569f1f1fd34..420539902229 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLoggingServiceRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetLoggingServiceRequest.java
@@ -36,9 +36,6 @@ private SetLoggingServiceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private SetLoggingServiceRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -74,13 +78,6 @@ private SetLoggingServiceRequest(
             loggingService_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -98,7 +95,6 @@ private SetLoggingServiceRequest(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetLoggingServiceRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetLoggingServiceRequest_fieldAccessorTable
@@ -287,7 +283,6 @@ public java.lang.String getLoggingService() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -297,7 +292,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -315,7 +309,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -451,7 +444,6 @@ public static com.google.container.v1.SetLoggingServiceRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -459,7 +451,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.SetLoggingServiceRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -487,7 +478,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetLoggingServiceRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetLoggingServiceRequest_fieldAccessorTable
@@ -510,7 +500,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -524,18 +513,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetLoggingServiceRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetLoggingServiceRequest getDefaultInstanceForType() {
       return com.google.container.v1.SetLoggingServiceRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetLoggingServiceRequest build() {
       com.google.container.v1.SetLoggingServiceRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -544,7 +530,6 @@ public com.google.container.v1.SetLoggingServiceRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetLoggingServiceRequest buildPartial() {
       com.google.container.v1.SetLoggingServiceRequest result = new com.google.container.v1.SetLoggingServiceRequest(this);
       result.projectId_ = projectId_;
@@ -555,39 +540,32 @@ public com.google.container.v1.SetLoggingServiceRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.SetLoggingServiceRequest) {
         return mergeFrom((com.google.container.v1.SetLoggingServiceRequest)other);
@@ -620,12 +598,10 @@ public Builder mergeFrom(com.google.container.v1.SetLoggingServiceRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1029,13 +1005,11 @@ public Builder setLoggingServiceBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1057,12 +1031,11 @@ public static com.google.container.v1.SetLoggingServiceRequest getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SetLoggingServiceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SetLoggingServiceRequest(input, extensionRegistry);
+        return new SetLoggingServiceRequest(input, extensionRegistry);
     }
   };
 
@@ -1075,7 +1048,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.SetLoggingServiceRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMaintenancePolicyRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMaintenancePolicyRequest.java
index 0b11e22931ec..3f13e58e16ae 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMaintenancePolicyRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMaintenancePolicyRequest.java
@@ -35,9 +35,6 @@ private SetMaintenancePolicyRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private SetMaintenancePolicyRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -80,13 +84,6 @@ private SetMaintenancePolicyRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private SetMaintenancePolicyRequest(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetMaintenancePolicyRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetMaintenancePolicyRequest_fieldAccessorTable
@@ -281,7 +277,6 @@ public com.google.container.v1.MaintenancePolicyOrBuilder getMaintenancePolicyOr
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -291,7 +286,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -309,7 +303,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -451,7 +444,6 @@ public static com.google.container.v1.SetMaintenancePolicyRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -459,7 +451,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.SetMaintenancePolicyRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -487,7 +478,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetMaintenancePolicyRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetMaintenancePolicyRequest_fieldAccessorTable
@@ -510,7 +500,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -528,18 +517,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetMaintenancePolicyRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetMaintenancePolicyRequest getDefaultInstanceForType() {
       return com.google.container.v1.SetMaintenancePolicyRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetMaintenancePolicyRequest build() {
       com.google.container.v1.SetMaintenancePolicyRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -548,7 +534,6 @@ public com.google.container.v1.SetMaintenancePolicyRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetMaintenancePolicyRequest buildPartial() {
       com.google.container.v1.SetMaintenancePolicyRequest result = new com.google.container.v1.SetMaintenancePolicyRequest(this);
       result.projectId_ = projectId_;
@@ -563,39 +548,32 @@ public com.google.container.v1.SetMaintenancePolicyRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.SetMaintenancePolicyRequest) {
         return mergeFrom((com.google.container.v1.SetMaintenancePolicyRequest)other);
@@ -627,12 +605,10 @@ public Builder mergeFrom(com.google.container.v1.SetMaintenancePolicyRequest oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1094,13 +1070,11 @@ public com.google.container.v1.MaintenancePolicyOrBuilder getMaintenancePolicyOr
       }
       return maintenancePolicyBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1122,12 +1096,11 @@ public static com.google.container.v1.SetMaintenancePolicyRequest getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SetMaintenancePolicyRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SetMaintenancePolicyRequest(input, extensionRegistry);
+        return new SetMaintenancePolicyRequest(input, extensionRegistry);
     }
   };
 
@@ -1140,7 +1113,6 @@ public com.google.protobuf.Parser getParserForType(
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.SetMaintenancePolicyRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMasterAuthRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMasterAuthRequest.java
index 5f84567f4c05..6ccfdac630f5 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMasterAuthRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMasterAuthRequest.java
@@ -36,9 +36,6 @@ private SetMasterAuthRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private SetMasterAuthRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -87,13 +91,6 @@ private SetMasterAuthRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -111,7 +108,6 @@ private SetMasterAuthRequest(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetMasterAuthRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetMasterAuthRequest_fieldAccessorTable
@@ -429,7 +425,6 @@ public int getActionValue() {
    * .google.container.v1.SetMasterAuthRequest.Action action = 4;
    */
   public com.google.container.v1.SetMasterAuthRequest.Action getAction() {
-    @SuppressWarnings("deprecation")
     com.google.container.v1.SetMasterAuthRequest.Action result = com.google.container.v1.SetMasterAuthRequest.Action.valueOf(action_);
     return result == null ? com.google.container.v1.SetMasterAuthRequest.Action.UNRECOGNIZED : result;
   }
@@ -468,7 +463,6 @@ public com.google.container.v1.MasterAuthOrBuilder getUpdateOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -478,7 +472,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -499,7 +492,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -648,7 +640,6 @@ public static com.google.container.v1.SetMasterAuthRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -656,7 +647,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.SetMasterAuthRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -684,7 +674,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetMasterAuthRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetMasterAuthRequest_fieldAccessorTable
@@ -707,7 +696,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -727,18 +715,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetMasterAuthRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetMasterAuthRequest getDefaultInstanceForType() {
       return com.google.container.v1.SetMasterAuthRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetMasterAuthRequest build() {
       com.google.container.v1.SetMasterAuthRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -747,7 +732,6 @@ public com.google.container.v1.SetMasterAuthRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetMasterAuthRequest buildPartial() {
       com.google.container.v1.SetMasterAuthRequest result = new com.google.container.v1.SetMasterAuthRequest(this);
       result.projectId_ = projectId_;
@@ -763,39 +747,32 @@ public com.google.container.v1.SetMasterAuthRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.SetMasterAuthRequest) {
         return mergeFrom((com.google.container.v1.SetMasterAuthRequest)other);
@@ -830,12 +807,10 @@ public Builder mergeFrom(com.google.container.v1.SetMasterAuthRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1167,7 +1142,6 @@ public Builder setActionValue(int value) {
      * .google.container.v1.SetMasterAuthRequest.Action action = 4;
      */
     public com.google.container.v1.SetMasterAuthRequest.Action getAction() {
-      @SuppressWarnings("deprecation")
       com.google.container.v1.SetMasterAuthRequest.Action result = com.google.container.v1.SetMasterAuthRequest.Action.valueOf(action_);
       return result == null ? com.google.container.v1.SetMasterAuthRequest.Action.UNRECOGNIZED : result;
     }
@@ -1353,13 +1327,11 @@ public com.google.container.v1.MasterAuthOrBuilder getUpdateOrBuilder() {
       }
       return updateBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1381,12 +1353,11 @@ public static com.google.container.v1.SetMasterAuthRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SetMasterAuthRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SetMasterAuthRequest(input, extensionRegistry);
+        return new SetMasterAuthRequest(input, extensionRegistry);
     }
   };
 
@@ -1399,7 +1370,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.SetMasterAuthRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMonitoringServiceRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMonitoringServiceRequest.java
index cfac98d537ff..cf56d13f2973 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMonitoringServiceRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetMonitoringServiceRequest.java
@@ -36,9 +36,6 @@ private SetMonitoringServiceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private SetMonitoringServiceRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -74,13 +78,6 @@ private SetMonitoringServiceRequest(
             monitoringService_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -98,7 +95,6 @@ private SetMonitoringServiceRequest(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetMonitoringServiceRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetMonitoringServiceRequest_fieldAccessorTable
@@ -287,7 +283,6 @@ public java.lang.String getMonitoringService() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -297,7 +292,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -315,7 +309,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -451,7 +444,6 @@ public static com.google.container.v1.SetMonitoringServiceRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -459,7 +451,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.SetMonitoringServiceRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -487,7 +478,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetMonitoringServiceRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetMonitoringServiceRequest_fieldAccessorTable
@@ -510,7 +500,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -524,18 +513,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetMonitoringServiceRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetMonitoringServiceRequest getDefaultInstanceForType() {
       return com.google.container.v1.SetMonitoringServiceRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetMonitoringServiceRequest build() {
       com.google.container.v1.SetMonitoringServiceRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -544,7 +530,6 @@ public com.google.container.v1.SetMonitoringServiceRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetMonitoringServiceRequest buildPartial() {
       com.google.container.v1.SetMonitoringServiceRequest result = new com.google.container.v1.SetMonitoringServiceRequest(this);
       result.projectId_ = projectId_;
@@ -555,39 +540,32 @@ public com.google.container.v1.SetMonitoringServiceRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.SetMonitoringServiceRequest) {
         return mergeFrom((com.google.container.v1.SetMonitoringServiceRequest)other);
@@ -620,12 +598,10 @@ public Builder mergeFrom(com.google.container.v1.SetMonitoringServiceRequest oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1029,13 +1005,11 @@ public Builder setMonitoringServiceBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1057,12 +1031,11 @@ public static com.google.container.v1.SetMonitoringServiceRequest getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SetMonitoringServiceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SetMonitoringServiceRequest(input, extensionRegistry);
+        return new SetMonitoringServiceRequest(input, extensionRegistry);
     }
   };
 
@@ -1075,7 +1048,6 @@ public com.google.protobuf.Parser getParserForType(
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.SetMonitoringServiceRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNetworkPolicyRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNetworkPolicyRequest.java
index 708036010cc6..2aa9b76b60e6 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNetworkPolicyRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNetworkPolicyRequest.java
@@ -35,9 +35,6 @@ private SetNetworkPolicyRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private SetNetworkPolicyRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -80,13 +84,6 @@ private SetNetworkPolicyRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private SetNetworkPolicyRequest(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetNetworkPolicyRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetNetworkPolicyRequest_fieldAccessorTable
@@ -278,7 +274,6 @@ public com.google.container.v1.NetworkPolicyOrBuilder getNetworkPolicyOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -288,7 +283,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -306,7 +300,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -448,7 +441,6 @@ public static com.google.container.v1.SetNetworkPolicyRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -456,7 +448,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.SetNetworkPolicyRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -484,7 +475,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetNetworkPolicyRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetNetworkPolicyRequest_fieldAccessorTable
@@ -507,7 +497,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -525,18 +514,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetNetworkPolicyRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetNetworkPolicyRequest getDefaultInstanceForType() {
       return com.google.container.v1.SetNetworkPolicyRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetNetworkPolicyRequest build() {
       com.google.container.v1.SetNetworkPolicyRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -545,7 +531,6 @@ public com.google.container.v1.SetNetworkPolicyRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetNetworkPolicyRequest buildPartial() {
       com.google.container.v1.SetNetworkPolicyRequest result = new com.google.container.v1.SetNetworkPolicyRequest(this);
       result.projectId_ = projectId_;
@@ -560,39 +545,32 @@ public com.google.container.v1.SetNetworkPolicyRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.SetNetworkPolicyRequest) {
         return mergeFrom((com.google.container.v1.SetNetworkPolicyRequest)other);
@@ -624,12 +602,10 @@ public Builder mergeFrom(com.google.container.v1.SetNetworkPolicyRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1082,13 +1058,11 @@ public com.google.container.v1.NetworkPolicyOrBuilder getNetworkPolicyOrBuilder(
       }
       return networkPolicyBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1110,12 +1084,11 @@ public static com.google.container.v1.SetNetworkPolicyRequest getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SetNetworkPolicyRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SetNetworkPolicyRequest(input, extensionRegistry);
+        return new SetNetworkPolicyRequest(input, extensionRegistry);
     }
   };
 
@@ -1128,7 +1101,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.SetNetworkPolicyRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolAutoscalingRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolAutoscalingRequest.java
index 7c7be3781326..25e2c52520c3 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolAutoscalingRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolAutoscalingRequest.java
@@ -36,9 +36,6 @@ private SetNodePoolAutoscalingRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private SetNodePoolAutoscalingRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -87,13 +91,6 @@ private SetNodePoolAutoscalingRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -111,7 +108,6 @@ private SetNodePoolAutoscalingRequest(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetNodePoolAutoscalingRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetNodePoolAutoscalingRequest_fieldAccessorTable
@@ -327,7 +323,6 @@ public com.google.container.v1.NodePoolAutoscalingOrBuilder getAutoscalingOrBuil
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -337,7 +332,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -358,7 +352,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -507,7 +500,6 @@ public static com.google.container.v1.SetNodePoolAutoscalingRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -515,7 +507,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.SetNodePoolAutoscalingRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -543,7 +534,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetNodePoolAutoscalingRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetNodePoolAutoscalingRequest_fieldAccessorTable
@@ -566,7 +556,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -586,18 +575,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetNodePoolAutoscalingRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetNodePoolAutoscalingRequest getDefaultInstanceForType() {
       return com.google.container.v1.SetNodePoolAutoscalingRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetNodePoolAutoscalingRequest build() {
       com.google.container.v1.SetNodePoolAutoscalingRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -606,7 +592,6 @@ public com.google.container.v1.SetNodePoolAutoscalingRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetNodePoolAutoscalingRequest buildPartial() {
       com.google.container.v1.SetNodePoolAutoscalingRequest result = new com.google.container.v1.SetNodePoolAutoscalingRequest(this);
       result.projectId_ = projectId_;
@@ -622,39 +607,32 @@ public com.google.container.v1.SetNodePoolAutoscalingRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.SetNodePoolAutoscalingRequest) {
         return mergeFrom((com.google.container.v1.SetNodePoolAutoscalingRequest)other);
@@ -690,12 +668,10 @@ public Builder mergeFrom(com.google.container.v1.SetNodePoolAutoscalingRequest o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1237,13 +1213,11 @@ public com.google.container.v1.NodePoolAutoscalingOrBuilder getAutoscalingOrBuil
       }
       return autoscalingBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1265,12 +1239,11 @@ public static com.google.container.v1.SetNodePoolAutoscalingRequest getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SetNodePoolAutoscalingRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SetNodePoolAutoscalingRequest(input, extensionRegistry);
+        return new SetNodePoolAutoscalingRequest(input, extensionRegistry);
     }
   };
 
@@ -1283,7 +1256,6 @@ public com.google.protobuf.Parser getParserForTyp
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.SetNodePoolAutoscalingRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolManagementRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolManagementRequest.java
index 23186f9e4678..2fc1e6c6c84d 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolManagementRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolManagementRequest.java
@@ -37,9 +37,6 @@ private SetNodePoolManagementRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private SetNodePoolManagementRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -88,13 +92,6 @@ private SetNodePoolManagementRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -112,7 +109,6 @@ private SetNodePoolManagementRequest(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetNodePoolManagementRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetNodePoolManagementRequest_fieldAccessorTable
@@ -328,7 +324,6 @@ public com.google.container.v1.NodeManagementOrBuilder getManagementOrBuilder()
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -338,7 +333,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -359,7 +353,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -508,7 +501,6 @@ public static com.google.container.v1.SetNodePoolManagementRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -516,7 +508,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.SetNodePoolManagementRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -545,7 +536,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetNodePoolManagementRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetNodePoolManagementRequest_fieldAccessorTable
@@ -568,7 +558,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -588,18 +577,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetNodePoolManagementRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetNodePoolManagementRequest getDefaultInstanceForType() {
       return com.google.container.v1.SetNodePoolManagementRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetNodePoolManagementRequest build() {
       com.google.container.v1.SetNodePoolManagementRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -608,7 +594,6 @@ public com.google.container.v1.SetNodePoolManagementRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetNodePoolManagementRequest buildPartial() {
       com.google.container.v1.SetNodePoolManagementRequest result = new com.google.container.v1.SetNodePoolManagementRequest(this);
       result.projectId_ = projectId_;
@@ -624,39 +609,32 @@ public com.google.container.v1.SetNodePoolManagementRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.SetNodePoolManagementRequest) {
         return mergeFrom((com.google.container.v1.SetNodePoolManagementRequest)other);
@@ -692,12 +670,10 @@ public Builder mergeFrom(com.google.container.v1.SetNodePoolManagementRequest ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1239,13 +1215,11 @@ public com.google.container.v1.NodeManagementOrBuilder getManagementOrBuilder()
       }
       return managementBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1267,12 +1241,11 @@ public static com.google.container.v1.SetNodePoolManagementRequest getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SetNodePoolManagementRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SetNodePoolManagementRequest(input, extensionRegistry);
+        return new SetNodePoolManagementRequest(input, extensionRegistry);
     }
   };
 
@@ -1285,7 +1258,6 @@ public com.google.protobuf.Parser getParserForType
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.SetNodePoolManagementRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolSizeRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolSizeRequest.java
index 3bcdc6144827..68cd899f486e 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolSizeRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/SetNodePoolSizeRequest.java
@@ -38,9 +38,6 @@ private SetNodePoolSizeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private SetNodePoolSizeRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -81,13 +85,6 @@ private SetNodePoolSizeRequest(
             nodeCount_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -105,7 +102,6 @@ private SetNodePoolSizeRequest(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetNodePoolSizeRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetNodePoolSizeRequest_fieldAccessorTable
@@ -301,7 +297,6 @@ public int getNodeCount() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -311,7 +306,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -332,7 +326,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -476,7 +469,6 @@ public static com.google.container.v1.SetNodePoolSizeRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -484,7 +476,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.SetNodePoolSizeRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -513,7 +504,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetNodePoolSizeRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetNodePoolSizeRequest_fieldAccessorTable
@@ -536,7 +526,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -552,18 +541,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_SetNodePoolSizeRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetNodePoolSizeRequest getDefaultInstanceForType() {
       return com.google.container.v1.SetNodePoolSizeRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetNodePoolSizeRequest build() {
       com.google.container.v1.SetNodePoolSizeRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -572,7 +558,6 @@ public com.google.container.v1.SetNodePoolSizeRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.SetNodePoolSizeRequest buildPartial() {
       com.google.container.v1.SetNodePoolSizeRequest result = new com.google.container.v1.SetNodePoolSizeRequest(this);
       result.projectId_ = projectId_;
@@ -584,39 +569,32 @@ public com.google.container.v1.SetNodePoolSizeRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.SetNodePoolSizeRequest) {
         return mergeFrom((com.google.container.v1.SetNodePoolSizeRequest)other);
@@ -652,12 +630,10 @@ public Builder mergeFrom(com.google.container.v1.SetNodePoolSizeRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1084,13 +1060,11 @@ public Builder clearNodeCount() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1112,12 +1086,11 @@ public static com.google.container.v1.SetNodePoolSizeRequest getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SetNodePoolSizeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SetNodePoolSizeRequest(input, extensionRegistry);
+        return new SetNodePoolSizeRequest(input, extensionRegistry);
     }
   };
 
@@ -1130,7 +1103,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.SetNodePoolSizeRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/StartIPRotationRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/StartIPRotationRequest.java
index 634a3948bdcd..e2076fdd21ce 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/StartIPRotationRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/StartIPRotationRequest.java
@@ -36,9 +36,6 @@ private StartIPRotationRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private StartIPRotationRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -68,13 +72,6 @@ private StartIPRotationRequest(
             clusterId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -92,7 +89,6 @@ private StartIPRotationRequest(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_StartIPRotationRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_StartIPRotationRequest_fieldAccessorTable
@@ -233,7 +229,6 @@ public java.lang.String getClusterId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -243,7 +238,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -258,7 +252,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -387,7 +380,6 @@ public static com.google.container.v1.StartIPRotationRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -395,7 +387,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.StartIPRotationRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -424,7 +415,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_StartIPRotationRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_StartIPRotationRequest_fieldAccessorTable
@@ -447,7 +437,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -459,18 +448,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_StartIPRotationRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.StartIPRotationRequest getDefaultInstanceForType() {
       return com.google.container.v1.StartIPRotationRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.StartIPRotationRequest build() {
       com.google.container.v1.StartIPRotationRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -479,7 +465,6 @@ public com.google.container.v1.StartIPRotationRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.StartIPRotationRequest buildPartial() {
       com.google.container.v1.StartIPRotationRequest result = new com.google.container.v1.StartIPRotationRequest(this);
       result.projectId_ = projectId_;
@@ -489,39 +474,32 @@ public com.google.container.v1.StartIPRotationRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.StartIPRotationRequest) {
         return mergeFrom((com.google.container.v1.StartIPRotationRequest)other);
@@ -550,12 +528,10 @@ public Builder mergeFrom(com.google.container.v1.StartIPRotationRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -855,13 +831,11 @@ public Builder setClusterIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -883,12 +857,11 @@ public static com.google.container.v1.StartIPRotationRequest getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public StartIPRotationRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StartIPRotationRequest(input, extensionRegistry);
+        return new StartIPRotationRequest(input, extensionRegistry);
     }
   };
 
@@ -901,7 +874,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.StartIPRotationRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateClusterRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateClusterRequest.java
index 6b6a6e9fe04f..ed0b50ac6517 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateClusterRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateClusterRequest.java
@@ -35,9 +35,6 @@ private UpdateClusterRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private UpdateClusterRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -80,13 +84,6 @@ private UpdateClusterRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private UpdateClusterRequest(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_UpdateClusterRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_UpdateClusterRequest_fieldAccessorTable
@@ -278,7 +274,6 @@ public com.google.container.v1.ClusterUpdateOrBuilder getUpdateOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -288,7 +283,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -306,7 +300,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -448,7 +441,6 @@ public static com.google.container.v1.UpdateClusterRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -456,7 +448,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.UpdateClusterRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -484,7 +475,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_UpdateClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_UpdateClusterRequest_fieldAccessorTable
@@ -507,7 +497,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -525,18 +514,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_UpdateClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.UpdateClusterRequest getDefaultInstanceForType() {
       return com.google.container.v1.UpdateClusterRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.UpdateClusterRequest build() {
       com.google.container.v1.UpdateClusterRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -545,7 +531,6 @@ public com.google.container.v1.UpdateClusterRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.UpdateClusterRequest buildPartial() {
       com.google.container.v1.UpdateClusterRequest result = new com.google.container.v1.UpdateClusterRequest(this);
       result.projectId_ = projectId_;
@@ -560,39 +545,32 @@ public com.google.container.v1.UpdateClusterRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.UpdateClusterRequest) {
         return mergeFrom((com.google.container.v1.UpdateClusterRequest)other);
@@ -624,12 +602,10 @@ public Builder mergeFrom(com.google.container.v1.UpdateClusterRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1082,13 +1058,11 @@ public com.google.container.v1.ClusterUpdateOrBuilder getUpdateOrBuilder() {
       }
       return updateBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1110,12 +1084,11 @@ public static com.google.container.v1.UpdateClusterRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateClusterRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateClusterRequest(input, extensionRegistry);
+        return new UpdateClusterRequest(input, extensionRegistry);
     }
   };
 
@@ -1128,7 +1101,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.UpdateClusterRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateMasterRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateMasterRequest.java
index b7b74590bb92..4b70903dbfbe 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateMasterRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateMasterRequest.java
@@ -36,9 +36,6 @@ private UpdateMasterRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private UpdateMasterRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -74,13 +78,6 @@ private UpdateMasterRequest(
             masterVersion_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -98,7 +95,6 @@ private UpdateMasterRequest(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_UpdateMasterRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_UpdateMasterRequest_fieldAccessorTable
@@ -285,7 +281,6 @@ public java.lang.String getMasterVersion() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -295,7 +290,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -313,7 +307,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -449,7 +442,6 @@ public static com.google.container.v1.UpdateMasterRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -457,7 +449,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.UpdateMasterRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -485,7 +476,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_UpdateMasterRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_UpdateMasterRequest_fieldAccessorTable
@@ -508,7 +498,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -522,18 +511,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_UpdateMasterRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.UpdateMasterRequest getDefaultInstanceForType() {
       return com.google.container.v1.UpdateMasterRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.UpdateMasterRequest build() {
       com.google.container.v1.UpdateMasterRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -542,7 +528,6 @@ public com.google.container.v1.UpdateMasterRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.UpdateMasterRequest buildPartial() {
       com.google.container.v1.UpdateMasterRequest result = new com.google.container.v1.UpdateMasterRequest(this);
       result.projectId_ = projectId_;
@@ -553,39 +538,32 @@ public com.google.container.v1.UpdateMasterRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.UpdateMasterRequest) {
         return mergeFrom((com.google.container.v1.UpdateMasterRequest)other);
@@ -618,12 +596,10 @@ public Builder mergeFrom(com.google.container.v1.UpdateMasterRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1022,13 +998,11 @@ public Builder setMasterVersionBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1050,12 +1024,11 @@ public static com.google.container.v1.UpdateMasterRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateMasterRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateMasterRequest(input, extensionRegistry);
+        return new UpdateMasterRequest(input, extensionRegistry);
     }
   };
 
@@ -1068,7 +1041,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.UpdateMasterRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateNodePoolRequest.java b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateNodePoolRequest.java
index 488dceba53d4..dc6c70d6f420 100644
--- a/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateNodePoolRequest.java
+++ b/google-api-grpc/proto-google-cloud-container-v1/src/main/java/com/google/container/v1/UpdateNodePoolRequest.java
@@ -38,9 +38,6 @@ private UpdateNodePoolRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private UpdateNodePoolRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -88,13 +92,6 @@ private UpdateNodePoolRequest(
             imageType_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -112,7 +109,6 @@ private UpdateNodePoolRequest(
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_UpdateNodePoolRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_UpdateNodePoolRequest_fieldAccessorTable
@@ -383,7 +379,6 @@ public java.lang.String getImageType() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -393,7 +388,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -417,7 +411,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -567,7 +560,6 @@ public static com.google.container.v1.UpdateNodePoolRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -575,7 +567,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.container.v1.UpdateNodePoolRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -603,7 +594,6 @@ public static final class Builder extends
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_UpdateNodePoolRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_UpdateNodePoolRequest_fieldAccessorTable
@@ -626,7 +616,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -644,18 +633,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.container.v1.ClusterServiceProto.internal_static_google_container_v1_UpdateNodePoolRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.container.v1.UpdateNodePoolRequest getDefaultInstanceForType() {
       return com.google.container.v1.UpdateNodePoolRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.container.v1.UpdateNodePoolRequest build() {
       com.google.container.v1.UpdateNodePoolRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -664,7 +650,6 @@ public com.google.container.v1.UpdateNodePoolRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.container.v1.UpdateNodePoolRequest buildPartial() {
       com.google.container.v1.UpdateNodePoolRequest result = new com.google.container.v1.UpdateNodePoolRequest(this);
       result.projectId_ = projectId_;
@@ -677,39 +662,32 @@ public com.google.container.v1.UpdateNodePoolRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.container.v1.UpdateNodePoolRequest) {
         return mergeFrom((com.google.container.v1.UpdateNodePoolRequest)other);
@@ -750,12 +728,10 @@ public Builder mergeFrom(com.google.container.v1.UpdateNodePoolRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1332,13 +1308,11 @@ public Builder setImageTypeBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1360,12 +1334,11 @@ public static com.google.container.v1.UpdateNodePoolRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateNodePoolRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateNodePoolRequest(input, extensionRegistry);
+        return new UpdateNodePoolRequest(input, extensionRegistry);
     }
   };
 
@@ -1378,7 +1351,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.container.v1.UpdateNodePoolRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/Containeranalysis.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/Containeranalysis.java
index b846ab032009..75347304c99e 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/Containeranalysis.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/Containeranalysis.java
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "anConfig\022\014\n\004name\030\001 \001(\t\022\023\n\013description\030\002 " +
       "\001(\t\022\017\n\007enabled\030\003 \001(\010\022/\n\013create_time\030\004 \001(" +
       "\0132\032.google.protobuf.Timestamp\022/\n\013update_" +
-      "time\030\005 \001(\0132\032.google.protobuf.Timestamp\"$" +
+      "time\030\005 \001(\0132\032.google.protobuf.Timestamp\"$",
       "\n\024GetScanConfigRequest\022\014\n\004name\030\001 \001(\t\"_\n\026" +
       "ListScanConfigsRequest\022\016\n\006parent\030\001 \001(\t\022\016" +
       "\n\006filter\030\002 \001(\t\022\021\n\tpage_size\030\003 \001(\005\022\022\n\npag" +
@@ -67,7 +67,7 @@ public static void registerAllExtensions(
       "\017next_page_token\030\002 \001(\t\"s\n\027UpdateScanConf" +
       "igRequest\022\014\n\004name\030\001 \001(\t\022J\n\013scan_config\030\002" +
       " \001(\01325.google.devtools.containeranalysis" +
-      ".v1beta1.ScanConfig2\204\n\n\030ContainerAnalysi" +
+      ".v1beta1.ScanConfig2\204\n\n\030ContainerAnalysi",
       "sV1Beta1\022\311\001\n\014SetIamPolicy\022\".google.iam.v" +
       "1.SetIamPolicyRequest\032\025.google.iam.v1.Po" +
       "licy\"~\202\323\344\223\002x\"3/v1beta1/{resource=project" +
@@ -77,7 +77,7 @@ public static void registerAllExtensions(
       "am.v1.GetIamPolicyRequest\032\025.google.iam.v" +
       "1.Policy\"~\202\323\344\223\002x\"3/v1beta1/{resource=pro" +
       "jects/*/notes/*}:getIamPolicy:\001*Z>\"9/v1b" +
-      "eta1/{resource=projects/*/occurrences/*}" +
+      "eta1/{resource=projects/*/occurrences/*}",
       ":getIamPolicy:\001*\022\367\001\n\022TestIamPermissions\022" +
       "(.google.iam.v1.TestIamPermissionsReques" +
       "t\032).google.iam.v1.TestIamPermissionsResp" +
@@ -87,7 +87,7 @@ public static void registerAllExtensions(
       "s/*}:testIamPermissions:\001*\022\271\001\n\rGetScanCo" +
       "nfig\022?.google.devtools.containeranalysis" +
       ".v1beta1.GetScanConfigRequest\0325.google.d" +
-      "evtools.containeranalysis.v1beta1.ScanCo" +
+      "evtools.containeranalysis.v1beta1.ScanCo",
       "nfig\"0\202\323\344\223\002*\022(/v1beta1/{name=projects/*/" +
       "scanConfigs/*}\022\312\001\n\017ListScanConfigs\022A.goo" +
       "gle.devtools.containeranalysis.v1beta1.L" +
@@ -97,7 +97,7 @@ public static void registerAllExtensions(
       "ects/*}/scanConfigs\022\314\001\n\020UpdateScanConfig" +
       "\022B.google.devtools.containeranalysis.v1b" +
       "eta1.UpdateScanConfigRequest\0325.google.de" +
-      "vtools.containeranalysis.v1beta1.ScanCon" +
+      "vtools.containeranalysis.v1beta1.ScanCon",
       "fig\"=\202\323\344\223\0027\032(/v1beta1/{name=projects/*/s" +
       "canConfigs/*}:\013scan_configB\212\001\n$com.googl" +
       "e.containeranalysis.v1beta1P\001ZZgoogle.go" +
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/GetScanConfigRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/GetScanConfigRequest.java
index b6cfbf7d4b2c..1a77d55ccbc7 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/GetScanConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/GetScanConfigRequest.java
@@ -33,9 +33,6 @@ private GetScanConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetScanConfigRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetScanConfigRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetScanConfigRequest(
     return com.google.containeranalysis.v1beta1.Containeranalysis.internal_static_google_devtools_containeranalysis_v1beta1_GetScanConfigRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.containeranalysis.v1beta1.Containeranalysis.internal_static_google_devtools_containeranalysis_v1beta1_GetScanConfigRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.containeranalysis.v1beta1.GetScanConfigRequest parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.containeranalysis.v1beta1.GetScanConfigRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.containeranalysis.v1beta1.Containeranalysis.internal_static_google_devtools_containeranalysis_v1beta1_GetScanConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.containeranalysis.v1beta1.Containeranalysis.internal_static_google_devtools_containeranalysis_v1beta1_GetScanConfigRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.containeranalysis.v1beta1.Containeranalysis.internal_static_google_devtools_containeranalysis_v1beta1_GetScanConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.containeranalysis.v1beta1.GetScanConfigRequest getDefaultInstanceForType() {
       return com.google.containeranalysis.v1beta1.GetScanConfigRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.containeranalysis.v1beta1.GetScanConfigRequest build() {
       com.google.containeranalysis.v1beta1.GetScanConfigRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.containeranalysis.v1beta1.GetScanConfigRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.containeranalysis.v1beta1.GetScanConfigRequest buildPartial() {
       com.google.containeranalysis.v1beta1.GetScanConfigRequest result = new com.google.containeranalysis.v1beta1.GetScanConfigRequest(this);
       result.name_ = name_;
@@ -359,39 +344,32 @@ public com.google.containeranalysis.v1beta1.GetScanConfigRequest buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.containeranalysis.v1beta1.GetScanConfigRequest) {
         return mergeFrom((com.google.containeranalysis.v1beta1.GetScanConfigRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.containeranalysis.v1beta1.GetScanConfigReque
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.containeranalysis.v1beta1.GetScanConfigRequest getDefau
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetScanConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetScanConfigRequest(input, extensionRegistry);
+        return new GetScanConfigRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.containeranalysis.v1beta1.GetScanConfigRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/ListScanConfigsRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/ListScanConfigsRequest.java
index 1ee9c87698f1..2878f6fd290d 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/ListScanConfigsRequest.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/ListScanConfigsRequest.java
@@ -36,9 +36,6 @@ private ListScanConfigsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private ListScanConfigsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private ListScanConfigsRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private ListScanConfigsRequest(
     return com.google.containeranalysis.v1beta1.Containeranalysis.internal_static_google_devtools_containeranalysis_v1beta1_ListScanConfigsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.containeranalysis.v1beta1.Containeranalysis.internal_static_google_devtools_containeranalysis_v1beta1_ListScanConfigsRequest_fieldAccessorTable
@@ -247,7 +243,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -257,7 +252,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -275,7 +269,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -412,7 +405,6 @@ public static com.google.containeranalysis.v1beta1.ListScanConfigsRequest parseF
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -420,7 +412,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.containeranalysis.v1beta1.ListScanConfigsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -448,7 +439,6 @@ public static final class Builder extends
       return com.google.containeranalysis.v1beta1.Containeranalysis.internal_static_google_devtools_containeranalysis_v1beta1_ListScanConfigsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.containeranalysis.v1beta1.Containeranalysis.internal_static_google_devtools_containeranalysis_v1beta1_ListScanConfigsRequest_fieldAccessorTable
@@ -471,7 +461,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -485,18 +474,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.containeranalysis.v1beta1.Containeranalysis.internal_static_google_devtools_containeranalysis_v1beta1_ListScanConfigsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.containeranalysis.v1beta1.ListScanConfigsRequest getDefaultInstanceForType() {
       return com.google.containeranalysis.v1beta1.ListScanConfigsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.containeranalysis.v1beta1.ListScanConfigsRequest build() {
       com.google.containeranalysis.v1beta1.ListScanConfigsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -505,7 +491,6 @@ public com.google.containeranalysis.v1beta1.ListScanConfigsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.containeranalysis.v1beta1.ListScanConfigsRequest buildPartial() {
       com.google.containeranalysis.v1beta1.ListScanConfigsRequest result = new com.google.containeranalysis.v1beta1.ListScanConfigsRequest(this);
       result.parent_ = parent_;
@@ -516,39 +501,32 @@ public com.google.containeranalysis.v1beta1.ListScanConfigsRequest buildPartial(
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.containeranalysis.v1beta1.ListScanConfigsRequest) {
         return mergeFrom((com.google.containeranalysis.v1beta1.ListScanConfigsRequest)other);
@@ -580,12 +558,10 @@ public Builder mergeFrom(com.google.containeranalysis.v1beta1.ListScanConfigsReq
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -913,13 +889,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -941,12 +915,11 @@ public static com.google.containeranalysis.v1beta1.ListScanConfigsRequest getDef
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListScanConfigsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListScanConfigsRequest(input, extensionRegistry);
+        return new ListScanConfigsRequest(input, extensionRegistry);
     }
   };
 
@@ -959,7 +932,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.containeranalysis.v1beta1.ListScanConfigsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/ListScanConfigsResponse.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/ListScanConfigsResponse.java
index 6b0b5b294984..75a6adec0eb8 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/ListScanConfigsResponse.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/ListScanConfigsResponse.java
@@ -34,9 +34,6 @@ private ListScanConfigsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListScanConfigsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               scanConfigs_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListScanConfigsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListScanConfigsResponse(
     return com.google.containeranalysis.v1beta1.Containeranalysis.internal_static_google_devtools_containeranalysis_v1beta1_ListScanConfigsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.containeranalysis.v1beta1.Containeranalysis.internal_static_google_devtools_containeranalysis_v1beta1_ListScanConfigsResponse_fieldAccessorTable
@@ -201,7 +197,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -211,7 +206,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < scanConfigs_.size(); i++) {
@@ -223,7 +217,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.containeranalysis.v1beta1.ListScanConfigsResponse parse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.containeranalysis.v1beta1.ListScanConfigsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return com.google.containeranalysis.v1beta1.Containeranalysis.internal_static_google_devtools_containeranalysis_v1beta1_ListScanConfigsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.containeranalysis.v1beta1.Containeranalysis.internal_static_google_devtools_containeranalysis_v1beta1_ListScanConfigsResponse_fieldAccessorTable
@@ -408,7 +398,6 @@ private void maybeForceBuilderInitialization() {
         getScanConfigsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (scanConfigsBuilder_ == null) {
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.containeranalysis.v1beta1.Containeranalysis.internal_static_google_devtools_containeranalysis_v1beta1_ListScanConfigsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.containeranalysis.v1beta1.ListScanConfigsResponse getDefaultInstanceForType() {
       return com.google.containeranalysis.v1beta1.ListScanConfigsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.containeranalysis.v1beta1.ListScanConfigsResponse build() {
       com.google.containeranalysis.v1beta1.ListScanConfigsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public com.google.containeranalysis.v1beta1.ListScanConfigsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.containeranalysis.v1beta1.ListScanConfigsResponse buildPartial() {
       com.google.containeranalysis.v1beta1.ListScanConfigsResponse result = new com.google.containeranalysis.v1beta1.ListScanConfigsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -462,39 +447,32 @@ public com.google.containeranalysis.v1beta1.ListScanConfigsResponse buildPartial
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.containeranalysis.v1beta1.ListScanConfigsResponse) {
         return mergeFrom((com.google.containeranalysis.v1beta1.ListScanConfigsResponse)other);
@@ -541,12 +519,10 @@ public Builder mergeFrom(com.google.containeranalysis.v1beta1.ListScanConfigsRes
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -976,13 +952,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1004,12 +978,11 @@ public static com.google.containeranalysis.v1beta1.ListScanConfigsResponse getDe
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListScanConfigsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListScanConfigsResponse(input, extensionRegistry);
+        return new ListScanConfigsResponse(input, extensionRegistry);
     }
   };
 
@@ -1022,7 +995,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.containeranalysis.v1beta1.ListScanConfigsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/ScanConfig.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/ScanConfig.java
index c1487a26376d..ae6790c3feac 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/ScanConfig.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/ScanConfig.java
@@ -37,9 +37,6 @@ private ScanConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private ScanConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -94,13 +98,6 @@ private ScanConfig(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -118,7 +115,6 @@ private ScanConfig(
     return com.google.containeranalysis.v1beta1.Containeranalysis.internal_static_google_devtools_containeranalysis_v1beta1_ScanConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.containeranalysis.v1beta1.Containeranalysis.internal_static_google_devtools_containeranalysis_v1beta1_ScanConfig_fieldAccessorTable
@@ -294,7 +290,6 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -304,7 +299,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -325,7 +319,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -482,7 +475,6 @@ public static com.google.containeranalysis.v1beta1.ScanConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -490,7 +482,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.containeranalysis.v1beta1.ScanConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -520,7 +511,6 @@ public static final class Builder extends
       return com.google.containeranalysis.v1beta1.Containeranalysis.internal_static_google_devtools_containeranalysis_v1beta1_ScanConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.containeranalysis.v1beta1.Containeranalysis.internal_static_google_devtools_containeranalysis_v1beta1_ScanConfig_fieldAccessorTable
@@ -543,7 +533,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -567,18 +556,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.containeranalysis.v1beta1.Containeranalysis.internal_static_google_devtools_containeranalysis_v1beta1_ScanConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.containeranalysis.v1beta1.ScanConfig getDefaultInstanceForType() {
       return com.google.containeranalysis.v1beta1.ScanConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.containeranalysis.v1beta1.ScanConfig build() {
       com.google.containeranalysis.v1beta1.ScanConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -587,7 +573,6 @@ public com.google.containeranalysis.v1beta1.ScanConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.containeranalysis.v1beta1.ScanConfig buildPartial() {
       com.google.containeranalysis.v1beta1.ScanConfig result = new com.google.containeranalysis.v1beta1.ScanConfig(this);
       result.name_ = name_;
@@ -607,39 +592,32 @@ public com.google.containeranalysis.v1beta1.ScanConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.containeranalysis.v1beta1.ScanConfig) {
         return mergeFrom((com.google.containeranalysis.v1beta1.ScanConfig)other);
@@ -673,12 +651,10 @@ public Builder mergeFrom(com.google.containeranalysis.v1beta1.ScanConfig other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1228,13 +1204,11 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
       }
       return updateTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1256,12 +1230,11 @@ public static com.google.containeranalysis.v1beta1.ScanConfig getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ScanConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ScanConfig(input, extensionRegistry);
+        return new ScanConfig(input, extensionRegistry);
     }
   };
 
@@ -1274,7 +1247,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.containeranalysis.v1beta1.ScanConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/UpdateScanConfigRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/UpdateScanConfigRequest.java
index 7d907b4651b9..01c0ddae8b3d 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/UpdateScanConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/com/google/containeranalysis/v1beta1/UpdateScanConfigRequest.java
@@ -33,9 +33,6 @@ private UpdateScanConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private UpdateScanConfigRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private UpdateScanConfigRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private UpdateScanConfigRequest(
     return com.google.containeranalysis.v1beta1.Containeranalysis.internal_static_google_devtools_containeranalysis_v1beta1_UpdateScanConfigRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.containeranalysis.v1beta1.Containeranalysis.internal_static_google_devtools_containeranalysis_v1beta1_UpdateScanConfigRequest_fieldAccessorTable
@@ -176,7 +172,6 @@ public com.google.containeranalysis.v1beta1.ScanConfigOrBuilder getScanConfigOrB
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -186,7 +181,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -198,7 +192,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -326,7 +319,6 @@ public static com.google.containeranalysis.v1beta1.UpdateScanConfigRequest parse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -334,7 +326,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.containeranalysis.v1beta1.UpdateScanConfigRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -362,7 +353,6 @@ public static final class Builder extends
       return com.google.containeranalysis.v1beta1.Containeranalysis.internal_static_google_devtools_containeranalysis_v1beta1_UpdateScanConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.containeranalysis.v1beta1.Containeranalysis.internal_static_google_devtools_containeranalysis_v1beta1_UpdateScanConfigRequest_fieldAccessorTable
@@ -385,7 +375,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -399,18 +388,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.containeranalysis.v1beta1.Containeranalysis.internal_static_google_devtools_containeranalysis_v1beta1_UpdateScanConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.containeranalysis.v1beta1.UpdateScanConfigRequest getDefaultInstanceForType() {
       return com.google.containeranalysis.v1beta1.UpdateScanConfigRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.containeranalysis.v1beta1.UpdateScanConfigRequest build() {
       com.google.containeranalysis.v1beta1.UpdateScanConfigRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -419,7 +405,6 @@ public com.google.containeranalysis.v1beta1.UpdateScanConfigRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.containeranalysis.v1beta1.UpdateScanConfigRequest buildPartial() {
       com.google.containeranalysis.v1beta1.UpdateScanConfigRequest result = new com.google.containeranalysis.v1beta1.UpdateScanConfigRequest(this);
       result.name_ = name_;
@@ -432,39 +417,32 @@ public com.google.containeranalysis.v1beta1.UpdateScanConfigRequest buildPartial
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.containeranalysis.v1beta1.UpdateScanConfigRequest) {
         return mergeFrom((com.google.containeranalysis.v1beta1.UpdateScanConfigRequest)other);
@@ -488,12 +466,10 @@ public Builder mergeFrom(com.google.containeranalysis.v1beta1.UpdateScanConfigRe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -758,13 +734,11 @@ public com.google.containeranalysis.v1beta1.ScanConfigOrBuilder getScanConfigOrB
       }
       return scanConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -786,12 +760,11 @@ public static com.google.containeranalysis.v1beta1.UpdateScanConfigRequest getDe
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateScanConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateScanConfigRequest(input, extensionRegistry);
+        return new UpdateScanConfigRequest(input, extensionRegistry);
     }
   };
 
@@ -804,7 +777,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.containeranalysis.v1beta1.UpdateScanConfigRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/BatchCreateNotesRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/BatchCreateNotesRequest.java
index 232c65f42623..321973e59459 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/BatchCreateNotesRequest.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/BatchCreateNotesRequest.java
@@ -33,9 +33,6 @@ private BatchCreateNotesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private BatchCreateNotesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private BatchCreateNotesRequest(
                 notes__.getKey(), notes__.getValue());
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private BatchCreateNotesRequest(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -102,7 +98,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_BatchCreateNotesRequest_fieldAccessorTable
@@ -248,7 +243,6 @@ public io.grafeas.v1beta1.Note getNotesOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -258,7 +252,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -273,7 +266,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -404,7 +396,6 @@ public static io.grafeas.v1beta1.BatchCreateNotesRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -412,7 +403,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.BatchCreateNotesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -462,7 +452,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_BatchCreateNotesRequest_fieldAccessorTable
@@ -485,7 +474,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -494,18 +482,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_BatchCreateNotesRequest_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.BatchCreateNotesRequest getDefaultInstanceForType() {
       return io.grafeas.v1beta1.BatchCreateNotesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.BatchCreateNotesRequest build() {
       io.grafeas.v1beta1.BatchCreateNotesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -514,7 +499,6 @@ public io.grafeas.v1beta1.BatchCreateNotesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.BatchCreateNotesRequest buildPartial() {
       io.grafeas.v1beta1.BatchCreateNotesRequest result = new io.grafeas.v1beta1.BatchCreateNotesRequest(this);
       int from_bitField0_ = bitField0_;
@@ -527,39 +511,32 @@ public io.grafeas.v1beta1.BatchCreateNotesRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.BatchCreateNotesRequest) {
         return mergeFrom((io.grafeas.v1beta1.BatchCreateNotesRequest)other);
@@ -582,12 +559,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.BatchCreateNotesRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -851,13 +826,11 @@ public Builder putAllNotes(
           .putAll(values);
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -879,12 +852,11 @@ public static io.grafeas.v1beta1.BatchCreateNotesRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BatchCreateNotesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchCreateNotesRequest(input, extensionRegistry);
+        return new BatchCreateNotesRequest(input, extensionRegistry);
     }
   };
 
@@ -897,7 +869,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.BatchCreateNotesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/BatchCreateNotesResponse.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/BatchCreateNotesResponse.java
index 04577b37f008..594be24ecc42 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/BatchCreateNotesResponse.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/BatchCreateNotesResponse.java
@@ -33,9 +33,6 @@ private BatchCreateNotesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private BatchCreateNotesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               notes_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private BatchCreateNotesResponse(
                 input.readMessage(io.grafeas.v1beta1.Note.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private BatchCreateNotesResponse(
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_BatchCreateNotesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_BatchCreateNotesResponse_fieldAccessorTable
@@ -147,7 +143,6 @@ public io.grafeas.v1beta1.NoteOrBuilder getNotesOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < notes_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static io.grafeas.v1beta1.BatchCreateNotesResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.BatchCreateNotesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_BatchCreateNotesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_BatchCreateNotesResponse_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getNotesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (notesBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_BatchCreateNotesResponse_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.BatchCreateNotesResponse getDefaultInstanceForType() {
       return io.grafeas.v1beta1.BatchCreateNotesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.BatchCreateNotesResponse build() {
       io.grafeas.v1beta1.BatchCreateNotesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public io.grafeas.v1beta1.BatchCreateNotesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.BatchCreateNotesResponse buildPartial() {
       io.grafeas.v1beta1.BatchCreateNotesResponse result = new io.grafeas.v1beta1.BatchCreateNotesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public io.grafeas.v1beta1.BatchCreateNotesResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.BatchCreateNotesResponse) {
         return mergeFrom((io.grafeas.v1beta1.BatchCreateNotesResponse)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.BatchCreateNotesResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public io.grafeas.v1beta1.Note.Builder addNotesBuilder(
       }
       return notesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static io.grafeas.v1beta1.BatchCreateNotesResponse getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BatchCreateNotesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchCreateNotesResponse(input, extensionRegistry);
+        return new BatchCreateNotesResponse(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.BatchCreateNotesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/BatchCreateOccurrencesRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/BatchCreateOccurrencesRequest.java
index 436f56d69be2..07b9950ffe90 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/BatchCreateOccurrencesRequest.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/BatchCreateOccurrencesRequest.java
@@ -34,9 +34,6 @@ private BatchCreateOccurrencesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private BatchCreateOccurrencesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -63,13 +67,6 @@ private BatchCreateOccurrencesRequest(
                 input.readMessage(io.grafeas.v1beta1.Occurrence.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private BatchCreateOccurrencesRequest(
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_BatchCreateOccurrencesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_BatchCreateOccurrencesRequest_fieldAccessorTable
@@ -199,7 +195,6 @@ public io.grafeas.v1beta1.OccurrenceOrBuilder getOccurrencesOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -209,7 +204,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -221,7 +215,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -346,7 +339,6 @@ public static io.grafeas.v1beta1.BatchCreateOccurrencesRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -354,7 +346,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.BatchCreateOccurrencesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -382,7 +373,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_BatchCreateOccurrencesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_BatchCreateOccurrencesRequest_fieldAccessorTable
@@ -406,7 +396,6 @@ private void maybeForceBuilderInitialization() {
         getOccurrencesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -420,18 +409,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_BatchCreateOccurrencesRequest_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.BatchCreateOccurrencesRequest getDefaultInstanceForType() {
       return io.grafeas.v1beta1.BatchCreateOccurrencesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.BatchCreateOccurrencesRequest build() {
       io.grafeas.v1beta1.BatchCreateOccurrencesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -440,7 +426,6 @@ public io.grafeas.v1beta1.BatchCreateOccurrencesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.BatchCreateOccurrencesRequest buildPartial() {
       io.grafeas.v1beta1.BatchCreateOccurrencesRequest result = new io.grafeas.v1beta1.BatchCreateOccurrencesRequest(this);
       int from_bitField0_ = bitField0_;
@@ -460,39 +445,32 @@ public io.grafeas.v1beta1.BatchCreateOccurrencesRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.BatchCreateOccurrencesRequest) {
         return mergeFrom((io.grafeas.v1beta1.BatchCreateOccurrencesRequest)other);
@@ -539,12 +517,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.BatchCreateOccurrencesRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -969,13 +945,11 @@ public io.grafeas.v1beta1.Occurrence.Builder addOccurrencesBuilder(
       }
       return occurrencesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -997,12 +971,11 @@ public static io.grafeas.v1beta1.BatchCreateOccurrencesRequest getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BatchCreateOccurrencesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchCreateOccurrencesRequest(input, extensionRegistry);
+        return new BatchCreateOccurrencesRequest(input, extensionRegistry);
     }
   };
 
@@ -1015,7 +988,6 @@ public com.google.protobuf.Parser getParserForTyp
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.BatchCreateOccurrencesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/BatchCreateOccurrencesResponse.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/BatchCreateOccurrencesResponse.java
index ee9475f11951..3061773b3913 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/BatchCreateOccurrencesResponse.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/BatchCreateOccurrencesResponse.java
@@ -33,9 +33,6 @@ private BatchCreateOccurrencesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private BatchCreateOccurrencesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               occurrences_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private BatchCreateOccurrencesResponse(
                 input.readMessage(io.grafeas.v1beta1.Occurrence.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private BatchCreateOccurrencesResponse(
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_BatchCreateOccurrencesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_BatchCreateOccurrencesResponse_fieldAccessorTable
@@ -147,7 +143,6 @@ public io.grafeas.v1beta1.OccurrenceOrBuilder getOccurrencesOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < occurrences_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static io.grafeas.v1beta1.BatchCreateOccurrencesResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.BatchCreateOccurrencesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_BatchCreateOccurrencesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_BatchCreateOccurrencesResponse_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getOccurrencesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (occurrencesBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_BatchCreateOccurrencesResponse_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.BatchCreateOccurrencesResponse getDefaultInstanceForType() {
       return io.grafeas.v1beta1.BatchCreateOccurrencesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.BatchCreateOccurrencesResponse build() {
       io.grafeas.v1beta1.BatchCreateOccurrencesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public io.grafeas.v1beta1.BatchCreateOccurrencesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.BatchCreateOccurrencesResponse buildPartial() {
       io.grafeas.v1beta1.BatchCreateOccurrencesResponse result = new io.grafeas.v1beta1.BatchCreateOccurrencesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public io.grafeas.v1beta1.BatchCreateOccurrencesResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.BatchCreateOccurrencesResponse) {
         return mergeFrom((io.grafeas.v1beta1.BatchCreateOccurrencesResponse)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.BatchCreateOccurrencesResponse other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public io.grafeas.v1beta1.Occurrence.Builder addOccurrencesBuilder(
       }
       return occurrencesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static io.grafeas.v1beta1.BatchCreateOccurrencesResponse getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BatchCreateOccurrencesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchCreateOccurrencesResponse(input, extensionRegistry);
+        return new BatchCreateOccurrencesResponse(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForTy
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.BatchCreateOccurrencesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/CreateNoteRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/CreateNoteRequest.java
index d4d73f5da2e1..8bc83dd0ee19 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/CreateNoteRequest.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/CreateNoteRequest.java
@@ -34,9 +34,6 @@ private CreateNoteRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private CreateNoteRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private CreateNoteRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private CreateNoteRequest(
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_CreateNoteRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_CreateNoteRequest_fieldAccessorTable
@@ -225,7 +221,6 @@ public io.grafeas.v1beta1.NoteOrBuilder getNoteOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -235,7 +230,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -250,7 +244,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -385,7 +378,6 @@ public static io.grafeas.v1beta1.CreateNoteRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -393,7 +385,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.CreateNoteRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -421,7 +412,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_CreateNoteRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_CreateNoteRequest_fieldAccessorTable
@@ -444,7 +434,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -460,18 +449,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_CreateNoteRequest_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.CreateNoteRequest getDefaultInstanceForType() {
       return io.grafeas.v1beta1.CreateNoteRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.CreateNoteRequest build() {
       io.grafeas.v1beta1.CreateNoteRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -480,7 +466,6 @@ public io.grafeas.v1beta1.CreateNoteRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.CreateNoteRequest buildPartial() {
       io.grafeas.v1beta1.CreateNoteRequest result = new io.grafeas.v1beta1.CreateNoteRequest(this);
       result.parent_ = parent_;
@@ -494,39 +479,32 @@ public io.grafeas.v1beta1.CreateNoteRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.CreateNoteRequest) {
         return mergeFrom((io.grafeas.v1beta1.CreateNoteRequest)other);
@@ -554,12 +532,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.CreateNoteRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -913,13 +889,11 @@ public io.grafeas.v1beta1.NoteOrBuilder getNoteOrBuilder() {
       }
       return noteBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -941,12 +915,11 @@ public static io.grafeas.v1beta1.CreateNoteRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateNoteRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateNoteRequest(input, extensionRegistry);
+        return new CreateNoteRequest(input, extensionRegistry);
     }
   };
 
@@ -959,7 +932,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.CreateNoteRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/CreateOccurrenceRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/CreateOccurrenceRequest.java
index 988a5be97482..8d27a73a5bc6 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/CreateOccurrenceRequest.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/CreateOccurrenceRequest.java
@@ -33,9 +33,6 @@ private CreateOccurrenceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private CreateOccurrenceRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private CreateOccurrenceRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private CreateOccurrenceRequest(
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_CreateOccurrenceRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_CreateOccurrenceRequest_fieldAccessorTable
@@ -176,7 +172,6 @@ public io.grafeas.v1beta1.OccurrenceOrBuilder getOccurrenceOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -186,7 +181,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -198,7 +192,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -326,7 +319,6 @@ public static io.grafeas.v1beta1.CreateOccurrenceRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -334,7 +326,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.CreateOccurrenceRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -362,7 +353,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_CreateOccurrenceRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_CreateOccurrenceRequest_fieldAccessorTable
@@ -385,7 +375,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -399,18 +388,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_CreateOccurrenceRequest_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.CreateOccurrenceRequest getDefaultInstanceForType() {
       return io.grafeas.v1beta1.CreateOccurrenceRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.CreateOccurrenceRequest build() {
       io.grafeas.v1beta1.CreateOccurrenceRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -419,7 +405,6 @@ public io.grafeas.v1beta1.CreateOccurrenceRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.CreateOccurrenceRequest buildPartial() {
       io.grafeas.v1beta1.CreateOccurrenceRequest result = new io.grafeas.v1beta1.CreateOccurrenceRequest(this);
       result.parent_ = parent_;
@@ -432,39 +417,32 @@ public io.grafeas.v1beta1.CreateOccurrenceRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.CreateOccurrenceRequest) {
         return mergeFrom((io.grafeas.v1beta1.CreateOccurrenceRequest)other);
@@ -488,12 +466,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.CreateOccurrenceRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -758,13 +734,11 @@ public io.grafeas.v1beta1.OccurrenceOrBuilder getOccurrenceOrBuilder() {
       }
       return occurrenceBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -786,12 +760,11 @@ public static io.grafeas.v1beta1.CreateOccurrenceRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateOccurrenceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateOccurrenceRequest(input, extensionRegistry);
+        return new CreateOccurrenceRequest(input, extensionRegistry);
     }
   };
 
@@ -804,7 +777,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.CreateOccurrenceRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/DeleteNoteRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/DeleteNoteRequest.java
index e574be1a2de0..a1c80e2f4836 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/DeleteNoteRequest.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/DeleteNoteRequest.java
@@ -33,9 +33,6 @@ private DeleteNoteRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteNoteRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteNoteRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteNoteRequest(
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_DeleteNoteRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_DeleteNoteRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static io.grafeas.v1beta1.DeleteNoteRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.DeleteNoteRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_DeleteNoteRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_DeleteNoteRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_DeleteNoteRequest_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.DeleteNoteRequest getDefaultInstanceForType() {
       return io.grafeas.v1beta1.DeleteNoteRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.DeleteNoteRequest build() {
       io.grafeas.v1beta1.DeleteNoteRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public io.grafeas.v1beta1.DeleteNoteRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.DeleteNoteRequest buildPartial() {
       io.grafeas.v1beta1.DeleteNoteRequest result = new io.grafeas.v1beta1.DeleteNoteRequest(this);
       result.name_ = name_;
@@ -359,39 +344,32 @@ public io.grafeas.v1beta1.DeleteNoteRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.DeleteNoteRequest) {
         return mergeFrom((io.grafeas.v1beta1.DeleteNoteRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.DeleteNoteRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static io.grafeas.v1beta1.DeleteNoteRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteNoteRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteNoteRequest(input, extensionRegistry);
+        return new DeleteNoteRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.DeleteNoteRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/DeleteOccurrenceRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/DeleteOccurrenceRequest.java
index f2897f51f191..045ad4019e0d 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/DeleteOccurrenceRequest.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/DeleteOccurrenceRequest.java
@@ -33,9 +33,6 @@ private DeleteOccurrenceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteOccurrenceRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteOccurrenceRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteOccurrenceRequest(
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_DeleteOccurrenceRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_DeleteOccurrenceRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static io.grafeas.v1beta1.DeleteOccurrenceRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.DeleteOccurrenceRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_DeleteOccurrenceRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_DeleteOccurrenceRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_DeleteOccurrenceRequest_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.DeleteOccurrenceRequest getDefaultInstanceForType() {
       return io.grafeas.v1beta1.DeleteOccurrenceRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.DeleteOccurrenceRequest build() {
       io.grafeas.v1beta1.DeleteOccurrenceRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public io.grafeas.v1beta1.DeleteOccurrenceRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.DeleteOccurrenceRequest buildPartial() {
       io.grafeas.v1beta1.DeleteOccurrenceRequest result = new io.grafeas.v1beta1.DeleteOccurrenceRequest(this);
       result.name_ = name_;
@@ -359,39 +344,32 @@ public io.grafeas.v1beta1.DeleteOccurrenceRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.DeleteOccurrenceRequest) {
         return mergeFrom((io.grafeas.v1beta1.DeleteOccurrenceRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.DeleteOccurrenceRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static io.grafeas.v1beta1.DeleteOccurrenceRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteOccurrenceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteOccurrenceRequest(input, extensionRegistry);
+        return new DeleteOccurrenceRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.DeleteOccurrenceRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetNoteRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetNoteRequest.java
index 6e5ab75e376c..1fa08011ac4b 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetNoteRequest.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetNoteRequest.java
@@ -33,9 +33,6 @@ private GetNoteRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetNoteRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetNoteRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetNoteRequest(
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_GetNoteRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_GetNoteRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static io.grafeas.v1beta1.GetNoteRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.GetNoteRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_GetNoteRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_GetNoteRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_GetNoteRequest_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.GetNoteRequest getDefaultInstanceForType() {
       return io.grafeas.v1beta1.GetNoteRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.GetNoteRequest build() {
       io.grafeas.v1beta1.GetNoteRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public io.grafeas.v1beta1.GetNoteRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.GetNoteRequest buildPartial() {
       io.grafeas.v1beta1.GetNoteRequest result = new io.grafeas.v1beta1.GetNoteRequest(this);
       result.name_ = name_;
@@ -359,39 +344,32 @@ public io.grafeas.v1beta1.GetNoteRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.GetNoteRequest) {
         return mergeFrom((io.grafeas.v1beta1.GetNoteRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.GetNoteRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static io.grafeas.v1beta1.GetNoteRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetNoteRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetNoteRequest(input, extensionRegistry);
+        return new GetNoteRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.GetNoteRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetOccurrenceNoteRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetOccurrenceNoteRequest.java
index bfbdbec373ac..cbcf871a6983 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetOccurrenceNoteRequest.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetOccurrenceNoteRequest.java
@@ -33,9 +33,6 @@ private GetOccurrenceNoteRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetOccurrenceNoteRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetOccurrenceNoteRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetOccurrenceNoteRequest(
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_GetOccurrenceNoteRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_GetOccurrenceNoteRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static io.grafeas.v1beta1.GetOccurrenceNoteRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.GetOccurrenceNoteRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_GetOccurrenceNoteRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_GetOccurrenceNoteRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_GetOccurrenceNoteRequest_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.GetOccurrenceNoteRequest getDefaultInstanceForType() {
       return io.grafeas.v1beta1.GetOccurrenceNoteRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.GetOccurrenceNoteRequest build() {
       io.grafeas.v1beta1.GetOccurrenceNoteRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public io.grafeas.v1beta1.GetOccurrenceNoteRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.GetOccurrenceNoteRequest buildPartial() {
       io.grafeas.v1beta1.GetOccurrenceNoteRequest result = new io.grafeas.v1beta1.GetOccurrenceNoteRequest(this);
       result.name_ = name_;
@@ -359,39 +344,32 @@ public io.grafeas.v1beta1.GetOccurrenceNoteRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.GetOccurrenceNoteRequest) {
         return mergeFrom((io.grafeas.v1beta1.GetOccurrenceNoteRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.GetOccurrenceNoteRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static io.grafeas.v1beta1.GetOccurrenceNoteRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetOccurrenceNoteRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetOccurrenceNoteRequest(input, extensionRegistry);
+        return new GetOccurrenceNoteRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.GetOccurrenceNoteRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetOccurrenceRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetOccurrenceRequest.java
index 097c9569c8ca..b875bc619805 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetOccurrenceRequest.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetOccurrenceRequest.java
@@ -33,9 +33,6 @@ private GetOccurrenceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetOccurrenceRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetOccurrenceRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetOccurrenceRequest(
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_GetOccurrenceRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_GetOccurrenceRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static io.grafeas.v1beta1.GetOccurrenceRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.GetOccurrenceRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_GetOccurrenceRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_GetOccurrenceRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_GetOccurrenceRequest_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.GetOccurrenceRequest getDefaultInstanceForType() {
       return io.grafeas.v1beta1.GetOccurrenceRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.GetOccurrenceRequest build() {
       io.grafeas.v1beta1.GetOccurrenceRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public io.grafeas.v1beta1.GetOccurrenceRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.GetOccurrenceRequest buildPartial() {
       io.grafeas.v1beta1.GetOccurrenceRequest result = new io.grafeas.v1beta1.GetOccurrenceRequest(this);
       result.name_ = name_;
@@ -359,39 +344,32 @@ public io.grafeas.v1beta1.GetOccurrenceRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.GetOccurrenceRequest) {
         return mergeFrom((io.grafeas.v1beta1.GetOccurrenceRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.GetOccurrenceRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static io.grafeas.v1beta1.GetOccurrenceRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetOccurrenceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetOccurrenceRequest(input, extensionRegistry);
+        return new GetOccurrenceRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.GetOccurrenceRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetVulnerabilityOccurrencesSummaryRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetVulnerabilityOccurrencesSummaryRequest.java
index 524cf238af8f..c683db0c0e09 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetVulnerabilityOccurrencesSummaryRequest.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/GetVulnerabilityOccurrencesSummaryRequest.java
@@ -34,9 +34,6 @@ private GetVulnerabilityOccurrencesSummaryRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private GetVulnerabilityOccurrencesSummaryRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private GetVulnerabilityOccurrencesSummaryRequest(
             filter_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private GetVulnerabilityOccurrencesSummaryRequest(
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_GetVulnerabilityOccurrencesSummaryRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_GetVulnerabilityOccurrencesSummaryRequest_fieldAccessorTable
@@ -179,7 +175,6 @@ public java.lang.String getFilter() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -189,7 +184,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -201,7 +195,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -323,7 +316,6 @@ public static io.grafeas.v1beta1.GetVulnerabilityOccurrencesSummaryRequest parse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -331,7 +323,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.GetVulnerabilityOccurrencesSummaryRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -359,7 +350,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_GetVulnerabilityOccurrencesSummaryRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_GetVulnerabilityOccurrencesSummaryRequest_fieldAccessorTable
@@ -382,7 +372,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -392,18 +381,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_GetVulnerabilityOccurrencesSummaryRequest_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.GetVulnerabilityOccurrencesSummaryRequest getDefaultInstanceForType() {
       return io.grafeas.v1beta1.GetVulnerabilityOccurrencesSummaryRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.GetVulnerabilityOccurrencesSummaryRequest build() {
       io.grafeas.v1beta1.GetVulnerabilityOccurrencesSummaryRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -412,7 +398,6 @@ public io.grafeas.v1beta1.GetVulnerabilityOccurrencesSummaryRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.GetVulnerabilityOccurrencesSummaryRequest buildPartial() {
       io.grafeas.v1beta1.GetVulnerabilityOccurrencesSummaryRequest result = new io.grafeas.v1beta1.GetVulnerabilityOccurrencesSummaryRequest(this);
       result.parent_ = parent_;
@@ -421,39 +406,32 @@ public io.grafeas.v1beta1.GetVulnerabilityOccurrencesSummaryRequest buildPartial
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.GetVulnerabilityOccurrencesSummaryRequest) {
         return mergeFrom((io.grafeas.v1beta1.GetVulnerabilityOccurrencesSummaryRequest)other);
@@ -478,12 +456,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.GetVulnerabilityOccurrencesSummaryRe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -684,13 +660,11 @@ public Builder setFilterBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -712,12 +686,11 @@ public static io.grafeas.v1beta1.GetVulnerabilityOccurrencesSummaryRequest getDe
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetVulnerabilityOccurrencesSummaryRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetVulnerabilityOccurrencesSummaryRequest(input, extensionRegistry);
+        return new GetVulnerabilityOccurrencesSummaryRequest(input, extensionRegistry);
     }
   };
 
@@ -730,7 +703,6 @@ public com.google.protobuf.Parser get
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.GetVulnerabilityOccurrencesSummaryRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/Grafeas.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/Grafeas.java
index 9d3408ae88a7..b1134fa47069 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/Grafeas.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/Grafeas.java
@@ -162,7 +162,7 @@ public static void registerAllExtensions(
       ".proto\032=google/devtools/containeranalysi" +
       "s/v1beta1/common/common.proto\032Egoogle/de" +
       "vtools/containeranalysis/v1beta1/deploym" +
-      "ent/deployment.proto\032Cgoogle/devtools/co" +
+      "ent/deployment.proto\032Cgoogle/devtools/co",
       "ntaineranalysis/v1beta1/discovery/discov" +
       "ery.proto\032;google/devtools/containeranal" +
       "ysis/v1beta1/image/image.proto\032?google/d" +
@@ -172,7 +172,7 @@ public static void registerAllExtensions(
       ".proto\032Kgoogle/devtools/containeranalysi" +
       "s/v1beta1/vulnerability/vulnerability.pr" +
       "oto\032\033google/protobuf/empty.proto\032 google" +
-      "/protobuf/field_mask.proto\032\037google/proto" +
+      "/protobuf/field_mask.proto\032\037google/proto",
       "buf/timestamp.proto\"\234\005\n\nOccurrence\022\014\n\004na" +
       "me\030\001 \001(\t\022+\n\010resource\030\002 \001(\0132\031.grafeas.v1b" +
       "eta1.Resource\022\021\n\tnote_name\030\003 \001(\t\022\'\n\004kind" +
@@ -182,7 +182,7 @@ public static void registerAllExtensions(
       " \001(\0132\032.google.protobuf.Timestamp\022?\n\rvuln" +
       "erability\030\010 \001(\0132&.grafeas.v1beta1.vulner" +
       "ability.DetailsH\000\022/\n\005build\030\t \001(\0132\036.grafe" +
-      "as.v1beta1.build.DetailsH\000\0227\n\rderived_im" +
+      "as.v1beta1.build.DetailsH\000\0227\n\rderived_im",
       "age\030\n \001(\0132\036.grafeas.v1beta1.image.Detail" +
       "sH\000\0228\n\014installation\030\013 \001(\0132 .grafeas.v1be" +
       "ta1.package.DetailsH\000\0229\n\ndeployment\030\014 \001(" +
@@ -192,7 +192,7 @@ public static void registerAllExtensions(
       "$.grafeas.v1beta1.attestation.DetailsH\000B" +
       "\t\n\007details\"]\n\010Resource\022\014\n\004name\030\001 \001(\t\022\013\n\003" +
       "uri\030\002 \001(\t\0226\n\014content_hash\030\003 \001(\0132 .grafea" +
-      "s.v1beta1.provenance.Hash\"\200\006\n\004Note\022\014\n\004na" +
+      "s.v1beta1.provenance.Hash\"\200\006\n\004Note\022\014\n\004na",
       "me\030\001 \001(\t\022\031\n\021short_description\030\002 \001(\t\022\030\n\020l" +
       "ong_description\030\003 \001(\t\022\'\n\004kind\030\004 \001(\0162\031.gr" +
       "afeas.v1beta1.NoteKind\0220\n\013related_url\030\005 " +
@@ -202,7 +202,7 @@ public static void registerAllExtensions(
       "obuf.Timestamp\022/\n\013update_time\030\010 \001(\0132\032.go" +
       "ogle.protobuf.Timestamp\022\032\n\022related_note_" +
       "names\030\t \003(\t\022E\n\rvulnerability\030\n \001(\0132,.gra" +
-      "feas.v1beta1.vulnerability.Vulnerability" +
+      "feas.v1beta1.vulnerability.Vulnerability",
       "H\000\022-\n\005build\030\013 \001(\0132\034.grafeas.v1beta1.buil" +
       "d.BuildH\000\0222\n\nbase_image\030\014 \001(\0132\034.grafeas." +
       "v1beta1.image.BasisH\000\0223\n\007package\030\r \001(\0132 " +
@@ -212,7 +212,7 @@ public static void registerAllExtensions(
       "afeas.v1beta1.discovery.DiscoveryH\000\022G\n\025a" +
       "ttestation_authority\030\020 \001(\0132&.grafeas.v1b" +
       "eta1.attestation.AuthorityH\000B\006\n\004type\"$\n\024" +
-      "GetOccurrenceRequest\022\014\n\004name\030\001 \001(\t\"_\n\026Li" +
+      "GetOccurrenceRequest\022\014\n\004name\030\001 \001(\t\"_\n\026Li",
       "stOccurrencesRequest\022\016\n\006parent\030\001 \001(\t\022\016\n\006" +
       "filter\030\002 \001(\t\022\021\n\tpage_size\030\003 \001(\005\022\022\n\npage_" +
       "token\030\004 \001(\t\"d\n\027ListOccurrencesResponse\0220" +
@@ -222,7 +222,7 @@ public static void registerAllExtensions(
       "eateOccurrenceRequest\022\016\n\006parent\030\001 \001(\t\022/\n" +
       "\noccurrence\030\002 \001(\0132\033.grafeas.v1beta1.Occu" +
       "rrence\"\211\001\n\027UpdateOccurrenceRequest\022\014\n\004na" +
-      "me\030\001 \001(\t\022/\n\noccurrence\030\002 \001(\0132\033.grafeas.v" +
+      "me\030\001 \001(\t\022/\n\noccurrence\030\002 \001(\0132\033.grafeas.v",
       "1beta1.Occurrence\022/\n\013update_mask\030\003 \001(\0132\032" +
       ".google.protobuf.FieldMask\"\036\n\016GetNoteReq" +
       "uest\022\014\n\004name\030\001 \001(\t\"(\n\030GetOccurrenceNoteR" +
@@ -232,7 +232,7 @@ public static void registerAllExtensions(
       "otesResponse\022$\n\005notes\030\001 \003(\0132\025.grafeas.v1" +
       "beta1.Note\022\027\n\017next_page_token\030\002 \001(\t\"!\n\021D" +
       "eleteNoteRequest\022\014\n\004name\030\001 \001(\t\"Y\n\021Create" +
-      "NoteRequest\022\016\n\006parent\030\001 \001(\t\022\017\n\007note_id\030\002" +
+      "NoteRequest\022\016\n\006parent\030\001 \001(\t\022\017\n\007note_id\030\002",
       " \001(\t\022#\n\004note\030\003 \001(\0132\025.grafeas.v1beta1.Not" +
       "e\"w\n\021UpdateNoteRequest\022\014\n\004name\030\001 \001(\t\022#\n\004" +
       "note\030\002 \001(\0132\025.grafeas.v1beta1.Note\022/\n\013upd" +
@@ -242,7 +242,7 @@ public static void registerAllExtensions(
       "\005\022\022\n\npage_token\030\004 \001(\t\"h\n\033ListNoteOccurre" +
       "ncesResponse\0220\n\013occurrences\030\001 \003(\0132\033.graf" +
       "eas.v1beta1.Occurrence\022\027\n\017next_page_toke" +
-      "n\030\002 \001(\t\"\262\001\n\027BatchCreateNotesRequest\022\016\n\006p" +
+      "n\030\002 \001(\t\"\262\001\n\027BatchCreateNotesRequest\022\016\n\006p",
       "arent\030\001 \001(\t\022B\n\005notes\030\002 \003(\01323.grafeas.v1b" +
       "eta1.BatchCreateNotesRequest.NotesEntry\032" +
       "C\n\nNotesEntry\022\013\n\003key\030\001 \001(\t\022$\n\005value\030\002 \001(" +
@@ -252,7 +252,7 @@ public static void registerAllExtensions(
       "Request\022\016\n\006parent\030\001 \001(\t\0220\n\013occurrences\030\002" +
       " \003(\0132\033.grafeas.v1beta1.Occurrence\"R\n\036Bat" +
       "chCreateOccurrencesResponse\0220\n\013occurrenc" +
-      "es\030\001 \003(\0132\033.grafeas.v1beta1.Occurrence\"K\n" +
+      "es\030\001 \003(\0132\033.grafeas.v1beta1.Occurrence\"K\n",
       ")GetVulnerabilityOccurrencesSummaryReque" +
       "st\022\016\n\006parent\030\001 \001(\t\022\016\n\006filter\030\002 \001(\t\"\245\002\n\037V" +
       "ulnerabilityOccurrencesSummary\022U\n\006counts" +
@@ -262,7 +262,7 @@ public static void registerAllExtensions(
       "2\031.grafeas.v1beta1.Resource\0229\n\010severity\030" +
       "\002 \001(\0162\'.grafeas.v1beta1.vulnerability.Se" +
       "verity\022\025\n\rfixable_count\030\003 \001(\003\022\023\n\013total_c" +
-      "ount\030\004 \001(\0032\302\021\n\016GrafeasV1Beta1\022\205\001\n\rGetOcc" +
+      "ount\030\004 \001(\0032\302\021\n\016GrafeasV1Beta1\022\205\001\n\rGetOcc",
       "urrence\022%.grafeas.v1beta1.GetOccurrenceR" +
       "equest\032\033.grafeas.v1beta1.Occurrence\"0\202\323\344" +
       "\223\002*\022(/v1beta1/{name=projects/*/occurrenc" +
@@ -272,7 +272,7 @@ public static void registerAllExtensions(
       "1beta1/{parent=projects/*}/occurrences\022\206" +
       "\001\n\020DeleteOccurrence\022(.grafeas.v1beta1.De" +
       "leteOccurrenceRequest\032\026.google.protobuf." +
-      "Empty\"0\202\323\344\223\002**(/v1beta1/{name=projects/*" +
+      "Empty\"0\202\323\344\223\002**(/v1beta1/{name=projects/*",
       "/occurrences/*}\022\227\001\n\020CreateOccurrence\022(.g" +
       "rafeas.v1beta1.CreateOccurrenceRequest\032\033" +
       ".grafeas.v1beta1.Occurrence\"<\202\323\344\223\0026\"(/v1" +
@@ -282,7 +282,7 @@ public static void registerAllExtensions(
       "uest\032/.grafeas.v1beta1.BatchCreateOccurr" +
       "encesResponse\"?\202\323\344\223\0029\"4/v1beta1/{parent=" +
       "projects/*}/occurrences:batchCreate:\001*\022\227" +
-      "\001\n\020UpdateOccurrence\022(.grafeas.v1beta1.Up" +
+      "\001\n\020UpdateOccurrence\022(.grafeas.v1beta1.Up",
       "dateOccurrenceRequest\032\033.grafeas.v1beta1." +
       "Occurrence\"<\202\323\344\223\00262(/v1beta1/{name=proje" +
       "cts/*/occurrences/*}:\noccurrence\022\215\001\n\021Get" +
@@ -292,7 +292,7 @@ public static void registerAllExtensions(
       "rrences/*}/notes\022m\n\007GetNote\022\037.grafeas.v1" +
       "beta1.GetNoteRequest\032\025.grafeas.v1beta1.N" +
       "ote\"*\202\323\344\223\002$\022\"/v1beta1/{name=projects/*/n" +
-      "otes/*}\022~\n\tListNotes\022!.grafeas.v1beta1.L" +
+      "otes/*}\022~\n\tListNotes\022!.grafeas.v1beta1.L",
       "istNotesRequest\032\".grafeas.v1beta1.ListNo" +
       "tesResponse\"*\202\323\344\223\002$\022\"/v1beta1/{parent=pr" +
       "ojects/*}/notes\022t\n\nDeleteNote\022\".grafeas." +
@@ -302,7 +302,7 @@ public static void registerAllExtensions(
       "beta1.CreateNoteRequest\032\025.grafeas.v1beta" +
       "1.Note\"0\202\323\344\223\002*\"\"/v1beta1/{parent=project" +
       "s/*}/notes:\004note\022\242\001\n\020BatchCreateNotes\022(." +
-      "grafeas.v1beta1.BatchCreateNotesRequest\032" +
+      "grafeas.v1beta1.BatchCreateNotesRequest\032",
       ").grafeas.v1beta1.BatchCreateNotesRespon" +
       "se\"9\202\323\344\223\0023\"./v1beta1/{parent=projects/*}" +
       "/notes:batchCreate:\001*\022y\n\nUpdateNote\022\".gr" +
@@ -312,7 +312,7 @@ public static void registerAllExtensions(
       "urrences\022+.grafeas.v1beta1.ListNoteOccur" +
       "rencesRequest\032,.grafeas.v1beta1.ListNote" +
       "OccurrencesResponse\"6\202\323\344\223\0020\022./v1beta1/{n" +
-      "ame=projects/*/notes/*}/occurrences\022\331\001\n\"" +
+      "ame=projects/*/notes/*}/occurrences\022\331\001\n\"",
       "GetVulnerabilityOccurrencesSummary\022:.gra" +
       "feas.v1beta1.GetVulnerabilityOccurrences" +
       "SummaryRequest\0320.grafeas.v1beta1.Vulnera" +
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNoteOccurrencesRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNoteOccurrencesRequest.java
index a3fc1e16b403..c42b230bb480 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNoteOccurrencesRequest.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNoteOccurrencesRequest.java
@@ -36,9 +36,6 @@ private ListNoteOccurrencesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private ListNoteOccurrencesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private ListNoteOccurrencesRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private ListNoteOccurrencesRequest(
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_ListNoteOccurrencesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_ListNoteOccurrencesRequest_fieldAccessorTable
@@ -247,7 +243,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -257,7 +252,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -275,7 +269,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -412,7 +405,6 @@ public static io.grafeas.v1beta1.ListNoteOccurrencesRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -420,7 +412,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.ListNoteOccurrencesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -448,7 +439,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_ListNoteOccurrencesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_ListNoteOccurrencesRequest_fieldAccessorTable
@@ -471,7 +461,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -485,18 +474,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_ListNoteOccurrencesRequest_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.ListNoteOccurrencesRequest getDefaultInstanceForType() {
       return io.grafeas.v1beta1.ListNoteOccurrencesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.ListNoteOccurrencesRequest build() {
       io.grafeas.v1beta1.ListNoteOccurrencesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -505,7 +491,6 @@ public io.grafeas.v1beta1.ListNoteOccurrencesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.ListNoteOccurrencesRequest buildPartial() {
       io.grafeas.v1beta1.ListNoteOccurrencesRequest result = new io.grafeas.v1beta1.ListNoteOccurrencesRequest(this);
       result.name_ = name_;
@@ -516,39 +501,32 @@ public io.grafeas.v1beta1.ListNoteOccurrencesRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.ListNoteOccurrencesRequest) {
         return mergeFrom((io.grafeas.v1beta1.ListNoteOccurrencesRequest)other);
@@ -580,12 +558,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.ListNoteOccurrencesRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -913,13 +889,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -941,12 +915,11 @@ public static io.grafeas.v1beta1.ListNoteOccurrencesRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListNoteOccurrencesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListNoteOccurrencesRequest(input, extensionRegistry);
+        return new ListNoteOccurrencesRequest(input, extensionRegistry);
     }
   };
 
@@ -959,7 +932,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.ListNoteOccurrencesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNoteOccurrencesResponse.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNoteOccurrencesResponse.java
index 064bb30eec9c..4f91c90974ee 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNoteOccurrencesResponse.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNoteOccurrencesResponse.java
@@ -34,9 +34,6 @@ private ListNoteOccurrencesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListNoteOccurrencesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               occurrences_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListNoteOccurrencesResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListNoteOccurrencesResponse(
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_ListNoteOccurrencesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_ListNoteOccurrencesResponse_fieldAccessorTable
@@ -197,7 +193,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -207,7 +202,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < occurrences_.size(); i++) {
@@ -219,7 +213,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -344,7 +337,6 @@ public static io.grafeas.v1beta1.ListNoteOccurrencesResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -352,7 +344,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.ListNoteOccurrencesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -380,7 +371,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_ListNoteOccurrencesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_ListNoteOccurrencesResponse_fieldAccessorTable
@@ -404,7 +394,6 @@ private void maybeForceBuilderInitialization() {
         getOccurrencesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (occurrencesBuilder_ == null) {
@@ -418,18 +407,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_ListNoteOccurrencesResponse_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.ListNoteOccurrencesResponse getDefaultInstanceForType() {
       return io.grafeas.v1beta1.ListNoteOccurrencesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.ListNoteOccurrencesResponse build() {
       io.grafeas.v1beta1.ListNoteOccurrencesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -438,7 +424,6 @@ public io.grafeas.v1beta1.ListNoteOccurrencesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.ListNoteOccurrencesResponse buildPartial() {
       io.grafeas.v1beta1.ListNoteOccurrencesResponse result = new io.grafeas.v1beta1.ListNoteOccurrencesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -458,39 +443,32 @@ public io.grafeas.v1beta1.ListNoteOccurrencesResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.ListNoteOccurrencesResponse) {
         return mergeFrom((io.grafeas.v1beta1.ListNoteOccurrencesResponse)other);
@@ -537,12 +515,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.ListNoteOccurrencesResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -962,13 +938,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -990,12 +964,11 @@ public static io.grafeas.v1beta1.ListNoteOccurrencesResponse getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListNoteOccurrencesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListNoteOccurrencesResponse(input, extensionRegistry);
+        return new ListNoteOccurrencesResponse(input, extensionRegistry);
     }
   };
 
@@ -1008,7 +981,6 @@ public com.google.protobuf.Parser getParserForType(
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.ListNoteOccurrencesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNotesRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNotesRequest.java
index 8d89e7528bc7..8d2949fa4704 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNotesRequest.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNotesRequest.java
@@ -36,9 +36,6 @@ private ListNotesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private ListNotesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private ListNotesRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private ListNotesRequest(
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_ListNotesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_ListNotesRequest_fieldAccessorTable
@@ -247,7 +243,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -257,7 +252,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -275,7 +269,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -412,7 +405,6 @@ public static io.grafeas.v1beta1.ListNotesRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -420,7 +412,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.ListNotesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -448,7 +439,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_ListNotesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_ListNotesRequest_fieldAccessorTable
@@ -471,7 +461,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -485,18 +474,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_ListNotesRequest_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.ListNotesRequest getDefaultInstanceForType() {
       return io.grafeas.v1beta1.ListNotesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.ListNotesRequest build() {
       io.grafeas.v1beta1.ListNotesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -505,7 +491,6 @@ public io.grafeas.v1beta1.ListNotesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.ListNotesRequest buildPartial() {
       io.grafeas.v1beta1.ListNotesRequest result = new io.grafeas.v1beta1.ListNotesRequest(this);
       result.parent_ = parent_;
@@ -516,39 +501,32 @@ public io.grafeas.v1beta1.ListNotesRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.ListNotesRequest) {
         return mergeFrom((io.grafeas.v1beta1.ListNotesRequest)other);
@@ -580,12 +558,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.ListNotesRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -913,13 +889,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -941,12 +915,11 @@ public static io.grafeas.v1beta1.ListNotesRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListNotesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListNotesRequest(input, extensionRegistry);
+        return new ListNotesRequest(input, extensionRegistry);
     }
   };
 
@@ -959,7 +932,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.ListNotesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNotesResponse.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNotesResponse.java
index d9be1e04f3ec..66d90fdd4d28 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNotesResponse.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListNotesResponse.java
@@ -34,9 +34,6 @@ private ListNotesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListNotesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               notes_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListNotesResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListNotesResponse(
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_ListNotesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_ListNotesResponse_fieldAccessorTable
@@ -201,7 +197,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -211,7 +206,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < notes_.size(); i++) {
@@ -223,7 +217,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static io.grafeas.v1beta1.ListNotesResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.ListNotesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_ListNotesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_ListNotesResponse_fieldAccessorTable
@@ -408,7 +398,6 @@ private void maybeForceBuilderInitialization() {
         getNotesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (notesBuilder_ == null) {
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_ListNotesResponse_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.ListNotesResponse getDefaultInstanceForType() {
       return io.grafeas.v1beta1.ListNotesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.ListNotesResponse build() {
       io.grafeas.v1beta1.ListNotesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public io.grafeas.v1beta1.ListNotesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.ListNotesResponse buildPartial() {
       io.grafeas.v1beta1.ListNotesResponse result = new io.grafeas.v1beta1.ListNotesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -462,39 +447,32 @@ public io.grafeas.v1beta1.ListNotesResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.ListNotesResponse) {
         return mergeFrom((io.grafeas.v1beta1.ListNotesResponse)other);
@@ -541,12 +519,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.ListNotesResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -976,13 +952,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1004,12 +978,11 @@ public static io.grafeas.v1beta1.ListNotesResponse getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListNotesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListNotesResponse(input, extensionRegistry);
+        return new ListNotesResponse(input, extensionRegistry);
     }
   };
 
@@ -1022,7 +995,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.ListNotesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListOccurrencesRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListOccurrencesRequest.java
index 3b331a4b24ff..9231a7f28d89 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListOccurrencesRequest.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListOccurrencesRequest.java
@@ -36,9 +36,6 @@ private ListOccurrencesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private ListOccurrencesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private ListOccurrencesRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private ListOccurrencesRequest(
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_ListOccurrencesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_ListOccurrencesRequest_fieldAccessorTable
@@ -247,7 +243,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -257,7 +252,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -275,7 +269,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -412,7 +405,6 @@ public static io.grafeas.v1beta1.ListOccurrencesRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -420,7 +412,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.ListOccurrencesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -448,7 +439,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_ListOccurrencesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_ListOccurrencesRequest_fieldAccessorTable
@@ -471,7 +461,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -485,18 +474,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_ListOccurrencesRequest_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.ListOccurrencesRequest getDefaultInstanceForType() {
       return io.grafeas.v1beta1.ListOccurrencesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.ListOccurrencesRequest build() {
       io.grafeas.v1beta1.ListOccurrencesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -505,7 +491,6 @@ public io.grafeas.v1beta1.ListOccurrencesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.ListOccurrencesRequest buildPartial() {
       io.grafeas.v1beta1.ListOccurrencesRequest result = new io.grafeas.v1beta1.ListOccurrencesRequest(this);
       result.parent_ = parent_;
@@ -516,39 +501,32 @@ public io.grafeas.v1beta1.ListOccurrencesRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.ListOccurrencesRequest) {
         return mergeFrom((io.grafeas.v1beta1.ListOccurrencesRequest)other);
@@ -580,12 +558,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.ListOccurrencesRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -913,13 +889,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -941,12 +915,11 @@ public static io.grafeas.v1beta1.ListOccurrencesRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListOccurrencesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListOccurrencesRequest(input, extensionRegistry);
+        return new ListOccurrencesRequest(input, extensionRegistry);
     }
   };
 
@@ -959,7 +932,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.ListOccurrencesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListOccurrencesResponse.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListOccurrencesResponse.java
index 820d10d3a3ac..e7eb2e2f4ef1 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListOccurrencesResponse.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/ListOccurrencesResponse.java
@@ -34,9 +34,6 @@ private ListOccurrencesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListOccurrencesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               occurrences_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListOccurrencesResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListOccurrencesResponse(
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_ListOccurrencesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_ListOccurrencesResponse_fieldAccessorTable
@@ -201,7 +197,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -211,7 +206,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < occurrences_.size(); i++) {
@@ -223,7 +217,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static io.grafeas.v1beta1.ListOccurrencesResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.ListOccurrencesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_ListOccurrencesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_ListOccurrencesResponse_fieldAccessorTable
@@ -408,7 +398,6 @@ private void maybeForceBuilderInitialization() {
         getOccurrencesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (occurrencesBuilder_ == null) {
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_ListOccurrencesResponse_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.ListOccurrencesResponse getDefaultInstanceForType() {
       return io.grafeas.v1beta1.ListOccurrencesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.ListOccurrencesResponse build() {
       io.grafeas.v1beta1.ListOccurrencesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public io.grafeas.v1beta1.ListOccurrencesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.ListOccurrencesResponse buildPartial() {
       io.grafeas.v1beta1.ListOccurrencesResponse result = new io.grafeas.v1beta1.ListOccurrencesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -462,39 +447,32 @@ public io.grafeas.v1beta1.ListOccurrencesResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.ListOccurrencesResponse) {
         return mergeFrom((io.grafeas.v1beta1.ListOccurrencesResponse)other);
@@ -541,12 +519,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.ListOccurrencesResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -976,13 +952,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1004,12 +978,11 @@ public static io.grafeas.v1beta1.ListOccurrencesResponse getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListOccurrencesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListOccurrencesResponse(input, extensionRegistry);
+        return new ListOccurrencesResponse(input, extensionRegistry);
     }
   };
 
@@ -1022,7 +995,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.ListOccurrencesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/Note.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/Note.java
index fa3811d95c6b..15cc905064e3 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/Note.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/Note.java
@@ -38,9 +38,6 @@ private Note(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private Note(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -231,13 +235,6 @@ private Note(
             typeCase_ = 16;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -261,7 +258,6 @@ private Note(
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_Note_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_Note_fieldAccessorTable
@@ -468,7 +464,6 @@ public int getKindValue() {
    * .grafeas.v1beta1.NoteKind kind = 4;
    */
   public io.grafeas.v1beta1.common.NoteKind getKind() {
-    @SuppressWarnings("deprecation")
     io.grafeas.v1beta1.common.NoteKind result = io.grafeas.v1beta1.common.NoteKind.valueOf(kind_);
     return result == null ? io.grafeas.v1beta1.common.NoteKind.UNRECOGNIZED : result;
   }
@@ -945,7 +940,6 @@ public io.grafeas.v1beta1.attestation.AuthorityOrBuilder getAttestationAuthority
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -955,7 +949,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -1009,7 +1002,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1303,7 +1295,6 @@ public static io.grafeas.v1beta1.Note parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1311,7 +1302,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.Note prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1339,7 +1329,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_Note_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_Note_fieldAccessorTable
@@ -1363,7 +1352,6 @@ private void maybeForceBuilderInitialization() {
         getRelatedUrlFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -1405,18 +1393,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_Note_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.Note getDefaultInstanceForType() {
       return io.grafeas.v1beta1.Note.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.Note build() {
       io.grafeas.v1beta1.Note result = buildPartial();
       if (!result.isInitialized()) {
@@ -1425,7 +1410,6 @@ public io.grafeas.v1beta1.Note build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.Note buildPartial() {
       io.grafeas.v1beta1.Note result = new io.grafeas.v1beta1.Note(this);
       int from_bitField0_ = bitField0_;
@@ -1518,39 +1502,32 @@ public io.grafeas.v1beta1.Note buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.Note) {
         return mergeFrom((io.grafeas.v1beta1.Note)other);
@@ -1660,12 +1637,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.Note other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2006,7 +1981,6 @@ public Builder setKindValue(int value) {
      * .grafeas.v1beta1.NoteKind kind = 4;
      */
     public io.grafeas.v1beta1.common.NoteKind getKind() {
-      @SuppressWarnings("deprecation")
       io.grafeas.v1beta1.common.NoteKind result = io.grafeas.v1beta1.common.NoteKind.valueOf(kind_);
       return result == null ? io.grafeas.v1beta1.common.NoteKind.UNRECOGNIZED : result;
     }
@@ -4164,13 +4138,11 @@ public io.grafeas.v1beta1.attestation.AuthorityOrBuilder getAttestationAuthority
       onChanged();;
       return attestationAuthorityBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -4192,12 +4164,11 @@ public static io.grafeas.v1beta1.Note getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Note parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Note(input, extensionRegistry);
+        return new Note(input, extensionRegistry);
     }
   };
 
@@ -4210,7 +4181,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.Note getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/Occurrence.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/Occurrence.java
index 3428848cd8cf..4e40afb1d120 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/Occurrence.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/Occurrence.java
@@ -36,9 +36,6 @@ private Occurrence(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private Occurrence(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -211,13 +215,6 @@ private Occurrence(
             detailsCase_ = 14;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -235,7 +232,6 @@ private Occurrence(
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_Occurrence_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_Occurrence_fieldAccessorTable
@@ -436,7 +432,6 @@ public int getKindValue() {
    * .grafeas.v1beta1.NoteKind kind = 4;
    */
   public io.grafeas.v1beta1.common.NoteKind getKind() {
-    @SuppressWarnings("deprecation")
     io.grafeas.v1beta1.common.NoteKind result = io.grafeas.v1beta1.common.NoteKind.valueOf(kind_);
     return result == null ? io.grafeas.v1beta1.common.NoteKind.UNRECOGNIZED : result;
   }
@@ -819,7 +814,6 @@ public io.grafeas.v1beta1.attestation.DetailsOrBuilder getAttestationOrBuilder()
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -829,7 +823,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -877,7 +870,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1147,7 +1139,6 @@ public static io.grafeas.v1beta1.Occurrence parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1155,7 +1146,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.Occurrence prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1183,7 +1173,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_Occurrence_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_Occurrence_fieldAccessorTable
@@ -1206,7 +1195,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -1240,18 +1228,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_Occurrence_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.Occurrence getDefaultInstanceForType() {
       return io.grafeas.v1beta1.Occurrence.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.Occurrence build() {
       io.grafeas.v1beta1.Occurrence result = buildPartial();
       if (!result.isInitialized()) {
@@ -1260,7 +1245,6 @@ public io.grafeas.v1beta1.Occurrence build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.Occurrence buildPartial() {
       io.grafeas.v1beta1.Occurrence result = new io.grafeas.v1beta1.Occurrence(this);
       result.name_ = name_;
@@ -1336,39 +1320,32 @@ public io.grafeas.v1beta1.Occurrence buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.Occurrence) {
         return mergeFrom((io.grafeas.v1beta1.Occurrence)other);
@@ -1442,12 +1419,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.Occurrence other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1861,7 +1836,6 @@ public Builder setKindValue(int value) {
      * .grafeas.v1beta1.NoteKind kind = 4;
      */
     public io.grafeas.v1beta1.common.NoteKind getKind() {
-      @SuppressWarnings("deprecation")
       io.grafeas.v1beta1.common.NoteKind result = io.grafeas.v1beta1.common.NoteKind.valueOf(kind_);
       return result == null ? io.grafeas.v1beta1.common.NoteKind.UNRECOGNIZED : result;
     }
@@ -3504,13 +3478,11 @@ public io.grafeas.v1beta1.attestation.DetailsOrBuilder getAttestationOrBuilder()
       onChanged();;
       return attestationBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -3532,12 +3504,11 @@ public static io.grafeas.v1beta1.Occurrence getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Occurrence parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Occurrence(input, extensionRegistry);
+        return new Occurrence(input, extensionRegistry);
     }
   };
 
@@ -3550,7 +3521,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.Occurrence getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/Resource.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/Resource.java
index 1d7de6da4938..3f1c77c76b93 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/Resource.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/Resource.java
@@ -34,9 +34,6 @@ private Resource(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private Resource(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private Resource(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private Resource(
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_Resource_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_Resource_fieldAccessorTable
@@ -227,7 +223,6 @@ public io.grafeas.v1beta1.provenance.HashOrBuilder getContentHashOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -237,7 +232,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -252,7 +246,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -387,7 +380,6 @@ public static io.grafeas.v1beta1.Resource parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -395,7 +387,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.Resource prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -423,7 +414,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_Resource_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_Resource_fieldAccessorTable
@@ -446,7 +436,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -462,18 +451,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_Resource_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.Resource getDefaultInstanceForType() {
       return io.grafeas.v1beta1.Resource.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.Resource build() {
       io.grafeas.v1beta1.Resource result = buildPartial();
       if (!result.isInitialized()) {
@@ -482,7 +468,6 @@ public io.grafeas.v1beta1.Resource build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.Resource buildPartial() {
       io.grafeas.v1beta1.Resource result = new io.grafeas.v1beta1.Resource(this);
       result.name_ = name_;
@@ -496,39 +481,32 @@ public io.grafeas.v1beta1.Resource buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.Resource) {
         return mergeFrom((io.grafeas.v1beta1.Resource)other);
@@ -556,12 +534,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.Resource other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -920,13 +896,11 @@ public io.grafeas.v1beta1.provenance.HashOrBuilder getContentHashOrBuilder() {
       }
       return contentHashBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -948,12 +922,11 @@ public static io.grafeas.v1beta1.Resource getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Resource parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Resource(input, extensionRegistry);
+        return new Resource(input, extensionRegistry);
     }
   };
 
@@ -966,7 +939,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.Resource getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/UpdateNoteRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/UpdateNoteRequest.java
index dc77557a3918..43c38b451bb0 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/UpdateNoteRequest.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/UpdateNoteRequest.java
@@ -33,9 +33,6 @@ private UpdateNoteRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private UpdateNoteRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -79,13 +83,6 @@ private UpdateNoteRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private UpdateNoteRequest(
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_UpdateNoteRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_UpdateNoteRequest_fieldAccessorTable
@@ -222,7 +218,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -232,7 +227,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -247,7 +241,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -388,7 +381,6 @@ public static io.grafeas.v1beta1.UpdateNoteRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -396,7 +388,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.UpdateNoteRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -424,7 +415,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_UpdateNoteRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_UpdateNoteRequest_fieldAccessorTable
@@ -447,7 +437,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -467,18 +456,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_UpdateNoteRequest_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.UpdateNoteRequest getDefaultInstanceForType() {
       return io.grafeas.v1beta1.UpdateNoteRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.UpdateNoteRequest build() {
       io.grafeas.v1beta1.UpdateNoteRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -487,7 +473,6 @@ public io.grafeas.v1beta1.UpdateNoteRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.UpdateNoteRequest buildPartial() {
       io.grafeas.v1beta1.UpdateNoteRequest result = new io.grafeas.v1beta1.UpdateNoteRequest(this);
       result.name_ = name_;
@@ -505,39 +490,32 @@ public io.grafeas.v1beta1.UpdateNoteRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.UpdateNoteRequest) {
         return mergeFrom((io.grafeas.v1beta1.UpdateNoteRequest)other);
@@ -564,12 +542,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.UpdateNoteRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -987,13 +963,11 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
       }
       return updateMaskBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1015,12 +989,11 @@ public static io.grafeas.v1beta1.UpdateNoteRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateNoteRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateNoteRequest(input, extensionRegistry);
+        return new UpdateNoteRequest(input, extensionRegistry);
     }
   };
 
@@ -1033,7 +1006,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.UpdateNoteRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/UpdateOccurrenceRequest.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/UpdateOccurrenceRequest.java
index 0b91f772e65d..1bba4d9d2df7 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/UpdateOccurrenceRequest.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/UpdateOccurrenceRequest.java
@@ -33,9 +33,6 @@ private UpdateOccurrenceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private UpdateOccurrenceRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -79,13 +83,6 @@ private UpdateOccurrenceRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private UpdateOccurrenceRequest(
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_UpdateOccurrenceRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_UpdateOccurrenceRequest_fieldAccessorTable
@@ -222,7 +218,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -232,7 +227,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -247,7 +241,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -388,7 +381,6 @@ public static io.grafeas.v1beta1.UpdateOccurrenceRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -396,7 +388,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.UpdateOccurrenceRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -424,7 +415,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_UpdateOccurrenceRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_UpdateOccurrenceRequest_fieldAccessorTable
@@ -447,7 +437,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -467,18 +456,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_UpdateOccurrenceRequest_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.UpdateOccurrenceRequest getDefaultInstanceForType() {
       return io.grafeas.v1beta1.UpdateOccurrenceRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.UpdateOccurrenceRequest build() {
       io.grafeas.v1beta1.UpdateOccurrenceRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -487,7 +473,6 @@ public io.grafeas.v1beta1.UpdateOccurrenceRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.UpdateOccurrenceRequest buildPartial() {
       io.grafeas.v1beta1.UpdateOccurrenceRequest result = new io.grafeas.v1beta1.UpdateOccurrenceRequest(this);
       result.name_ = name_;
@@ -505,39 +490,32 @@ public io.grafeas.v1beta1.UpdateOccurrenceRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.UpdateOccurrenceRequest) {
         return mergeFrom((io.grafeas.v1beta1.UpdateOccurrenceRequest)other);
@@ -564,12 +542,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.UpdateOccurrenceRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -987,13 +963,11 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
       }
       return updateMaskBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1015,12 +989,11 @@ public static io.grafeas.v1beta1.UpdateOccurrenceRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateOccurrenceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateOccurrenceRequest(input, extensionRegistry);
+        return new UpdateOccurrenceRequest(input, extensionRegistry);
     }
   };
 
@@ -1033,7 +1006,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.UpdateOccurrenceRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/VulnerabilityOccurrencesSummary.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/VulnerabilityOccurrencesSummary.java
index 152c1adec330..c45d50b27504 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/VulnerabilityOccurrencesSummary.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/VulnerabilityOccurrencesSummary.java
@@ -34,9 +34,6 @@ private VulnerabilityOccurrencesSummary(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private VulnerabilityOccurrencesSummary(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               counts_ = new java.util.ArrayList();
@@ -57,13 +61,6 @@ private VulnerabilityOccurrencesSummary(
                 input.readMessage(io.grafeas.v1beta1.VulnerabilityOccurrencesSummary.FixableTotalByDigest.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private VulnerabilityOccurrencesSummary(
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_VulnerabilityOccurrencesSummary_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_VulnerabilityOccurrencesSummary_fieldAccessorTable
@@ -190,9 +186,6 @@ private FixableTotalByDigest(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -204,6 +197,13 @@ private FixableTotalByDigest(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               io.grafeas.v1beta1.Resource.Builder subBuilder = null;
               if (resource_ != null) {
@@ -233,13 +233,6 @@ private FixableTotalByDigest(
               totalCount_ = input.readInt64();
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -257,7 +250,6 @@ private FixableTotalByDigest(
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_VulnerabilityOccurrencesSummary_FixableTotalByDigest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_VulnerabilityOccurrencesSummary_FixableTotalByDigest_fieldAccessorTable
@@ -320,7 +312,6 @@ public int getSeverityValue() {
      * .grafeas.v1beta1.vulnerability.Severity severity = 2;
      */
     public io.grafeas.v1beta1.vulnerability.Severity getSeverity() {
-      @SuppressWarnings("deprecation")
       io.grafeas.v1beta1.vulnerability.Severity result = io.grafeas.v1beta1.vulnerability.Severity.valueOf(severity_);
       return result == null ? io.grafeas.v1beta1.vulnerability.Severity.UNRECOGNIZED : result;
     }
@@ -352,7 +343,6 @@ public long getTotalCount() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -362,7 +352,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (resource_ != null) {
@@ -380,7 +369,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -526,7 +514,6 @@ public static io.grafeas.v1beta1.VulnerabilityOccurrencesSummary.FixableTotalByD
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -534,7 +521,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(io.grafeas.v1beta1.VulnerabilityOccurrencesSummary.FixableTotalByDigest prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -562,7 +548,6 @@ public static final class Builder extends
         return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_VulnerabilityOccurrencesSummary_FixableTotalByDigest_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_VulnerabilityOccurrencesSummary_FixableTotalByDigest_fieldAccessorTable
@@ -585,7 +570,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         if (resourceBuilder_ == null) {
@@ -603,18 +587,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_VulnerabilityOccurrencesSummary_FixableTotalByDigest_descriptor;
       }
 
-      @java.lang.Override
       public io.grafeas.v1beta1.VulnerabilityOccurrencesSummary.FixableTotalByDigest getDefaultInstanceForType() {
         return io.grafeas.v1beta1.VulnerabilityOccurrencesSummary.FixableTotalByDigest.getDefaultInstance();
       }
 
-      @java.lang.Override
       public io.grafeas.v1beta1.VulnerabilityOccurrencesSummary.FixableTotalByDigest build() {
         io.grafeas.v1beta1.VulnerabilityOccurrencesSummary.FixableTotalByDigest result = buildPartial();
         if (!result.isInitialized()) {
@@ -623,7 +604,6 @@ public io.grafeas.v1beta1.VulnerabilityOccurrencesSummary.FixableTotalByDigest b
         return result;
       }
 
-      @java.lang.Override
       public io.grafeas.v1beta1.VulnerabilityOccurrencesSummary.FixableTotalByDigest buildPartial() {
         io.grafeas.v1beta1.VulnerabilityOccurrencesSummary.FixableTotalByDigest result = new io.grafeas.v1beta1.VulnerabilityOccurrencesSummary.FixableTotalByDigest(this);
         if (resourceBuilder_ == null) {
@@ -638,39 +618,32 @@ public io.grafeas.v1beta1.VulnerabilityOccurrencesSummary.FixableTotalByDigest b
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof io.grafeas.v1beta1.VulnerabilityOccurrencesSummary.FixableTotalByDigest) {
           return mergeFrom((io.grafeas.v1beta1.VulnerabilityOccurrencesSummary.FixableTotalByDigest)other);
@@ -699,12 +672,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.VulnerabilityOccurrencesSummary.Fixa
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -910,7 +881,6 @@ public Builder setSeverityValue(int value) {
        * .grafeas.v1beta1.vulnerability.Severity severity = 2;
        */
       public io.grafeas.v1beta1.vulnerability.Severity getSeverity() {
-        @SuppressWarnings("deprecation")
         io.grafeas.v1beta1.vulnerability.Severity result = io.grafeas.v1beta1.vulnerability.Severity.valueOf(severity_);
         return result == null ? io.grafeas.v1beta1.vulnerability.Severity.UNRECOGNIZED : result;
       }
@@ -1021,13 +991,11 @@ public Builder clearTotalCount() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1049,12 +1017,11 @@ public static io.grafeas.v1beta1.VulnerabilityOccurrencesSummary.FixableTotalByD
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public FixableTotalByDigest parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new FixableTotalByDigest(input, extensionRegistry);
+          return new FixableTotalByDigest(input, extensionRegistry);
       }
     };
 
@@ -1067,7 +1034,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.VulnerabilityOccurrencesSummary.FixableTotalByDigest getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1130,7 +1096,6 @@ public io.grafeas.v1beta1.VulnerabilityOccurrencesSummary.FixableTotalByDigestOr
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1140,7 +1105,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < counts_.size(); i++) {
@@ -1149,7 +1113,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1267,7 +1230,6 @@ public static io.grafeas.v1beta1.VulnerabilityOccurrencesSummary parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1275,7 +1237,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.VulnerabilityOccurrencesSummary prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1304,7 +1265,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_VulnerabilityOccurrencesSummary_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_VulnerabilityOccurrencesSummary_fieldAccessorTable
@@ -1328,7 +1288,6 @@ private void maybeForceBuilderInitialization() {
         getCountsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (countsBuilder_ == null) {
@@ -1340,18 +1299,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.Grafeas.internal_static_grafeas_v1beta1_VulnerabilityOccurrencesSummary_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.VulnerabilityOccurrencesSummary getDefaultInstanceForType() {
       return io.grafeas.v1beta1.VulnerabilityOccurrencesSummary.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.VulnerabilityOccurrencesSummary build() {
       io.grafeas.v1beta1.VulnerabilityOccurrencesSummary result = buildPartial();
       if (!result.isInitialized()) {
@@ -1360,7 +1316,6 @@ public io.grafeas.v1beta1.VulnerabilityOccurrencesSummary build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.VulnerabilityOccurrencesSummary buildPartial() {
       io.grafeas.v1beta1.VulnerabilityOccurrencesSummary result = new io.grafeas.v1beta1.VulnerabilityOccurrencesSummary(this);
       int from_bitField0_ = bitField0_;
@@ -1377,39 +1332,32 @@ public io.grafeas.v1beta1.VulnerabilityOccurrencesSummary buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.VulnerabilityOccurrencesSummary) {
         return mergeFrom((io.grafeas.v1beta1.VulnerabilityOccurrencesSummary)other);
@@ -1452,12 +1400,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.VulnerabilityOccurrencesSummary othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1788,13 +1734,11 @@ public io.grafeas.v1beta1.VulnerabilityOccurrencesSummary.FixableTotalByDigest.B
       }
       return countsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1816,12 +1760,11 @@ public static io.grafeas.v1beta1.VulnerabilityOccurrencesSummary getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public VulnerabilityOccurrencesSummary parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VulnerabilityOccurrencesSummary(input, extensionRegistry);
+        return new VulnerabilityOccurrencesSummary(input, extensionRegistry);
     }
   };
 
@@ -1834,7 +1777,6 @@ public com.google.protobuf.Parser getParserForT
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.VulnerabilityOccurrencesSummary getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/Attestation.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/Attestation.java
index 985eefc6b55d..0bb8eded5bc1 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/Attestation.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/Attestation.java
@@ -39,9 +39,6 @@ private Attestation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private Attestation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             io.grafeas.v1beta1.attestation.PgpSignedAttestation.Builder subBuilder = null;
             if (signatureCase_ == 1) {
@@ -67,13 +71,6 @@ private Attestation(
             signatureCase_ = 1;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private Attestation(
     return io.grafeas.v1beta1.attestation.AttestationOuterClass.internal_static_grafeas_v1beta1_attestation_Attestation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.attestation.AttestationOuterClass.internal_static_grafeas_v1beta1_attestation_Attestation_fieldAccessorTable
@@ -174,7 +170,6 @@ public io.grafeas.v1beta1.attestation.PgpSignedAttestationOrBuilder getPgpSigned
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -184,7 +179,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (signatureCase_ == 1) {
@@ -193,7 +187,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -324,7 +317,6 @@ public static io.grafeas.v1beta1.attestation.Attestation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -332,7 +324,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.attestation.Attestation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -367,7 +358,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.attestation.AttestationOuterClass.internal_static_grafeas_v1beta1_attestation_Attestation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.attestation.AttestationOuterClass.internal_static_grafeas_v1beta1_attestation_Attestation_fieldAccessorTable
@@ -390,7 +380,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       signatureCase_ = 0;
@@ -398,18 +387,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.attestation.AttestationOuterClass.internal_static_grafeas_v1beta1_attestation_Attestation_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.attestation.Attestation getDefaultInstanceForType() {
       return io.grafeas.v1beta1.attestation.Attestation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.attestation.Attestation build() {
       io.grafeas.v1beta1.attestation.Attestation result = buildPartial();
       if (!result.isInitialized()) {
@@ -418,7 +404,6 @@ public io.grafeas.v1beta1.attestation.Attestation build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.attestation.Attestation buildPartial() {
       io.grafeas.v1beta1.attestation.Attestation result = new io.grafeas.v1beta1.attestation.Attestation(this);
       if (signatureCase_ == 1) {
@@ -433,39 +418,32 @@ public io.grafeas.v1beta1.attestation.Attestation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.attestation.Attestation) {
         return mergeFrom((io.grafeas.v1beta1.attestation.Attestation)other);
@@ -491,12 +469,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.attestation.Attestation other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -701,13 +677,11 @@ public io.grafeas.v1beta1.attestation.PgpSignedAttestationOrBuilder getPgpSigned
       onChanged();;
       return pgpSignedAttestationBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -729,12 +703,11 @@ public static io.grafeas.v1beta1.attestation.Attestation getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Attestation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Attestation(input, extensionRegistry);
+        return new Attestation(input, extensionRegistry);
     }
   };
 
@@ -747,7 +720,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.attestation.Attestation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/AttestationOuterClass.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/AttestationOuterClass.java
index 6ab6597f079a..292ed52976e3 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/AttestationOuterClass.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/AttestationOuterClass.java
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "ey_id\030\002 \001(\tH\000\"D\n\013ContentType\022\034\n\030CONTENT_" +
       "TYPE_UNSPECIFIED\020\000\022\027\n\023SIMPLE_SIGNING_JSO" +
       "N\020\001B\010\n\006key_id\"k\n\tAuthority\0229\n\004hint\030\001 \001(\013" +
-      "2+.grafeas.v1beta1.attestation.Authority" +
+      "2+.grafeas.v1beta1.attestation.Authority",
       ".Hint\032#\n\004Hint\022\033\n\023human_readable_name\030\001 \001" +
       "(\t\"H\n\007Details\022=\n\013attestation\030\001 \001(\0132(.gra" +
       "feas.v1beta1.attestation.Attestation\"o\n\013" +
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/Authority.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/Authority.java
index 04dfe9603f28..e9f74a9e06f2 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/Authority.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/Authority.java
@@ -39,9 +39,6 @@ private Authority(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private Authority(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             io.grafeas.v1beta1.attestation.Authority.Hint.Builder subBuilder = null;
             if (hint_ != null) {
@@ -66,13 +70,6 @@ private Authority(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private Authority(
     return io.grafeas.v1beta1.attestation.AttestationOuterClass.internal_static_grafeas_v1beta1_attestation_Authority_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.attestation.AttestationOuterClass.internal_static_grafeas_v1beta1_attestation_Authority_fieldAccessorTable
@@ -156,9 +152,6 @@ private Hint(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -170,12 +163,6 @@ private Hint(
             case 0:
               done = true;
               break;
-            case 10: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              humanReadableName_ = s;
-              break;
-            }
             default: {
               if (!parseUnknownFieldProto3(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -183,6 +170,12 @@ private Hint(
               }
               break;
             }
+            case 10: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              humanReadableName_ = s;
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -200,7 +193,6 @@ private Hint(
       return io.grafeas.v1beta1.attestation.AttestationOuterClass.internal_static_grafeas_v1beta1_attestation_Authority_Hint_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.attestation.AttestationOuterClass.internal_static_grafeas_v1beta1_attestation_Authority_Hint_fieldAccessorTable
@@ -251,7 +243,6 @@ public java.lang.String getHumanReadableName() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -261,7 +252,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getHumanReadableNameBytes().isEmpty()) {
@@ -270,7 +260,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -385,7 +374,6 @@ public static io.grafeas.v1beta1.attestation.Authority.Hint parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -393,7 +381,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(io.grafeas.v1beta1.attestation.Authority.Hint prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -427,7 +414,6 @@ public static final class Builder extends
         return io.grafeas.v1beta1.attestation.AttestationOuterClass.internal_static_grafeas_v1beta1_attestation_Authority_Hint_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return io.grafeas.v1beta1.attestation.AttestationOuterClass.internal_static_grafeas_v1beta1_attestation_Authority_Hint_fieldAccessorTable
@@ -450,7 +436,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         humanReadableName_ = "";
@@ -458,18 +443,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return io.grafeas.v1beta1.attestation.AttestationOuterClass.internal_static_grafeas_v1beta1_attestation_Authority_Hint_descriptor;
       }
 
-      @java.lang.Override
       public io.grafeas.v1beta1.attestation.Authority.Hint getDefaultInstanceForType() {
         return io.grafeas.v1beta1.attestation.Authority.Hint.getDefaultInstance();
       }
 
-      @java.lang.Override
       public io.grafeas.v1beta1.attestation.Authority.Hint build() {
         io.grafeas.v1beta1.attestation.Authority.Hint result = buildPartial();
         if (!result.isInitialized()) {
@@ -478,7 +460,6 @@ public io.grafeas.v1beta1.attestation.Authority.Hint build() {
         return result;
       }
 
-      @java.lang.Override
       public io.grafeas.v1beta1.attestation.Authority.Hint buildPartial() {
         io.grafeas.v1beta1.attestation.Authority.Hint result = new io.grafeas.v1beta1.attestation.Authority.Hint(this);
         result.humanReadableName_ = humanReadableName_;
@@ -486,39 +467,32 @@ public io.grafeas.v1beta1.attestation.Authority.Hint buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof io.grafeas.v1beta1.attestation.Authority.Hint) {
           return mergeFrom((io.grafeas.v1beta1.attestation.Authority.Hint)other);
@@ -539,12 +513,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.attestation.Authority.Hint other) {
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -651,13 +623,11 @@ public Builder setHumanReadableNameBytes(
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -679,12 +649,11 @@ public static io.grafeas.v1beta1.attestation.Authority.Hint getDefaultInstance()
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Hint parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Hint(input, extensionRegistry);
+          return new Hint(input, extensionRegistry);
       }
     };
 
@@ -697,7 +666,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.attestation.Authority.Hint getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -738,7 +706,6 @@ public io.grafeas.v1beta1.attestation.Authority.HintOrBuilder getHintOrBuilder()
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -748,7 +715,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (hint_ != null) {
@@ -757,7 +723,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -878,7 +843,6 @@ public static io.grafeas.v1beta1.attestation.Authority parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -886,7 +850,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.attestation.Authority prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -921,7 +884,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.attestation.AttestationOuterClass.internal_static_grafeas_v1beta1_attestation_Authority_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.attestation.AttestationOuterClass.internal_static_grafeas_v1beta1_attestation_Authority_fieldAccessorTable
@@ -944,7 +906,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (hintBuilder_ == null) {
@@ -956,18 +917,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.attestation.AttestationOuterClass.internal_static_grafeas_v1beta1_attestation_Authority_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.attestation.Authority getDefaultInstanceForType() {
       return io.grafeas.v1beta1.attestation.Authority.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.attestation.Authority build() {
       io.grafeas.v1beta1.attestation.Authority result = buildPartial();
       if (!result.isInitialized()) {
@@ -976,7 +934,6 @@ public io.grafeas.v1beta1.attestation.Authority build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.attestation.Authority buildPartial() {
       io.grafeas.v1beta1.attestation.Authority result = new io.grafeas.v1beta1.attestation.Authority(this);
       if (hintBuilder_ == null) {
@@ -988,39 +945,32 @@ public io.grafeas.v1beta1.attestation.Authority buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.attestation.Authority) {
         return mergeFrom((io.grafeas.v1beta1.attestation.Authority)other);
@@ -1040,12 +990,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.attestation.Authority other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1216,13 +1164,11 @@ public io.grafeas.v1beta1.attestation.Authority.HintOrBuilder getHintOrBuilder()
       }
       return hintBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1244,12 +1190,11 @@ public static io.grafeas.v1beta1.attestation.Authority getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Authority parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Authority(input, extensionRegistry);
+        return new Authority(input, extensionRegistry);
     }
   };
 
@@ -1262,7 +1207,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.attestation.Authority getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/Details.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/Details.java
index 0238b2c3b342..184b90ea7740 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/Details.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/Details.java
@@ -32,9 +32,6 @@ private Details(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private Details(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             io.grafeas.v1beta1.attestation.Attestation.Builder subBuilder = null;
             if (attestation_ != null) {
@@ -59,13 +63,6 @@ private Details(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private Details(
     return io.grafeas.v1beta1.attestation.AttestationOuterClass.internal_static_grafeas_v1beta1_attestation_Details_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.attestation.AttestationOuterClass.internal_static_grafeas_v1beta1_attestation_Details_fieldAccessorTable
@@ -125,7 +121,6 @@ public io.grafeas.v1beta1.attestation.AttestationOrBuilder getAttestationOrBuild
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -135,7 +130,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (attestation_ != null) {
@@ -144,7 +138,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static io.grafeas.v1beta1.attestation.Details parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.attestation.Details prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.attestation.AttestationOuterClass.internal_static_grafeas_v1beta1_attestation_Details_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.attestation.AttestationOuterClass.internal_static_grafeas_v1beta1_attestation_Details_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (attestationBuilder_ == null) {
@@ -336,18 +325,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.attestation.AttestationOuterClass.internal_static_grafeas_v1beta1_attestation_Details_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.attestation.Details getDefaultInstanceForType() {
       return io.grafeas.v1beta1.attestation.Details.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.attestation.Details build() {
       io.grafeas.v1beta1.attestation.Details result = buildPartial();
       if (!result.isInitialized()) {
@@ -356,7 +342,6 @@ public io.grafeas.v1beta1.attestation.Details build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.attestation.Details buildPartial() {
       io.grafeas.v1beta1.attestation.Details result = new io.grafeas.v1beta1.attestation.Details(this);
       if (attestationBuilder_ == null) {
@@ -368,39 +353,32 @@ public io.grafeas.v1beta1.attestation.Details buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.attestation.Details) {
         return mergeFrom((io.grafeas.v1beta1.attestation.Details)other);
@@ -420,12 +398,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.attestation.Details other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -596,13 +572,11 @@ public io.grafeas.v1beta1.attestation.AttestationOrBuilder getAttestationOrBuild
       }
       return attestationBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -624,12 +598,11 @@ public static io.grafeas.v1beta1.attestation.Details getDefaultInstance() {
 
   private static final com.google.protobuf.Parser

       PARSER = new com.google.protobuf.AbstractParser
() {
-    @java.lang.Override
     public Details parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Details(input, extensionRegistry);
+        return new Details(input, extensionRegistry);
     }
   };
 
@@ -642,7 +615,6 @@ public com.google.protobuf.Parser
 getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.attestation.Details getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/PgpSignedAttestation.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/PgpSignedAttestation.java
index 3d4add572f7d..0608237c3a91 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/PgpSignedAttestation.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/attestation/PgpSignedAttestation.java
@@ -36,9 +36,6 @@ private PgpSignedAttestation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private PgpSignedAttestation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -68,13 +72,6 @@ private PgpSignedAttestation(
             contentType_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -92,7 +89,6 @@ private PgpSignedAttestation(
     return io.grafeas.v1beta1.attestation.AttestationOuterClass.internal_static_grafeas_v1beta1_attestation_PgpSignedAttestation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.attestation.AttestationOuterClass.internal_static_grafeas_v1beta1_attestation_PgpSignedAttestation_fieldAccessorTable
@@ -344,7 +340,6 @@ public int getContentTypeValue() {
    * .grafeas.v1beta1.attestation.PgpSignedAttestation.ContentType content_type = 3;
    */
   public io.grafeas.v1beta1.attestation.PgpSignedAttestation.ContentType getContentType() {
-    @SuppressWarnings("deprecation")
     io.grafeas.v1beta1.attestation.PgpSignedAttestation.ContentType result = io.grafeas.v1beta1.attestation.PgpSignedAttestation.ContentType.valueOf(contentType_);
     return result == null ? io.grafeas.v1beta1.attestation.PgpSignedAttestation.ContentType.UNRECOGNIZED : result;
   }
@@ -431,7 +426,6 @@ public java.lang.String getPgpKeyId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -441,7 +435,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getSignatureBytes().isEmpty()) {
@@ -456,7 +449,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -600,7 +592,6 @@ public static io.grafeas.v1beta1.attestation.PgpSignedAttestation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -608,7 +599,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.attestation.PgpSignedAttestation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -638,7 +628,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.attestation.AttestationOuterClass.internal_static_grafeas_v1beta1_attestation_PgpSignedAttestation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.attestation.AttestationOuterClass.internal_static_grafeas_v1beta1_attestation_PgpSignedAttestation_fieldAccessorTable
@@ -661,7 +650,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       signature_ = "";
@@ -673,18 +661,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.attestation.AttestationOuterClass.internal_static_grafeas_v1beta1_attestation_PgpSignedAttestation_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.attestation.PgpSignedAttestation getDefaultInstanceForType() {
       return io.grafeas.v1beta1.attestation.PgpSignedAttestation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.attestation.PgpSignedAttestation build() {
       io.grafeas.v1beta1.attestation.PgpSignedAttestation result = buildPartial();
       if (!result.isInitialized()) {
@@ -693,7 +678,6 @@ public io.grafeas.v1beta1.attestation.PgpSignedAttestation build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.attestation.PgpSignedAttestation buildPartial() {
       io.grafeas.v1beta1.attestation.PgpSignedAttestation result = new io.grafeas.v1beta1.attestation.PgpSignedAttestation(this);
       result.signature_ = signature_;
@@ -706,39 +690,32 @@ public io.grafeas.v1beta1.attestation.PgpSignedAttestation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.attestation.PgpSignedAttestation) {
         return mergeFrom((io.grafeas.v1beta1.attestation.PgpSignedAttestation)other);
@@ -773,12 +750,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.attestation.PgpSignedAttestation oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -981,7 +956,6 @@ public Builder setContentTypeValue(int value) {
      * .grafeas.v1beta1.attestation.PgpSignedAttestation.ContentType content_type = 3;
      */
     public io.grafeas.v1beta1.attestation.PgpSignedAttestation.ContentType getContentType() {
-      @SuppressWarnings("deprecation")
       io.grafeas.v1beta1.attestation.PgpSignedAttestation.ContentType result = io.grafeas.v1beta1.attestation.PgpSignedAttestation.ContentType.valueOf(contentType_);
       return result == null ? io.grafeas.v1beta1.attestation.PgpSignedAttestation.ContentType.UNRECOGNIZED : result;
     }
@@ -1195,13 +1169,11 @@ public Builder setPgpKeyIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1223,12 +1195,11 @@ public static io.grafeas.v1beta1.attestation.PgpSignedAttestation getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PgpSignedAttestation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PgpSignedAttestation(input, extensionRegistry);
+        return new PgpSignedAttestation(input, extensionRegistry);
     }
   };
 
@@ -1241,7 +1212,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.attestation.PgpSignedAttestation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/Build.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/Build.java
index 9dceaba269a0..0804c6c433a1 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/Build.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/Build.java
@@ -34,9 +34,6 @@ private Build(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private Build(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -67,13 +71,6 @@ private Build(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private Build(
     return io.grafeas.v1beta1.build.BuildOuterClass.internal_static_grafeas_v1beta1_build_Build_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.build.BuildOuterClass.internal_static_grafeas_v1beta1_build_Build_fieldAccessorTable
@@ -178,7 +174,6 @@ public io.grafeas.v1beta1.build.BuildSignatureOrBuilder getSignatureOrBuilder()
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -188,7 +183,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getBuilderVersionBytes().isEmpty()) {
@@ -200,7 +194,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -328,7 +321,6 @@ public static io.grafeas.v1beta1.build.Build parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -336,7 +328,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.build.Build prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -365,7 +356,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.build.BuildOuterClass.internal_static_grafeas_v1beta1_build_Build_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.build.BuildOuterClass.internal_static_grafeas_v1beta1_build_Build_fieldAccessorTable
@@ -388,7 +378,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       builderVersion_ = "";
@@ -402,18 +391,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.build.BuildOuterClass.internal_static_grafeas_v1beta1_build_Build_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.build.Build getDefaultInstanceForType() {
       return io.grafeas.v1beta1.build.Build.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.build.Build build() {
       io.grafeas.v1beta1.build.Build result = buildPartial();
       if (!result.isInitialized()) {
@@ -422,7 +408,6 @@ public io.grafeas.v1beta1.build.Build build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.build.Build buildPartial() {
       io.grafeas.v1beta1.build.Build result = new io.grafeas.v1beta1.build.Build(this);
       result.builderVersion_ = builderVersion_;
@@ -435,39 +420,32 @@ public io.grafeas.v1beta1.build.Build buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.build.Build) {
         return mergeFrom((io.grafeas.v1beta1.build.Build)other);
@@ -491,12 +469,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.build.Build other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -765,13 +741,11 @@ public io.grafeas.v1beta1.build.BuildSignatureOrBuilder getSignatureOrBuilder()
       }
       return signatureBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -793,12 +767,11 @@ public static io.grafeas.v1beta1.build.Build getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Build parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Build(input, extensionRegistry);
+        return new Build(input, extensionRegistry);
     }
   };
 
@@ -811,7 +784,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.build.Build getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/BuildOuterClass.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/BuildOuterClass.java
index 146095ef2eb2..ab4bf5ad934d 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/BuildOuterClass.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/BuildOuterClass.java
@@ -47,7 +47,7 @@ public static void registerAllExtensions(
       "gnature\"\322\001\n\016BuildSignature\022\022\n\npublic_key" +
       "\030\001 \001(\t\022\021\n\tsignature\030\002 \001(\014\022\016\n\006key_id\030\003 \001(" +
       "\t\022?\n\010key_type\030\004 \001(\0162-.grafeas.v1beta1.bu" +
-      "ild.BuildSignature.KeyType\"H\n\007KeyType\022\030\n" +
+      "ild.BuildSignature.KeyType\"H\n\007KeyType\022\030\n",
       "\024KEY_TYPE_UNSPECIFIED\020\000\022\025\n\021PGP_ASCII_ARM" +
       "ORED\020\001\022\014\n\010PKIX_PEM\020\002\"d\n\007Details\022?\n\nprove" +
       "nance\030\001 \001(\0132+.grafeas.v1beta1.provenance" +
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/BuildSignature.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/BuildSignature.java
index 42320f5e69d5..b61d62a98bc0 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/BuildSignature.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/BuildSignature.java
@@ -36,9 +36,6 @@ private BuildSignature(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private BuildSignature(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private BuildSignature(
             keyType_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private BuildSignature(
     return io.grafeas.v1beta1.build.BuildOuterClass.internal_static_grafeas_v1beta1_build_BuildSignature_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.build.BuildOuterClass.internal_static_grafeas_v1beta1_build_BuildSignature_fieldAccessorTable
@@ -386,13 +382,11 @@ public int getKeyTypeValue() {
    * .grafeas.v1beta1.build.BuildSignature.KeyType key_type = 4;
    */
   public io.grafeas.v1beta1.build.BuildSignature.KeyType getKeyType() {
-    @SuppressWarnings("deprecation")
     io.grafeas.v1beta1.build.BuildSignature.KeyType result = io.grafeas.v1beta1.build.BuildSignature.KeyType.valueOf(keyType_);
     return result == null ? io.grafeas.v1beta1.build.BuildSignature.KeyType.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -402,7 +396,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getPublicKeyBytes().isEmpty()) {
@@ -420,7 +413,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -557,7 +549,6 @@ public static io.grafeas.v1beta1.build.BuildSignature parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -565,7 +556,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.build.BuildSignature prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -593,7 +583,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.build.BuildOuterClass.internal_static_grafeas_v1beta1_build_BuildSignature_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.build.BuildOuterClass.internal_static_grafeas_v1beta1_build_BuildSignature_fieldAccessorTable
@@ -616,7 +605,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       publicKey_ = "";
@@ -630,18 +618,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.build.BuildOuterClass.internal_static_grafeas_v1beta1_build_BuildSignature_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.build.BuildSignature getDefaultInstanceForType() {
       return io.grafeas.v1beta1.build.BuildSignature.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.build.BuildSignature build() {
       io.grafeas.v1beta1.build.BuildSignature result = buildPartial();
       if (!result.isInitialized()) {
@@ -650,7 +635,6 @@ public io.grafeas.v1beta1.build.BuildSignature build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.build.BuildSignature buildPartial() {
       io.grafeas.v1beta1.build.BuildSignature result = new io.grafeas.v1beta1.build.BuildSignature(this);
       result.publicKey_ = publicKey_;
@@ -661,39 +645,32 @@ public io.grafeas.v1beta1.build.BuildSignature buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.build.BuildSignature) {
         return mergeFrom((io.grafeas.v1beta1.build.BuildSignature)other);
@@ -724,12 +701,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.build.BuildSignature other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1069,7 +1044,6 @@ public Builder setKeyTypeValue(int value) {
      * .grafeas.v1beta1.build.BuildSignature.KeyType key_type = 4;
      */
     public io.grafeas.v1beta1.build.BuildSignature.KeyType getKeyType() {
-      @SuppressWarnings("deprecation")
       io.grafeas.v1beta1.build.BuildSignature.KeyType result = io.grafeas.v1beta1.build.BuildSignature.KeyType.valueOf(keyType_);
       return result == null ? io.grafeas.v1beta1.build.BuildSignature.KeyType.UNRECOGNIZED : result;
     }
@@ -1104,13 +1078,11 @@ public Builder clearKeyType() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1132,12 +1104,11 @@ public static io.grafeas.v1beta1.build.BuildSignature getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BuildSignature parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BuildSignature(input, extensionRegistry);
+        return new BuildSignature(input, extensionRegistry);
     }
   };
 
@@ -1150,7 +1121,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.build.BuildSignature getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/Details.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/Details.java
index a84ef132010d..b7febbe54bf7 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/Details.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/build/Details.java
@@ -33,9 +33,6 @@ private Details(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private Details(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             io.grafeas.v1beta1.provenance.BuildProvenance.Builder subBuilder = null;
             if (provenance_ != null) {
@@ -66,13 +70,6 @@ private Details(
             provenanceBytes_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private Details(
     return io.grafeas.v1beta1.build.BuildOuterClass.internal_static_grafeas_v1beta1_build_Details_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.build.BuildOuterClass.internal_static_grafeas_v1beta1_build_Details_fieldAccessorTable
@@ -192,7 +188,6 @@ public java.lang.String getProvenanceBytes() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -202,7 +197,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (provenance_ != null) {
@@ -214,7 +208,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -342,7 +335,6 @@ public static io.grafeas.v1beta1.build.Details parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -350,7 +342,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.build.Details prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -378,7 +369,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.build.BuildOuterClass.internal_static_grafeas_v1beta1_build_Details_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.build.BuildOuterClass.internal_static_grafeas_v1beta1_build_Details_fieldAccessorTable
@@ -401,7 +391,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (provenanceBuilder_ == null) {
@@ -415,18 +404,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.build.BuildOuterClass.internal_static_grafeas_v1beta1_build_Details_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.build.Details getDefaultInstanceForType() {
       return io.grafeas.v1beta1.build.Details.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.build.Details build() {
       io.grafeas.v1beta1.build.Details result = buildPartial();
       if (!result.isInitialized()) {
@@ -435,7 +421,6 @@ public io.grafeas.v1beta1.build.Details build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.build.Details buildPartial() {
       io.grafeas.v1beta1.build.Details result = new io.grafeas.v1beta1.build.Details(this);
       if (provenanceBuilder_ == null) {
@@ -448,39 +433,32 @@ public io.grafeas.v1beta1.build.Details buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.build.Details) {
         return mergeFrom((io.grafeas.v1beta1.build.Details)other);
@@ -504,12 +482,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.build.Details other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -814,13 +790,11 @@ public Builder setProvenanceBytesBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -842,12 +816,11 @@ public static io.grafeas.v1beta1.build.Details getDefaultInstance() {
 
   private static final com.google.protobuf.Parser

       PARSER = new com.google.protobuf.AbstractParser
() {
-    @java.lang.Override
     public Details parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Details(input, extensionRegistry);
+        return new Details(input, extensionRegistry);
     }
   };
 
@@ -860,7 +833,6 @@ public com.google.protobuf.Parser
 getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.build.Details getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/common/RelatedUrl.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/common/RelatedUrl.java
index 16133571d457..357ccf4ab2e4 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/common/RelatedUrl.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/common/RelatedUrl.java
@@ -34,9 +34,6 @@ private RelatedUrl(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private RelatedUrl(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private RelatedUrl(
             label_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private RelatedUrl(
     return io.grafeas.v1beta1.common.Common.internal_static_grafeas_v1beta1_RelatedUrl_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.common.Common.internal_static_grafeas_v1beta1_RelatedUrl_fieldAccessorTable
@@ -177,7 +173,6 @@ public java.lang.String getLabel() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -187,7 +182,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getUrlBytes().isEmpty()) {
@@ -199,7 +193,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -321,7 +314,6 @@ public static io.grafeas.v1beta1.common.RelatedUrl parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -329,7 +321,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.common.RelatedUrl prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -357,7 +348,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.common.Common.internal_static_grafeas_v1beta1_RelatedUrl_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.common.Common.internal_static_grafeas_v1beta1_RelatedUrl_fieldAccessorTable
@@ -380,7 +370,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       url_ = "";
@@ -390,18 +379,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.common.Common.internal_static_grafeas_v1beta1_RelatedUrl_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.common.RelatedUrl getDefaultInstanceForType() {
       return io.grafeas.v1beta1.common.RelatedUrl.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.common.RelatedUrl build() {
       io.grafeas.v1beta1.common.RelatedUrl result = buildPartial();
       if (!result.isInitialized()) {
@@ -410,7 +396,6 @@ public io.grafeas.v1beta1.common.RelatedUrl build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.common.RelatedUrl buildPartial() {
       io.grafeas.v1beta1.common.RelatedUrl result = new io.grafeas.v1beta1.common.RelatedUrl(this);
       result.url_ = url_;
@@ -419,39 +404,32 @@ public io.grafeas.v1beta1.common.RelatedUrl buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.common.RelatedUrl) {
         return mergeFrom((io.grafeas.v1beta1.common.RelatedUrl)other);
@@ -476,12 +454,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.common.RelatedUrl other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -677,13 +653,11 @@ public Builder setLabelBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -705,12 +679,11 @@ public static io.grafeas.v1beta1.common.RelatedUrl getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RelatedUrl parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RelatedUrl(input, extensionRegistry);
+        return new RelatedUrl(input, extensionRegistry);
     }
   };
 
@@ -723,7 +696,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.common.RelatedUrl getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/Deployable.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/Deployable.java
index 84fe0163ea9a..426658abcc46 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/Deployable.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/Deployable.java
@@ -33,9 +33,6 @@ private Deployable(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private Deployable(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -56,13 +60,6 @@ private Deployable(
             resourceUri_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private Deployable(
     return io.grafeas.v1beta1.deployment.DeploymentOuterClass.internal_static_grafeas_v1beta1_deployment_Deployable_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.deployment.DeploymentOuterClass.internal_static_grafeas_v1beta1_deployment_Deployable_fieldAccessorTable
@@ -137,7 +133,6 @@ public java.lang.String getResourceUri(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -147,7 +142,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < resourceUri_.size(); i++) {
@@ -156,7 +150,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -278,7 +271,6 @@ public static io.grafeas.v1beta1.deployment.Deployable parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -286,7 +278,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.deployment.Deployable prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -314,7 +305,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.deployment.DeploymentOuterClass.internal_static_grafeas_v1beta1_deployment_Deployable_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.deployment.DeploymentOuterClass.internal_static_grafeas_v1beta1_deployment_Deployable_fieldAccessorTable
@@ -337,7 +327,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       resourceUri_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -345,18 +334,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.deployment.DeploymentOuterClass.internal_static_grafeas_v1beta1_deployment_Deployable_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.deployment.Deployable getDefaultInstanceForType() {
       return io.grafeas.v1beta1.deployment.Deployable.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.deployment.Deployable build() {
       io.grafeas.v1beta1.deployment.Deployable result = buildPartial();
       if (!result.isInitialized()) {
@@ -365,7 +351,6 @@ public io.grafeas.v1beta1.deployment.Deployable build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.deployment.Deployable buildPartial() {
       io.grafeas.v1beta1.deployment.Deployable result = new io.grafeas.v1beta1.deployment.Deployable(this);
       int from_bitField0_ = bitField0_;
@@ -378,39 +363,32 @@ public io.grafeas.v1beta1.deployment.Deployable buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.deployment.Deployable) {
         return mergeFrom((io.grafeas.v1beta1.deployment.Deployable)other);
@@ -437,12 +415,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.deployment.Deployable other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -591,13 +567,11 @@ public Builder addResourceUriBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -619,12 +593,11 @@ public static io.grafeas.v1beta1.deployment.Deployable getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Deployable parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Deployable(input, extensionRegistry);
+        return new Deployable(input, extensionRegistry);
     }
   };
 
@@ -637,7 +610,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.deployment.Deployable getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/Deployment.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/Deployment.java
index f8372c739a24..d52918baaf23 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/Deployment.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/Deployment.java
@@ -37,9 +37,6 @@ private Deployment(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private Deployment(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -110,13 +114,6 @@ private Deployment(
             platform_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -137,7 +134,6 @@ private Deployment(
     return io.grafeas.v1beta1.deployment.DeploymentOuterClass.internal_static_grafeas_v1beta1_deployment_Deployment_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.deployment.DeploymentOuterClass.internal_static_grafeas_v1beta1_deployment_Deployment_fieldAccessorTable
@@ -559,13 +555,11 @@ public int getPlatformValue() {
    * .grafeas.v1beta1.deployment.Deployment.Platform platform = 7;
    */
   public io.grafeas.v1beta1.deployment.Deployment.Platform getPlatform() {
-    @SuppressWarnings("deprecation")
     io.grafeas.v1beta1.deployment.Deployment.Platform result = io.grafeas.v1beta1.deployment.Deployment.Platform.valueOf(platform_);
     return result == null ? io.grafeas.v1beta1.deployment.Deployment.Platform.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -575,7 +569,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getUserEmailBytes().isEmpty()) {
@@ -602,7 +595,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -778,7 +770,6 @@ public static io.grafeas.v1beta1.deployment.Deployment parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -786,7 +777,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.deployment.Deployment prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -814,7 +804,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.deployment.DeploymentOuterClass.internal_static_grafeas_v1beta1_deployment_Deployment_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.deployment.DeploymentOuterClass.internal_static_grafeas_v1beta1_deployment_Deployment_fieldAccessorTable
@@ -837,7 +826,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       userEmail_ = "";
@@ -865,18 +853,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.deployment.DeploymentOuterClass.internal_static_grafeas_v1beta1_deployment_Deployment_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.deployment.Deployment getDefaultInstanceForType() {
       return io.grafeas.v1beta1.deployment.Deployment.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.deployment.Deployment build() {
       io.grafeas.v1beta1.deployment.Deployment result = buildPartial();
       if (!result.isInitialized()) {
@@ -885,7 +870,6 @@ public io.grafeas.v1beta1.deployment.Deployment build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.deployment.Deployment buildPartial() {
       io.grafeas.v1beta1.deployment.Deployment result = new io.grafeas.v1beta1.deployment.Deployment(this);
       int from_bitField0_ = bitField0_;
@@ -914,39 +898,32 @@ public io.grafeas.v1beta1.deployment.Deployment buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.deployment.Deployment) {
         return mergeFrom((io.grafeas.v1beta1.deployment.Deployment)other);
@@ -994,12 +971,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.deployment.Deployment other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1762,7 +1737,6 @@ public Builder setPlatformValue(int value) {
      * .grafeas.v1beta1.deployment.Deployment.Platform platform = 7;
      */
     public io.grafeas.v1beta1.deployment.Deployment.Platform getPlatform() {
-      @SuppressWarnings("deprecation")
       io.grafeas.v1beta1.deployment.Deployment.Platform result = io.grafeas.v1beta1.deployment.Deployment.Platform.valueOf(platform_);
       return result == null ? io.grafeas.v1beta1.deployment.Deployment.Platform.UNRECOGNIZED : result;
     }
@@ -1795,13 +1769,11 @@ public Builder clearPlatform() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1823,12 +1795,11 @@ public static io.grafeas.v1beta1.deployment.Deployment getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Deployment parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Deployment(input, extensionRegistry);
+        return new Deployment(input, extensionRegistry);
     }
   };
 
@@ -1841,7 +1812,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.deployment.Deployment getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/DeploymentOuterClass.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/DeploymentOuterClass.java
index f764e2732bda..9c529ddaed06 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/DeploymentOuterClass.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/DeploymentOuterClass.java
@@ -47,7 +47,7 @@ public static void registerAllExtensions(
       "\303\002\n\nDeployment\022\022\n\nuser_email\030\001 \001(\t\022/\n\013de" +
       "ploy_time\030\002 \001(\0132\032.google.protobuf.Timest" +
       "amp\0221\n\rundeploy_time\030\003 \001(\0132\032.google.prot" +
-      "obuf.Timestamp\022\016\n\006config\030\004 \001(\t\022\017\n\007addres" +
+      "obuf.Timestamp\022\016\n\006config\030\004 \001(\t\022\017\n\007addres",
       "s\030\005 \001(\t\022\024\n\014resource_uri\030\006 \003(\t\022A\n\010platfor" +
       "m\030\007 \001(\0162/.grafeas.v1beta1.deployment.Dep" +
       "loyment.Platform\"C\n\010Platform\022\030\n\024PLATFORM" +
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/Details.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/Details.java
index b3aa81941d9d..61498052a368 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/Details.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/deployment/Details.java
@@ -32,9 +32,6 @@ private Details(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private Details(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             io.grafeas.v1beta1.deployment.Deployment.Builder subBuilder = null;
             if (deployment_ != null) {
@@ -59,13 +63,6 @@ private Details(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private Details(
     return io.grafeas.v1beta1.deployment.DeploymentOuterClass.internal_static_grafeas_v1beta1_deployment_Details_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.deployment.DeploymentOuterClass.internal_static_grafeas_v1beta1_deployment_Details_fieldAccessorTable
@@ -125,7 +121,6 @@ public io.grafeas.v1beta1.deployment.DeploymentOrBuilder getDeploymentOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -135,7 +130,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (deployment_ != null) {
@@ -144,7 +138,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static io.grafeas.v1beta1.deployment.Details parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.deployment.Details prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.deployment.DeploymentOuterClass.internal_static_grafeas_v1beta1_deployment_Details_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.deployment.DeploymentOuterClass.internal_static_grafeas_v1beta1_deployment_Details_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (deploymentBuilder_ == null) {
@@ -336,18 +325,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.deployment.DeploymentOuterClass.internal_static_grafeas_v1beta1_deployment_Details_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.deployment.Details getDefaultInstanceForType() {
       return io.grafeas.v1beta1.deployment.Details.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.deployment.Details build() {
       io.grafeas.v1beta1.deployment.Details result = buildPartial();
       if (!result.isInitialized()) {
@@ -356,7 +342,6 @@ public io.grafeas.v1beta1.deployment.Details build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.deployment.Details buildPartial() {
       io.grafeas.v1beta1.deployment.Details result = new io.grafeas.v1beta1.deployment.Details(this);
       if (deploymentBuilder_ == null) {
@@ -368,39 +353,32 @@ public io.grafeas.v1beta1.deployment.Details buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.deployment.Details) {
         return mergeFrom((io.grafeas.v1beta1.deployment.Details)other);
@@ -420,12 +398,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.deployment.Details other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -596,13 +572,11 @@ public io.grafeas.v1beta1.deployment.DeploymentOrBuilder getDeploymentOrBuilder(
       }
       return deploymentBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -624,12 +598,11 @@ public static io.grafeas.v1beta1.deployment.Details getDefaultInstance() {
 
   private static final com.google.protobuf.Parser

       PARSER = new com.google.protobuf.AbstractParser
() {
-    @java.lang.Override
     public Details parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Details(input, extensionRegistry);
+        return new Details(input, extensionRegistry);
     }
   };
 
@@ -642,7 +615,6 @@ public com.google.protobuf.Parser
 getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.deployment.Details getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/Details.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/Details.java
index 5ba18f01ac50..ecd27bb0d120 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/Details.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/Details.java
@@ -32,9 +32,6 @@ private Details(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private Details(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             io.grafeas.v1beta1.discovery.Discovered.Builder subBuilder = null;
             if (discovered_ != null) {
@@ -59,13 +63,6 @@ private Details(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private Details(
     return io.grafeas.v1beta1.discovery.DiscoveryOuterClass.internal_static_grafeas_v1beta1_discovery_Details_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.discovery.DiscoveryOuterClass.internal_static_grafeas_v1beta1_discovery_Details_fieldAccessorTable
@@ -125,7 +121,6 @@ public io.grafeas.v1beta1.discovery.DiscoveredOrBuilder getDiscoveredOrBuilder()
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -135,7 +130,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (discovered_ != null) {
@@ -144,7 +138,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static io.grafeas.v1beta1.discovery.Details parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.discovery.Details prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.discovery.DiscoveryOuterClass.internal_static_grafeas_v1beta1_discovery_Details_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.discovery.DiscoveryOuterClass.internal_static_grafeas_v1beta1_discovery_Details_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (discoveredBuilder_ == null) {
@@ -336,18 +325,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.discovery.DiscoveryOuterClass.internal_static_grafeas_v1beta1_discovery_Details_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.discovery.Details getDefaultInstanceForType() {
       return io.grafeas.v1beta1.discovery.Details.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.discovery.Details build() {
       io.grafeas.v1beta1.discovery.Details result = buildPartial();
       if (!result.isInitialized()) {
@@ -356,7 +342,6 @@ public io.grafeas.v1beta1.discovery.Details build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.discovery.Details buildPartial() {
       io.grafeas.v1beta1.discovery.Details result = new io.grafeas.v1beta1.discovery.Details(this);
       if (discoveredBuilder_ == null) {
@@ -368,39 +353,32 @@ public io.grafeas.v1beta1.discovery.Details buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.discovery.Details) {
         return mergeFrom((io.grafeas.v1beta1.discovery.Details)other);
@@ -420,12 +398,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.discovery.Details other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -596,13 +572,11 @@ public io.grafeas.v1beta1.discovery.DiscoveredOrBuilder getDiscoveredOrBuilder()
       }
       return discoveredBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -624,12 +598,11 @@ public static io.grafeas.v1beta1.discovery.Details getDefaultInstance() {
 
   private static final com.google.protobuf.Parser

       PARSER = new com.google.protobuf.AbstractParser
() {
-    @java.lang.Override
     public Details parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Details(input, extensionRegistry);
+        return new Details(input, extensionRegistry);
     }
   };
 
@@ -642,7 +615,6 @@ public com.google.protobuf.Parser
 getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.discovery.Details getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/Discovered.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/Discovered.java
index f0f208598831..d030f444a2b9 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/Discovered.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/Discovered.java
@@ -34,9 +34,6 @@ private Discovered(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private Discovered(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -86,13 +90,6 @@ private Discovered(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -110,7 +107,6 @@ private Discovered(
     return io.grafeas.v1beta1.discovery.DiscoveryOuterClass.internal_static_grafeas_v1beta1_discovery_Discovered_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.discovery.DiscoveryOuterClass.internal_static_grafeas_v1beta1_discovery_Discovered_fieldAccessorTable
@@ -462,7 +458,6 @@ public int getContinuousAnalysisValue() {
    * .grafeas.v1beta1.discovery.Discovered.ContinuousAnalysis continuous_analysis = 1;
    */
   public io.grafeas.v1beta1.discovery.Discovered.ContinuousAnalysis getContinuousAnalysis() {
-    @SuppressWarnings("deprecation")
     io.grafeas.v1beta1.discovery.Discovered.ContinuousAnalysis result = io.grafeas.v1beta1.discovery.Discovered.ContinuousAnalysis.valueOf(continuousAnalysis_);
     return result == null ? io.grafeas.v1beta1.discovery.Discovered.ContinuousAnalysis.UNRECOGNIZED : result;
   }
@@ -520,7 +515,6 @@ public int getAnalysisStatusValue() {
    * .grafeas.v1beta1.discovery.Discovered.AnalysisStatus analysis_status = 3;
    */
   public io.grafeas.v1beta1.discovery.Discovered.AnalysisStatus getAnalysisStatus() {
-    @SuppressWarnings("deprecation")
     io.grafeas.v1beta1.discovery.Discovered.AnalysisStatus result = io.grafeas.v1beta1.discovery.Discovered.AnalysisStatus.valueOf(analysisStatus_);
     return result == null ? io.grafeas.v1beta1.discovery.Discovered.AnalysisStatus.UNRECOGNIZED : result;
   }
@@ -565,7 +559,6 @@ public com.google.rpc.StatusOrBuilder getAnalysisStatusErrorOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -575,7 +568,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (continuousAnalysis_ != io.grafeas.v1beta1.discovery.Discovered.ContinuousAnalysis.CONTINUOUS_ANALYSIS_UNSPECIFIED.getNumber()) {
@@ -593,7 +585,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -741,7 +732,6 @@ public static io.grafeas.v1beta1.discovery.Discovered parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -749,7 +739,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.discovery.Discovered prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -777,7 +766,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.discovery.DiscoveryOuterClass.internal_static_grafeas_v1beta1_discovery_Discovered_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.discovery.DiscoveryOuterClass.internal_static_grafeas_v1beta1_discovery_Discovered_fieldAccessorTable
@@ -800,7 +788,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       continuousAnalysis_ = 0;
@@ -822,18 +809,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.discovery.DiscoveryOuterClass.internal_static_grafeas_v1beta1_discovery_Discovered_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.discovery.Discovered getDefaultInstanceForType() {
       return io.grafeas.v1beta1.discovery.Discovered.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.discovery.Discovered build() {
       io.grafeas.v1beta1.discovery.Discovered result = buildPartial();
       if (!result.isInitialized()) {
@@ -842,7 +826,6 @@ public io.grafeas.v1beta1.discovery.Discovered build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.discovery.Discovered buildPartial() {
       io.grafeas.v1beta1.discovery.Discovered result = new io.grafeas.v1beta1.discovery.Discovered(this);
       result.continuousAnalysis_ = continuousAnalysis_;
@@ -861,39 +844,32 @@ public io.grafeas.v1beta1.discovery.Discovered buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.discovery.Discovered) {
         return mergeFrom((io.grafeas.v1beta1.discovery.Discovered)other);
@@ -922,12 +898,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.discovery.Discovered other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -977,7 +951,6 @@ public Builder setContinuousAnalysisValue(int value) {
      * .grafeas.v1beta1.discovery.Discovered.ContinuousAnalysis continuous_analysis = 1;
      */
     public io.grafeas.v1beta1.discovery.Discovered.ContinuousAnalysis getContinuousAnalysis() {
-      @SuppressWarnings("deprecation")
       io.grafeas.v1beta1.discovery.Discovered.ContinuousAnalysis result = io.grafeas.v1beta1.discovery.Discovered.ContinuousAnalysis.valueOf(continuousAnalysis_);
       return result == null ? io.grafeas.v1beta1.discovery.Discovered.ContinuousAnalysis.UNRECOGNIZED : result;
     }
@@ -1195,7 +1168,6 @@ public Builder setAnalysisStatusValue(int value) {
      * .grafeas.v1beta1.discovery.Discovered.AnalysisStatus analysis_status = 3;
      */
     public io.grafeas.v1beta1.discovery.Discovered.AnalysisStatus getAnalysisStatus() {
-      @SuppressWarnings("deprecation")
       io.grafeas.v1beta1.discovery.Discovered.AnalysisStatus result = io.grafeas.v1beta1.discovery.Discovered.AnalysisStatus.valueOf(analysisStatus_);
       return result == null ? io.grafeas.v1beta1.discovery.Discovered.AnalysisStatus.UNRECOGNIZED : result;
     }
@@ -1399,13 +1371,11 @@ public com.google.rpc.StatusOrBuilder getAnalysisStatusErrorOrBuilder() {
       }
       return analysisStatusErrorBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1427,12 +1397,11 @@ public static io.grafeas.v1beta1.discovery.Discovered getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Discovered parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Discovered(input, extensionRegistry);
+        return new Discovered(input, extensionRegistry);
     }
   };
 
@@ -1445,7 +1414,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.discovery.Discovered getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/Discovery.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/Discovery.java
index bddb7dfbfe57..84932b281409 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/Discovery.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/Discovery.java
@@ -35,9 +35,6 @@ private Discovery(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,12 +46,6 @@ private Discovery(
           case 0:
             done = true;
             break;
-          case 8: {
-            int rawValue = input.readEnum();
-
-            analysisKind_ = rawValue;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -62,6 +53,12 @@ private Discovery(
             }
             break;
           }
+          case 8: {
+            int rawValue = input.readEnum();
+
+            analysisKind_ = rawValue;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -79,7 +76,6 @@ private Discovery(
     return io.grafeas.v1beta1.discovery.DiscoveryOuterClass.internal_static_grafeas_v1beta1_discovery_Discovery_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.discovery.DiscoveryOuterClass.internal_static_grafeas_v1beta1_discovery_Discovery_fieldAccessorTable
@@ -107,13 +103,11 @@ public int getAnalysisKindValue() {
    * .grafeas.v1beta1.NoteKind analysis_kind = 1;
    */
   public io.grafeas.v1beta1.common.NoteKind getAnalysisKind() {
-    @SuppressWarnings("deprecation")
     io.grafeas.v1beta1.common.NoteKind result = io.grafeas.v1beta1.common.NoteKind.valueOf(analysisKind_);
     return result == null ? io.grafeas.v1beta1.common.NoteKind.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -123,7 +117,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (analysisKind_ != io.grafeas.v1beta1.common.NoteKind.NOTE_KIND_UNSPECIFIED.getNumber()) {
@@ -132,7 +125,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -247,7 +239,6 @@ public static io.grafeas.v1beta1.discovery.Discovery parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -255,7 +246,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.discovery.Discovery prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -285,7 +275,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.discovery.DiscoveryOuterClass.internal_static_grafeas_v1beta1_discovery_Discovery_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.discovery.DiscoveryOuterClass.internal_static_grafeas_v1beta1_discovery_Discovery_fieldAccessorTable
@@ -308,7 +297,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       analysisKind_ = 0;
@@ -316,18 +304,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.discovery.DiscoveryOuterClass.internal_static_grafeas_v1beta1_discovery_Discovery_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.discovery.Discovery getDefaultInstanceForType() {
       return io.grafeas.v1beta1.discovery.Discovery.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.discovery.Discovery build() {
       io.grafeas.v1beta1.discovery.Discovery result = buildPartial();
       if (!result.isInitialized()) {
@@ -336,7 +321,6 @@ public io.grafeas.v1beta1.discovery.Discovery build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.discovery.Discovery buildPartial() {
       io.grafeas.v1beta1.discovery.Discovery result = new io.grafeas.v1beta1.discovery.Discovery(this);
       result.analysisKind_ = analysisKind_;
@@ -344,39 +328,32 @@ public io.grafeas.v1beta1.discovery.Discovery buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.discovery.Discovery) {
         return mergeFrom((io.grafeas.v1beta1.discovery.Discovery)other);
@@ -396,12 +373,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.discovery.Discovery other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -451,7 +426,6 @@ public Builder setAnalysisKindValue(int value) {
      * .grafeas.v1beta1.NoteKind analysis_kind = 1;
      */
     public io.grafeas.v1beta1.common.NoteKind getAnalysisKind() {
-      @SuppressWarnings("deprecation")
       io.grafeas.v1beta1.common.NoteKind result = io.grafeas.v1beta1.common.NoteKind.valueOf(analysisKind_);
       return result == null ? io.grafeas.v1beta1.common.NoteKind.UNRECOGNIZED : result;
     }
@@ -484,13 +458,11 @@ public Builder clearAnalysisKind() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -512,12 +484,11 @@ public static io.grafeas.v1beta1.discovery.Discovery getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Discovery parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Discovery(input, extensionRegistry);
+        return new Discovery(input, extensionRegistry);
     }
   };
 
@@ -530,7 +501,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.discovery.Discovery getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/DiscoveryOuterClass.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/DiscoveryOuterClass.java
index 44162fbcea21..408d6ca204ae 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/DiscoveryOuterClass.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/discovery/DiscoveryOuterClass.java
@@ -47,7 +47,7 @@ public static void registerAllExtensions(
       "is_kind\030\001 \001(\0162\031.grafeas.v1beta1.NoteKind" +
       "\"D\n\007Details\0229\n\ndiscovered\030\001 \001(\0132%.grafea" +
       "s.v1beta1.discovery.Discovered\"\206\004\n\nDisco" +
-      "vered\022U\n\023continuous_analysis\030\001 \001(\01628.gra" +
+      "vered\022U\n\023continuous_analysis\030\001 \001(\01628.gra",
       "feas.v1beta1.discovery.Discovered.Contin" +
       "uousAnalysis\0226\n\022last_analysis_time\030\002 \001(\013" +
       "2\032.google.protobuf.Timestamp\022M\n\017analysis" +
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "\n\022ContinuousAnalysis\022#\n\037CONTINUOUS_ANALY" +
       "SIS_UNSPECIFIED\020\000\022\n\n\006ACTIVE\020\001\022\014\n\010INACTIV" +
       "E\020\002\"\221\001\n\016AnalysisStatus\022\037\n\033ANALYSIS_STATU" +
-      "S_UNSPECIFIED\020\000\022\013\n\007PENDING\020\001\022\014\n\010SCANNING" +
+      "S_UNSPECIFIED\020\000\022\013\n\007PENDING\020\001\022\014\n\010SCANNING",
       "\020\002\022\024\n\020FINISHED_SUCCESS\020\003\022\023\n\017FINISHED_FAI" +
       "LED\020\004\022\030\n\024FINISHED_UNSUPPORTED\020\005B\204\001\n\034io.g" +
       "rafeas.v1beta1.discoveryP\001Z\\google.golan" +
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Basis.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Basis.java
index 8db569cd14f9..bf81a7b2536a 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Basis.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Basis.java
@@ -37,9 +37,6 @@ private Basis(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private Basis(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -70,13 +74,6 @@ private Basis(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -94,7 +91,6 @@ private Basis(
     return io.grafeas.v1beta1.image.Image.internal_static_grafeas_v1beta1_image_Basis_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.image.Image.internal_static_grafeas_v1beta1_image_Basis_fieldAccessorTable
@@ -180,7 +176,6 @@ public io.grafeas.v1beta1.image.FingerprintOrBuilder getFingerprintOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -190,7 +185,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getResourceUrlBytes().isEmpty()) {
@@ -202,7 +196,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -330,7 +323,6 @@ public static io.grafeas.v1beta1.image.Basis parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -338,7 +330,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.image.Basis prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -370,7 +361,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.image.Image.internal_static_grafeas_v1beta1_image_Basis_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.image.Image.internal_static_grafeas_v1beta1_image_Basis_fieldAccessorTable
@@ -393,7 +383,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       resourceUrl_ = "";
@@ -407,18 +396,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.image.Image.internal_static_grafeas_v1beta1_image_Basis_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.image.Basis getDefaultInstanceForType() {
       return io.grafeas.v1beta1.image.Basis.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.image.Basis build() {
       io.grafeas.v1beta1.image.Basis result = buildPartial();
       if (!result.isInitialized()) {
@@ -427,7 +413,6 @@ public io.grafeas.v1beta1.image.Basis build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.image.Basis buildPartial() {
       io.grafeas.v1beta1.image.Basis result = new io.grafeas.v1beta1.image.Basis(this);
       result.resourceUrl_ = resourceUrl_;
@@ -440,39 +425,32 @@ public io.grafeas.v1beta1.image.Basis buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.image.Basis) {
         return mergeFrom((io.grafeas.v1beta1.image.Basis)other);
@@ -496,12 +474,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.image.Basis other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -766,13 +742,11 @@ public io.grafeas.v1beta1.image.FingerprintOrBuilder getFingerprintOrBuilder() {
       }
       return fingerprintBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -794,12 +768,11 @@ public static io.grafeas.v1beta1.image.Basis getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Basis parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Basis(input, extensionRegistry);
+        return new Basis(input, extensionRegistry);
     }
   };
 
@@ -812,7 +785,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.image.Basis getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Derived.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Derived.java
index f21fe5d0432d..722e92c4ad35 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Derived.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Derived.java
@@ -37,9 +37,6 @@ private Derived(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private Derived(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             io.grafeas.v1beta1.image.Fingerprint.Builder subBuilder = null;
             if (fingerprint_ != null) {
@@ -84,13 +88,6 @@ private Derived(
             baseResourceUrl_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -111,7 +108,6 @@ private Derived(
     return io.grafeas.v1beta1.image.Image.internal_static_grafeas_v1beta1_image_Derived_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.image.Image.internal_static_grafeas_v1beta1_image_Derived_fieldAccessorTable
@@ -277,7 +273,6 @@ public java.lang.String getBaseResourceUrl() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -287,7 +282,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (fingerprint_ != null) {
@@ -305,7 +299,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -451,7 +444,6 @@ public static io.grafeas.v1beta1.image.Derived parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -459,7 +451,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.image.Derived prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -489,7 +480,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.image.Image.internal_static_grafeas_v1beta1_image_Derived_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.image.Image.internal_static_grafeas_v1beta1_image_Derived_fieldAccessorTable
@@ -513,7 +503,6 @@ private void maybeForceBuilderInitialization() {
         getLayerInfoFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (fingerprintBuilder_ == null) {
@@ -535,18 +524,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.image.Image.internal_static_grafeas_v1beta1_image_Derived_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.image.Derived getDefaultInstanceForType() {
       return io.grafeas.v1beta1.image.Derived.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.image.Derived build() {
       io.grafeas.v1beta1.image.Derived result = buildPartial();
       if (!result.isInitialized()) {
@@ -555,7 +541,6 @@ public io.grafeas.v1beta1.image.Derived build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.image.Derived buildPartial() {
       io.grafeas.v1beta1.image.Derived result = new io.grafeas.v1beta1.image.Derived(this);
       int from_bitField0_ = bitField0_;
@@ -581,39 +566,32 @@ public io.grafeas.v1beta1.image.Derived buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.image.Derived) {
         return mergeFrom((io.grafeas.v1beta1.image.Derived)other);
@@ -666,12 +644,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.image.Derived other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1326,13 +1302,11 @@ public Builder setBaseResourceUrlBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1354,12 +1328,11 @@ public static io.grafeas.v1beta1.image.Derived getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Derived parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Derived(input, extensionRegistry);
+        return new Derived(input, extensionRegistry);
     }
   };
 
@@ -1372,7 +1345,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.image.Derived getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Details.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Details.java
index 57a8a7455417..4e93fde3274c 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Details.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Details.java
@@ -32,9 +32,6 @@ private Details(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private Details(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             io.grafeas.v1beta1.image.Derived.Builder subBuilder = null;
             if (derivedImage_ != null) {
@@ -59,13 +63,6 @@ private Details(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private Details(
     return io.grafeas.v1beta1.image.Image.internal_static_grafeas_v1beta1_image_Details_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.image.Image.internal_static_grafeas_v1beta1_image_Details_fieldAccessorTable
@@ -125,7 +121,6 @@ public io.grafeas.v1beta1.image.DerivedOrBuilder getDerivedImageOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -135,7 +130,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (derivedImage_ != null) {
@@ -144,7 +138,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static io.grafeas.v1beta1.image.Details parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.image.Details prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.image.Image.internal_static_grafeas_v1beta1_image_Details_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.image.Image.internal_static_grafeas_v1beta1_image_Details_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (derivedImageBuilder_ == null) {
@@ -336,18 +325,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.image.Image.internal_static_grafeas_v1beta1_image_Details_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.image.Details getDefaultInstanceForType() {
       return io.grafeas.v1beta1.image.Details.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.image.Details build() {
       io.grafeas.v1beta1.image.Details result = buildPartial();
       if (!result.isInitialized()) {
@@ -356,7 +342,6 @@ public io.grafeas.v1beta1.image.Details build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.image.Details buildPartial() {
       io.grafeas.v1beta1.image.Details result = new io.grafeas.v1beta1.image.Details(this);
       if (derivedImageBuilder_ == null) {
@@ -368,39 +353,32 @@ public io.grafeas.v1beta1.image.Details buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.image.Details) {
         return mergeFrom((io.grafeas.v1beta1.image.Details)other);
@@ -420,12 +398,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.image.Details other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -596,13 +572,11 @@ public io.grafeas.v1beta1.image.DerivedOrBuilder getDerivedImageOrBuilder() {
       }
       return derivedImageBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -624,12 +598,11 @@ public static io.grafeas.v1beta1.image.Details getDefaultInstance() {
 
   private static final com.google.protobuf.Parser

       PARSER = new com.google.protobuf.AbstractParser
() {
-    @java.lang.Override
     public Details parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Details(input, extensionRegistry);
+        return new Details(input, extensionRegistry);
     }
   };
 
@@ -642,7 +615,6 @@ public com.google.protobuf.Parser
 getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.image.Details getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Fingerprint.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Fingerprint.java
index c2f96123cdfd..f3bcc04c8861 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Fingerprint.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Fingerprint.java
@@ -35,9 +35,6 @@ private Fingerprint(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private Fingerprint(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -70,13 +74,6 @@ private Fingerprint(
             v2Name_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private Fingerprint(
     return io.grafeas.v1beta1.image.Image.internal_static_grafeas_v1beta1_image_Fingerprint_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.image.Image.internal_static_grafeas_v1beta1_image_Fingerprint_fieldAccessorTable
@@ -242,7 +238,6 @@ public java.lang.String getV2Name() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -252,7 +247,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getV1NameBytes().isEmpty()) {
@@ -267,7 +261,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -403,7 +396,6 @@ public static io.grafeas.v1beta1.image.Fingerprint parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -411,7 +403,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.image.Fingerprint prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -439,7 +430,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.image.Image.internal_static_grafeas_v1beta1_image_Fingerprint_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.image.Image.internal_static_grafeas_v1beta1_image_Fingerprint_fieldAccessorTable
@@ -462,7 +452,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       v1Name_ = "";
@@ -474,18 +463,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.image.Image.internal_static_grafeas_v1beta1_image_Fingerprint_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.image.Fingerprint getDefaultInstanceForType() {
       return io.grafeas.v1beta1.image.Fingerprint.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.image.Fingerprint build() {
       io.grafeas.v1beta1.image.Fingerprint result = buildPartial();
       if (!result.isInitialized()) {
@@ -494,7 +480,6 @@ public io.grafeas.v1beta1.image.Fingerprint build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.image.Fingerprint buildPartial() {
       io.grafeas.v1beta1.image.Fingerprint result = new io.grafeas.v1beta1.image.Fingerprint(this);
       int from_bitField0_ = bitField0_;
@@ -511,39 +496,32 @@ public io.grafeas.v1beta1.image.Fingerprint buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.image.Fingerprint) {
         return mergeFrom((io.grafeas.v1beta1.image.Fingerprint)other);
@@ -578,12 +556,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.image.Fingerprint other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -925,13 +901,11 @@ public Builder setV2NameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -953,12 +927,11 @@ public static io.grafeas.v1beta1.image.Fingerprint getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Fingerprint parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Fingerprint(input, extensionRegistry);
+        return new Fingerprint(input, extensionRegistry);
     }
   };
 
@@ -971,7 +944,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.image.Fingerprint getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Image.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Image.java
index b7c22e9d4fa0..f09fc4c4cb33 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Image.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Image.java
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "\n\003CMD\020\003\022\t\n\005LABEL\020\004\022\n\n\006EXPOSE\020\005\022\007\n\003ENV\020\006\022" +
       "\007\n\003ADD\020\007\022\010\n\004COPY\020\010\022\016\n\nENTRYPOINT\020\t\022\n\n\006VO" +
       "LUME\020\n\022\010\n\004USER\020\013\022\013\n\007WORKDIR\020\014\022\007\n\003ARG\020\r\022\013" +
-      "\n\007ONBUILD\020\016\022\016\n\nSTOPSIGNAL\020\017\022\017\n\013HEALTHCHE" +
+      "\n\007ONBUILD\020\016\022\016\n\nSTOPSIGNAL\020\017\022\017\n\013HEALTHCHE",
       "CK\020\020\022\t\n\005SHELL\020\021\"@\n\013Fingerprint\022\017\n\007v1_nam" +
       "e\030\001 \001(\t\022\017\n\007v2_blob\030\002 \003(\t\022\017\n\007v2_name\030\003 \001(" +
       "\t\"V\n\005Basis\022\024\n\014resource_url\030\001 \001(\t\0227\n\013fing" +
@@ -67,7 +67,7 @@ public static void registerAllExtensions(
       "Derived\0227\n\013fingerprint\030\001 \001(\0132\".grafeas.v" +
       "1beta1.image.Fingerprint\022\020\n\010distance\030\002 \001" +
       "(\005\0220\n\nlayer_info\030\003 \003(\0132\034.grafeas.v1beta1" +
-      ".image.Layer\022\031\n\021base_resource_url\030\004 \001(\tB" +
+      ".image.Layer\022\031\n\021base_resource_url\030\004 \001(\tB",
       "x\n\030io.grafeas.v1beta1.imageP\001ZTgoogle.go" +
       "lang.org/genproto/googleapis/devtools/co" +
       "ntaineranalysis/v1beta1/image;image\242\002\003GR" +
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Layer.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Layer.java
index f1855924a867..e353e96faf7a 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Layer.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/image/Layer.java
@@ -34,9 +34,6 @@ private Layer(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private Layer(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -60,13 +64,6 @@ private Layer(
             arguments_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private Layer(
     return io.grafeas.v1beta1.image.Image.internal_static_grafeas_v1beta1_image_Layer_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.image.Image.internal_static_grafeas_v1beta1_image_Layer_fieldAccessorTable
@@ -502,7 +498,6 @@ public int getDirectiveValue() {
    * .grafeas.v1beta1.image.Layer.Directive directive = 1;
    */
   public io.grafeas.v1beta1.image.Layer.Directive getDirective() {
-    @SuppressWarnings("deprecation")
     io.grafeas.v1beta1.image.Layer.Directive result = io.grafeas.v1beta1.image.Layer.Directive.valueOf(directive_);
     return result == null ? io.grafeas.v1beta1.image.Layer.Directive.UNRECOGNIZED : result;
   }
@@ -550,7 +545,6 @@ public java.lang.String getArguments() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -560,7 +554,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (directive_ != io.grafeas.v1beta1.image.Layer.Directive.DIRECTIVE_UNSPECIFIED.getNumber()) {
@@ -572,7 +565,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -694,7 +686,6 @@ public static io.grafeas.v1beta1.image.Layer parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -702,7 +693,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.image.Layer prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -730,7 +720,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.image.Image.internal_static_grafeas_v1beta1_image_Layer_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.image.Image.internal_static_grafeas_v1beta1_image_Layer_fieldAccessorTable
@@ -753,7 +742,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       directive_ = 0;
@@ -763,18 +751,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.image.Image.internal_static_grafeas_v1beta1_image_Layer_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.image.Layer getDefaultInstanceForType() {
       return io.grafeas.v1beta1.image.Layer.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.image.Layer build() {
       io.grafeas.v1beta1.image.Layer result = buildPartial();
       if (!result.isInitialized()) {
@@ -783,7 +768,6 @@ public io.grafeas.v1beta1.image.Layer build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.image.Layer buildPartial() {
       io.grafeas.v1beta1.image.Layer result = new io.grafeas.v1beta1.image.Layer(this);
       result.directive_ = directive_;
@@ -792,39 +776,32 @@ public io.grafeas.v1beta1.image.Layer buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.image.Layer) {
         return mergeFrom((io.grafeas.v1beta1.image.Layer)other);
@@ -848,12 +825,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.image.Layer other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -903,7 +878,6 @@ public Builder setDirectiveValue(int value) {
      * .grafeas.v1beta1.image.Layer.Directive directive = 1;
      */
     public io.grafeas.v1beta1.image.Layer.Directive getDirective() {
-      @SuppressWarnings("deprecation")
       io.grafeas.v1beta1.image.Layer.Directive result = io.grafeas.v1beta1.image.Layer.Directive.valueOf(directive_);
       return result == null ? io.grafeas.v1beta1.image.Layer.Directive.UNRECOGNIZED : result;
     }
@@ -1025,13 +999,11 @@ public Builder setArgumentsBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1053,12 +1025,11 @@ public static io.grafeas.v1beta1.image.Layer getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Layer parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Layer(input, extensionRegistry);
+        return new Layer(input, extensionRegistry);
     }
   };
 
@@ -1071,7 +1042,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.image.Layer getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Details.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Details.java
index 7b0c28326c4f..ec8aff1d43a4 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Details.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Details.java
@@ -32,9 +32,6 @@ private Details(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private Details(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             io.grafeas.v1beta1.pkg.Installation.Builder subBuilder = null;
             if (installation_ != null) {
@@ -59,13 +63,6 @@ private Details(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private Details(
     return io.grafeas.v1beta1.pkg.PackageOuterClass.internal_static_grafeas_v1beta1_package_Details_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.pkg.PackageOuterClass.internal_static_grafeas_v1beta1_package_Details_fieldAccessorTable
@@ -125,7 +121,6 @@ public io.grafeas.v1beta1.pkg.InstallationOrBuilder getInstallationOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -135,7 +130,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (installation_ != null) {
@@ -144,7 +138,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static io.grafeas.v1beta1.pkg.Details parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.pkg.Details prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.pkg.PackageOuterClass.internal_static_grafeas_v1beta1_package_Details_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.pkg.PackageOuterClass.internal_static_grafeas_v1beta1_package_Details_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (installationBuilder_ == null) {
@@ -336,18 +325,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.pkg.PackageOuterClass.internal_static_grafeas_v1beta1_package_Details_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.pkg.Details getDefaultInstanceForType() {
       return io.grafeas.v1beta1.pkg.Details.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.pkg.Details build() {
       io.grafeas.v1beta1.pkg.Details result = buildPartial();
       if (!result.isInitialized()) {
@@ -356,7 +342,6 @@ public io.grafeas.v1beta1.pkg.Details build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.pkg.Details buildPartial() {
       io.grafeas.v1beta1.pkg.Details result = new io.grafeas.v1beta1.pkg.Details(this);
       if (installationBuilder_ == null) {
@@ -368,39 +353,32 @@ public io.grafeas.v1beta1.pkg.Details buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.pkg.Details) {
         return mergeFrom((io.grafeas.v1beta1.pkg.Details)other);
@@ -420,12 +398,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.pkg.Details other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -596,13 +572,11 @@ public io.grafeas.v1beta1.pkg.InstallationOrBuilder getInstallationOrBuilder() {
       }
       return installationBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -624,12 +598,11 @@ public static io.grafeas.v1beta1.pkg.Details getDefaultInstance() {
 
   private static final com.google.protobuf.Parser

       PARSER = new com.google.protobuf.AbstractParser
() {
-    @java.lang.Override
     public Details parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Details(input, extensionRegistry);
+        return new Details(input, extensionRegistry);
     }
   };
 
@@ -642,7 +615,6 @@ public com.google.protobuf.Parser
 getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.pkg.Details getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Distribution.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Distribution.java
index dcb36031b52e..e93addafc13b 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Distribution.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Distribution.java
@@ -38,9 +38,6 @@ private Distribution(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private Distribution(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -95,13 +99,6 @@ private Distribution(
             description_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -119,7 +116,6 @@ private Distribution(
     return io.grafeas.v1beta1.pkg.PackageOuterClass.internal_static_grafeas_v1beta1_package_Distribution_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.pkg.PackageOuterClass.internal_static_grafeas_v1beta1_package_Distribution_fieldAccessorTable
@@ -193,7 +189,6 @@ public int getArchitectureValue() {
    * .grafeas.v1beta1.package.Architecture architecture = 2;
    */
   public io.grafeas.v1beta1.pkg.Architecture getArchitecture() {
-    @SuppressWarnings("deprecation")
     io.grafeas.v1beta1.pkg.Architecture result = io.grafeas.v1beta1.pkg.Architecture.valueOf(architecture_);
     return result == null ? io.grafeas.v1beta1.pkg.Architecture.UNRECOGNIZED : result;
   }
@@ -361,7 +356,6 @@ public java.lang.String getDescription() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -371,7 +365,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getCpeUriBytes().isEmpty()) {
@@ -395,7 +388,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -551,7 +543,6 @@ public static io.grafeas.v1beta1.pkg.Distribution parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -559,7 +550,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.pkg.Distribution prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -588,7 +578,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.pkg.PackageOuterClass.internal_static_grafeas_v1beta1_package_Distribution_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.pkg.PackageOuterClass.internal_static_grafeas_v1beta1_package_Distribution_fieldAccessorTable
@@ -611,7 +600,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       cpeUri_ = "";
@@ -633,18 +621,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.pkg.PackageOuterClass.internal_static_grafeas_v1beta1_package_Distribution_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.pkg.Distribution getDefaultInstanceForType() {
       return io.grafeas.v1beta1.pkg.Distribution.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.pkg.Distribution build() {
       io.grafeas.v1beta1.pkg.Distribution result = buildPartial();
       if (!result.isInitialized()) {
@@ -653,7 +638,6 @@ public io.grafeas.v1beta1.pkg.Distribution build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.pkg.Distribution buildPartial() {
       io.grafeas.v1beta1.pkg.Distribution result = new io.grafeas.v1beta1.pkg.Distribution(this);
       result.cpeUri_ = cpeUri_;
@@ -670,39 +654,32 @@ public io.grafeas.v1beta1.pkg.Distribution buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.pkg.Distribution) {
         return mergeFrom((io.grafeas.v1beta1.pkg.Distribution)other);
@@ -741,12 +718,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.pkg.Distribution other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -893,7 +868,6 @@ public Builder setArchitectureValue(int value) {
      * .grafeas.v1beta1.package.Architecture architecture = 2;
      */
     public io.grafeas.v1beta1.pkg.Architecture getArchitecture() {
-      @SuppressWarnings("deprecation")
       io.grafeas.v1beta1.pkg.Architecture result = io.grafeas.v1beta1.pkg.Architecture.valueOf(architecture_);
       return result == null ? io.grafeas.v1beta1.pkg.Architecture.UNRECOGNIZED : result;
     }
@@ -1357,13 +1331,11 @@ public Builder setDescriptionBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1385,12 +1357,11 @@ public static io.grafeas.v1beta1.pkg.Distribution getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Distribution parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Distribution(input, extensionRegistry);
+        return new Distribution(input, extensionRegistry);
     }
   };
 
@@ -1403,7 +1374,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.pkg.Distribution getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Installation.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Installation.java
index 3f4132dad451..3e351b82879c 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Installation.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Installation.java
@@ -35,9 +35,6 @@ private Installation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private Installation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -64,13 +68,6 @@ private Installation(
                 input.readMessage(io.grafeas.v1beta1.pkg.Location.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private Installation(
     return io.grafeas.v1beta1.pkg.PackageOuterClass.internal_static_grafeas_v1beta1_package_Installation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.pkg.PackageOuterClass.internal_static_grafeas_v1beta1_package_Installation_fieldAccessorTable
@@ -203,7 +199,6 @@ public io.grafeas.v1beta1.pkg.LocationOrBuilder getLocationOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -213,7 +208,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -225,7 +219,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -350,7 +343,6 @@ public static io.grafeas.v1beta1.pkg.Installation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -358,7 +350,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.pkg.Installation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -387,7 +378,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.pkg.PackageOuterClass.internal_static_grafeas_v1beta1_package_Installation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.pkg.PackageOuterClass.internal_static_grafeas_v1beta1_package_Installation_fieldAccessorTable
@@ -411,7 +401,6 @@ private void maybeForceBuilderInitialization() {
         getLocationFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -425,18 +414,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.pkg.PackageOuterClass.internal_static_grafeas_v1beta1_package_Installation_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.pkg.Installation getDefaultInstanceForType() {
       return io.grafeas.v1beta1.pkg.Installation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.pkg.Installation build() {
       io.grafeas.v1beta1.pkg.Installation result = buildPartial();
       if (!result.isInitialized()) {
@@ -445,7 +431,6 @@ public io.grafeas.v1beta1.pkg.Installation build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.pkg.Installation buildPartial() {
       io.grafeas.v1beta1.pkg.Installation result = new io.grafeas.v1beta1.pkg.Installation(this);
       int from_bitField0_ = bitField0_;
@@ -465,39 +450,32 @@ public io.grafeas.v1beta1.pkg.Installation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.pkg.Installation) {
         return mergeFrom((io.grafeas.v1beta1.pkg.Installation)other);
@@ -544,12 +522,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.pkg.Installation other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -987,13 +963,11 @@ public io.grafeas.v1beta1.pkg.Location.Builder addLocationBuilder(
       }
       return locationBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1015,12 +989,11 @@ public static io.grafeas.v1beta1.pkg.Installation getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Installation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Installation(input, extensionRegistry);
+        return new Installation(input, extensionRegistry);
     }
   };
 
@@ -1033,7 +1006,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.pkg.Installation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Location.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Location.java
index a1a5b4051c0b..eb0b71e8e9e6 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Location.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Location.java
@@ -35,9 +35,6 @@ private Location(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private Location(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -74,13 +78,6 @@ private Location(
             path_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -98,7 +95,6 @@ private Location(
     return io.grafeas.v1beta1.pkg.PackageOuterClass.internal_static_grafeas_v1beta1_package_Location_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.pkg.PackageOuterClass.internal_static_grafeas_v1beta1_package_Location_fieldAccessorTable
@@ -226,7 +222,6 @@ public java.lang.String getPath() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -236,7 +231,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getCpeUriBytes().isEmpty()) {
@@ -251,7 +245,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -386,7 +379,6 @@ public static io.grafeas.v1beta1.pkg.Location parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -394,7 +386,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.pkg.Location prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -423,7 +414,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.pkg.PackageOuterClass.internal_static_grafeas_v1beta1_package_Location_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.pkg.PackageOuterClass.internal_static_grafeas_v1beta1_package_Location_fieldAccessorTable
@@ -446,7 +436,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       cpeUri_ = "";
@@ -462,18 +451,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.pkg.PackageOuterClass.internal_static_grafeas_v1beta1_package_Location_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.pkg.Location getDefaultInstanceForType() {
       return io.grafeas.v1beta1.pkg.Location.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.pkg.Location build() {
       io.grafeas.v1beta1.pkg.Location result = buildPartial();
       if (!result.isInitialized()) {
@@ -482,7 +468,6 @@ public io.grafeas.v1beta1.pkg.Location build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.pkg.Location buildPartial() {
       io.grafeas.v1beta1.pkg.Location result = new io.grafeas.v1beta1.pkg.Location(this);
       result.cpeUri_ = cpeUri_;
@@ -496,39 +481,32 @@ public io.grafeas.v1beta1.pkg.Location buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.pkg.Location) {
         return mergeFrom((io.grafeas.v1beta1.pkg.Location)other);
@@ -556,12 +534,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.pkg.Location other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -915,13 +891,11 @@ public Builder setPathBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -943,12 +917,11 @@ public static io.grafeas.v1beta1.pkg.Location getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Location parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Location(input, extensionRegistry);
+        return new Location(input, extensionRegistry);
     }
   };
 
@@ -961,7 +934,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.pkg.Location getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Package.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Package.java
index 6d049a81750b..28789a3684f7 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Package.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Package.java
@@ -36,9 +36,6 @@ private Package(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private Package(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -65,13 +69,6 @@ private Package(
                 input.readMessage(io.grafeas.v1beta1.pkg.Distribution.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -92,7 +89,6 @@ private Package(
     return io.grafeas.v1beta1.pkg.PackageOuterClass.internal_static_grafeas_v1beta1_package_Package_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.pkg.PackageOuterClass.internal_static_grafeas_v1beta1_package_Package_fieldAccessorTable
@@ -199,7 +195,6 @@ public io.grafeas.v1beta1.pkg.DistributionOrBuilder getDistributionOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -209,7 +204,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -221,7 +215,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -346,7 +339,6 @@ public static io.grafeas.v1beta1.pkg.Package parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -354,7 +346,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.pkg.Package prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.pkg.PackageOuterClass.internal_static_grafeas_v1beta1_package_Package_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.pkg.PackageOuterClass.internal_static_grafeas_v1beta1_package_Package_fieldAccessorTable
@@ -408,7 +398,6 @@ private void maybeForceBuilderInitialization() {
         getDistributionFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.pkg.PackageOuterClass.internal_static_grafeas_v1beta1_package_Package_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.pkg.Package getDefaultInstanceForType() {
       return io.grafeas.v1beta1.pkg.Package.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.pkg.Package build() {
       io.grafeas.v1beta1.pkg.Package result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public io.grafeas.v1beta1.pkg.Package build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.pkg.Package buildPartial() {
       io.grafeas.v1beta1.pkg.Package result = new io.grafeas.v1beta1.pkg.Package(this);
       int from_bitField0_ = bitField0_;
@@ -462,39 +447,32 @@ public io.grafeas.v1beta1.pkg.Package buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.pkg.Package) {
         return mergeFrom((io.grafeas.v1beta1.pkg.Package)other);
@@ -541,12 +519,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.pkg.Package other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -966,13 +942,11 @@ public io.grafeas.v1beta1.pkg.Distribution.Builder addDistributionBuilder(
       }
       return distributionBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -994,12 +968,11 @@ public static io.grafeas.v1beta1.pkg.Package getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Package parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Package(input, extensionRegistry);
+        return new Package(input, extensionRegistry);
     }
   };
 
@@ -1012,7 +985,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.pkg.Package getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/PackageOuterClass.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/PackageOuterClass.java
index 2678e01358f0..38c1e256dbc0 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/PackageOuterClass.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/PackageOuterClass.java
@@ -62,7 +62,7 @@ public static void registerAllExtensions(
       "ion\022\022\n\nmaintainer\030\004 \001(\t\022\013\n\003url\030\005 \001(\t\022\023\n\013" +
       "description\030\006 \001(\t\"\\\n\010Location\022\017\n\007cpe_uri" +
       "\030\001 \001(\t\0221\n\007version\030\002 \001(\0132 .grafeas.v1beta" +
-      "1.package.Version\022\014\n\004path\030\003 \001(\t\"T\n\007Packa" +
+      "1.package.Version\022\014\n\004path\030\003 \001(\t\"T\n\007Packa",
       "ge\022\014\n\004name\030\001 \001(\t\022;\n\014distribution\030\n \003(\0132%" +
       ".grafeas.v1beta1.package.Distribution\"F\n" +
       "\007Details\022;\n\014installation\030\001 \001(\0132%.grafeas" +
@@ -72,7 +72,7 @@ public static void registerAllExtensions(
       "sion\022\r\n\005epoch\030\001 \001(\005\022\014\n\004name\030\002 \001(\t\022\020\n\010rev" +
       "ision\030\003 \001(\t\022:\n\004kind\030\004 \001(\0162,.grafeas.v1be" +
       "ta1.package.Version.VersionKind\"Q\n\013Versi" +
-      "onKind\022\034\n\030VERSION_KIND_UNSPECIFIED\020\000\022\n\n\006" +
+      "onKind\022\034\n\030VERSION_KIND_UNSPECIFIED\020\000\022\n\n\006",
       "NORMAL\020\001\022\013\n\007MINIMUM\020\002\022\013\n\007MAXIMUM\020\003*>\n\014Ar" +
       "chitecture\022\034\n\030ARCHITECTURE_UNSPECIFIED\020\000" +
       "\022\007\n\003X86\020\001\022\007\n\003X64\020\002Bz\n\026io.grafeas.v1beta1" +
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Version.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Version.java
index a4fc587e9f8c..403cfaa90ab5 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Version.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/pkg/Version.java
@@ -36,9 +36,6 @@ private Version(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private Version(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
 
             epoch_ = input.readInt32();
@@ -73,13 +77,6 @@ private Version(
             kind_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private Version(
     return io.grafeas.v1beta1.pkg.PackageOuterClass.internal_static_grafeas_v1beta1_package_Version_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.pkg.PackageOuterClass.internal_static_grafeas_v1beta1_package_Version_fieldAccessorTable
@@ -380,13 +376,11 @@ public int getKindValue() {
    * .grafeas.v1beta1.package.Version.VersionKind kind = 4;
    */
   public io.grafeas.v1beta1.pkg.Version.VersionKind getKind() {
-    @SuppressWarnings("deprecation")
     io.grafeas.v1beta1.pkg.Version.VersionKind result = io.grafeas.v1beta1.pkg.Version.VersionKind.valueOf(kind_);
     return result == null ? io.grafeas.v1beta1.pkg.Version.VersionKind.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -396,7 +390,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (epoch_ != 0) {
@@ -414,7 +407,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -551,7 +543,6 @@ public static io.grafeas.v1beta1.pkg.Version parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -559,7 +550,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.pkg.Version prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -587,7 +577,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.pkg.PackageOuterClass.internal_static_grafeas_v1beta1_package_Version_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.pkg.PackageOuterClass.internal_static_grafeas_v1beta1_package_Version_fieldAccessorTable
@@ -610,7 +599,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       epoch_ = 0;
@@ -624,18 +612,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.pkg.PackageOuterClass.internal_static_grafeas_v1beta1_package_Version_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.pkg.Version getDefaultInstanceForType() {
       return io.grafeas.v1beta1.pkg.Version.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.pkg.Version build() {
       io.grafeas.v1beta1.pkg.Version result = buildPartial();
       if (!result.isInitialized()) {
@@ -644,7 +629,6 @@ public io.grafeas.v1beta1.pkg.Version build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.pkg.Version buildPartial() {
       io.grafeas.v1beta1.pkg.Version result = new io.grafeas.v1beta1.pkg.Version(this);
       result.epoch_ = epoch_;
@@ -655,39 +639,32 @@ public io.grafeas.v1beta1.pkg.Version buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.pkg.Version) {
         return mergeFrom((io.grafeas.v1beta1.pkg.Version)other);
@@ -718,12 +695,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.pkg.Version other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -992,7 +967,6 @@ public Builder setKindValue(int value) {
      * .grafeas.v1beta1.package.Version.VersionKind kind = 4;
      */
     public io.grafeas.v1beta1.pkg.Version.VersionKind getKind() {
-      @SuppressWarnings("deprecation")
       io.grafeas.v1beta1.pkg.Version.VersionKind result = io.grafeas.v1beta1.pkg.Version.VersionKind.valueOf(kind_);
       return result == null ? io.grafeas.v1beta1.pkg.Version.VersionKind.UNRECOGNIZED : result;
     }
@@ -1027,13 +1001,11 @@ public Builder clearKind() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1055,12 +1027,11 @@ public static io.grafeas.v1beta1.pkg.Version getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Version parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Version(input, extensionRegistry);
+        return new Version(input, extensionRegistry);
     }
   };
 
@@ -1073,7 +1044,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.pkg.Version getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Artifact.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Artifact.java
index c1aeb0920487..4d74b33e517f 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Artifact.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Artifact.java
@@ -35,9 +35,6 @@ private Artifact(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private Artifact(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -70,13 +74,6 @@ private Artifact(
             names_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private Artifact(
     return io.grafeas.v1beta1.provenance.Provenance.internal_static_grafeas_v1beta1_provenance_Artifact_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.provenance.Provenance.internal_static_grafeas_v1beta1_provenance_Artifact_fieldAccessorTable
@@ -256,7 +252,6 @@ public java.lang.String getNames(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -266,7 +261,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getChecksumBytes().isEmpty()) {
@@ -281,7 +275,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -417,7 +410,6 @@ public static io.grafeas.v1beta1.provenance.Artifact parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -425,7 +417,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.provenance.Artifact prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -453,7 +444,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.provenance.Provenance.internal_static_grafeas_v1beta1_provenance_Artifact_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.provenance.Provenance.internal_static_grafeas_v1beta1_provenance_Artifact_fieldAccessorTable
@@ -476,7 +466,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       checksum_ = "";
@@ -488,18 +477,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.provenance.Provenance.internal_static_grafeas_v1beta1_provenance_Artifact_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.provenance.Artifact getDefaultInstanceForType() {
       return io.grafeas.v1beta1.provenance.Artifact.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.provenance.Artifact build() {
       io.grafeas.v1beta1.provenance.Artifact result = buildPartial();
       if (!result.isInitialized()) {
@@ -508,7 +494,6 @@ public io.grafeas.v1beta1.provenance.Artifact build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.provenance.Artifact buildPartial() {
       io.grafeas.v1beta1.provenance.Artifact result = new io.grafeas.v1beta1.provenance.Artifact(this);
       int from_bitField0_ = bitField0_;
@@ -525,39 +510,32 @@ public io.grafeas.v1beta1.provenance.Artifact buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.provenance.Artifact) {
         return mergeFrom((io.grafeas.v1beta1.provenance.Artifact)other);
@@ -592,12 +570,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.provenance.Artifact other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -970,13 +946,11 @@ public Builder addNamesBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -998,12 +972,11 @@ public static io.grafeas.v1beta1.provenance.Artifact getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Artifact parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Artifact(input, extensionRegistry);
+        return new Artifact(input, extensionRegistry);
     }
   };
 
@@ -1016,7 +989,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.provenance.Artifact getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/BuildProvenance.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/BuildProvenance.java
index dc44f63f2881..a78abd84db8d 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/BuildProvenance.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/BuildProvenance.java
@@ -41,9 +41,6 @@ private BuildProvenance(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -55,6 +52,13 @@ private BuildProvenance(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -174,13 +178,6 @@ private BuildProvenance(
             builderVersion_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -205,7 +202,6 @@ private BuildProvenance(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -216,7 +212,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.provenance.Provenance.internal_static_grafeas_v1beta1_provenance_BuildProvenance_fieldAccessorTable
@@ -820,7 +815,6 @@ public java.lang.String getBuilderVersion() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -830,7 +824,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getIdBytes().isEmpty()) {
@@ -878,7 +871,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1116,7 +1108,6 @@ public static io.grafeas.v1beta1.provenance.BuildProvenance parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1124,7 +1115,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.provenance.BuildProvenance prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1175,7 +1165,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.provenance.Provenance.internal_static_grafeas_v1beta1_provenance_BuildProvenance_fieldAccessorTable
@@ -1200,7 +1189,6 @@ private void maybeForceBuilderInitialization() {
         getBuiltArtifactsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       id_ = "";
@@ -1255,18 +1243,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.provenance.Provenance.internal_static_grafeas_v1beta1_provenance_BuildProvenance_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.provenance.BuildProvenance getDefaultInstanceForType() {
       return io.grafeas.v1beta1.provenance.BuildProvenance.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.provenance.BuildProvenance build() {
       io.grafeas.v1beta1.provenance.BuildProvenance result = buildPartial();
       if (!result.isInitialized()) {
@@ -1275,7 +1260,6 @@ public io.grafeas.v1beta1.provenance.BuildProvenance build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.provenance.BuildProvenance buildPartial() {
       io.grafeas.v1beta1.provenance.BuildProvenance result = new io.grafeas.v1beta1.provenance.BuildProvenance(this);
       int from_bitField0_ = bitField0_;
@@ -1331,39 +1315,32 @@ public io.grafeas.v1beta1.provenance.BuildProvenance buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.provenance.BuildProvenance) {
         return mergeFrom((io.grafeas.v1beta1.provenance.BuildProvenance)other);
@@ -1470,12 +1447,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.provenance.BuildProvenance other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3432,13 +3407,11 @@ public Builder setBuilderVersionBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -3460,12 +3433,11 @@ public static io.grafeas.v1beta1.provenance.BuildProvenance getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BuildProvenance parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BuildProvenance(input, extensionRegistry);
+        return new BuildProvenance(input, extensionRegistry);
     }
   };
 
@@ -3478,7 +3450,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.provenance.BuildProvenance getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Command.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Command.java
index 9bbbbef655e0..a47ebdd4adfd 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Command.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Command.java
@@ -38,9 +38,6 @@ private Command(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private Command(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -97,13 +101,6 @@ private Command(
             waitFor_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -130,7 +127,6 @@ private Command(
     return io.grafeas.v1beta1.provenance.Provenance.internal_static_grafeas_v1beta1_provenance_Command_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.provenance.Provenance.internal_static_grafeas_v1beta1_provenance_Command_fieldAccessorTable
@@ -407,7 +403,6 @@ public java.lang.String getWaitFor(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -417,7 +412,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -441,7 +435,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -612,7 +605,6 @@ public static io.grafeas.v1beta1.provenance.Command parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -620,7 +612,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.provenance.Command prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -648,7 +639,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.provenance.Provenance.internal_static_grafeas_v1beta1_provenance_Command_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.provenance.Provenance.internal_static_grafeas_v1beta1_provenance_Command_fieldAccessorTable
@@ -671,7 +661,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -689,18 +678,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.provenance.Provenance.internal_static_grafeas_v1beta1_provenance_Command_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.provenance.Command getDefaultInstanceForType() {
       return io.grafeas.v1beta1.provenance.Command.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.provenance.Command build() {
       io.grafeas.v1beta1.provenance.Command result = buildPartial();
       if (!result.isInitialized()) {
@@ -709,7 +695,6 @@ public io.grafeas.v1beta1.provenance.Command build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.provenance.Command buildPartial() {
       io.grafeas.v1beta1.provenance.Command result = new io.grafeas.v1beta1.provenance.Command(this);
       int from_bitField0_ = bitField0_;
@@ -737,39 +722,32 @@ public io.grafeas.v1beta1.provenance.Command buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.provenance.Command) {
         return mergeFrom((io.grafeas.v1beta1.provenance.Command)other);
@@ -828,12 +806,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.provenance.Command other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1524,13 +1500,11 @@ public Builder addWaitForBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1552,12 +1526,11 @@ public static io.grafeas.v1beta1.provenance.Command getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Command parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Command(input, extensionRegistry);
+        return new Command(input, extensionRegistry);
     }
   };
 
@@ -1570,7 +1543,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.provenance.Command getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/FileHashes.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/FileHashes.java
index cb0a88386c80..d859e3cc9b4e 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/FileHashes.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/FileHashes.java
@@ -34,9 +34,6 @@ private FileHashes(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private FileHashes(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               fileHash_ = new java.util.ArrayList();
@@ -57,13 +61,6 @@ private FileHashes(
                 input.readMessage(io.grafeas.v1beta1.provenance.Hash.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private FileHashes(
     return io.grafeas.v1beta1.provenance.Provenance.internal_static_grafeas_v1beta1_provenance_FileHashes_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.provenance.Provenance.internal_static_grafeas_v1beta1_provenance_FileHashes_fieldAccessorTable
@@ -148,7 +144,6 @@ public io.grafeas.v1beta1.provenance.HashOrBuilder getFileHashOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -158,7 +153,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < fileHash_.size(); i++) {
@@ -167,7 +161,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -285,7 +278,6 @@ public static io.grafeas.v1beta1.provenance.FileHashes parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -293,7 +285,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.provenance.FileHashes prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -322,7 +313,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.provenance.Provenance.internal_static_grafeas_v1beta1_provenance_FileHashes_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.provenance.Provenance.internal_static_grafeas_v1beta1_provenance_FileHashes_fieldAccessorTable
@@ -346,7 +336,6 @@ private void maybeForceBuilderInitialization() {
         getFileHashFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (fileHashBuilder_ == null) {
@@ -358,18 +347,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.provenance.Provenance.internal_static_grafeas_v1beta1_provenance_FileHashes_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.provenance.FileHashes getDefaultInstanceForType() {
       return io.grafeas.v1beta1.provenance.FileHashes.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.provenance.FileHashes build() {
       io.grafeas.v1beta1.provenance.FileHashes result = buildPartial();
       if (!result.isInitialized()) {
@@ -378,7 +364,6 @@ public io.grafeas.v1beta1.provenance.FileHashes build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.provenance.FileHashes buildPartial() {
       io.grafeas.v1beta1.provenance.FileHashes result = new io.grafeas.v1beta1.provenance.FileHashes(this);
       int from_bitField0_ = bitField0_;
@@ -395,39 +380,32 @@ public io.grafeas.v1beta1.provenance.FileHashes buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.provenance.FileHashes) {
         return mergeFrom((io.grafeas.v1beta1.provenance.FileHashes)other);
@@ -470,12 +448,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.provenance.FileHashes other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -806,13 +782,11 @@ public io.grafeas.v1beta1.provenance.Hash.Builder addFileHashBuilder(
       }
       return fileHashBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -834,12 +808,11 @@ public static io.grafeas.v1beta1.provenance.FileHashes getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public FileHashes parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FileHashes(input, extensionRegistry);
+        return new FileHashes(input, extensionRegistry);
     }
   };
 
@@ -852,7 +825,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.provenance.FileHashes getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Hash.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Hash.java
index 17c16e9cd127..782767e849c5 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Hash.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Hash.java
@@ -34,9 +34,6 @@ private Hash(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private Hash(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -59,13 +63,6 @@ private Hash(
             value_ = input.readBytes();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private Hash(
     return io.grafeas.v1beta1.provenance.Provenance.internal_static_grafeas_v1beta1_provenance_Hash_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.provenance.Provenance.internal_static_grafeas_v1beta1_provenance_Hash_fieldAccessorTable
@@ -229,7 +225,6 @@ public int getTypeValue() {
    * .grafeas.v1beta1.provenance.Hash.HashType type = 1;
    */
   public io.grafeas.v1beta1.provenance.Hash.HashType getType() {
-    @SuppressWarnings("deprecation")
     io.grafeas.v1beta1.provenance.Hash.HashType result = io.grafeas.v1beta1.provenance.Hash.HashType.valueOf(type_);
     return result == null ? io.grafeas.v1beta1.provenance.Hash.HashType.UNRECOGNIZED : result;
   }
@@ -248,7 +243,6 @@ public com.google.protobuf.ByteString getValue() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -258,7 +252,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (type_ != io.grafeas.v1beta1.provenance.Hash.HashType.HASH_TYPE_UNSPECIFIED.getNumber()) {
@@ -270,7 +263,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -393,7 +385,6 @@ public static io.grafeas.v1beta1.provenance.Hash parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -401,7 +392,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.provenance.Hash prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -429,7 +419,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.provenance.Provenance.internal_static_grafeas_v1beta1_provenance_Hash_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.provenance.Provenance.internal_static_grafeas_v1beta1_provenance_Hash_fieldAccessorTable
@@ -452,7 +441,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       type_ = 0;
@@ -462,18 +450,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.provenance.Provenance.internal_static_grafeas_v1beta1_provenance_Hash_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.provenance.Hash getDefaultInstanceForType() {
       return io.grafeas.v1beta1.provenance.Hash.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.provenance.Hash build() {
       io.grafeas.v1beta1.provenance.Hash result = buildPartial();
       if (!result.isInitialized()) {
@@ -482,7 +467,6 @@ public io.grafeas.v1beta1.provenance.Hash build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.provenance.Hash buildPartial() {
       io.grafeas.v1beta1.provenance.Hash result = new io.grafeas.v1beta1.provenance.Hash(this);
       result.type_ = type_;
@@ -491,39 +475,32 @@ public io.grafeas.v1beta1.provenance.Hash buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.provenance.Hash) {
         return mergeFrom((io.grafeas.v1beta1.provenance.Hash)other);
@@ -546,12 +523,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.provenance.Hash other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -601,7 +576,6 @@ public Builder setTypeValue(int value) {
      * .grafeas.v1beta1.provenance.Hash.HashType type = 1;
      */
     public io.grafeas.v1beta1.provenance.Hash.HashType getType() {
-      @SuppressWarnings("deprecation")
       io.grafeas.v1beta1.provenance.Hash.HashType result = io.grafeas.v1beta1.provenance.Hash.HashType.valueOf(type_);
       return result == null ? io.grafeas.v1beta1.provenance.Hash.HashType.UNRECOGNIZED : result;
     }
@@ -675,13 +649,11 @@ public Builder clearValue() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -703,12 +675,11 @@ public static io.grafeas.v1beta1.provenance.Hash getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Hash parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Hash(input, extensionRegistry);
+        return new Hash(input, extensionRegistry);
     }
   };
 
@@ -721,7 +692,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.provenance.Hash getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Provenance.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Provenance.java
index cdb5e80f6c7b..b1acb2e082af 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Provenance.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Provenance.java
@@ -72,7 +72,7 @@ public static void registerAllExtensions(
       "d\030\002 \001(\t\0225\n\010commands\030\003 \003(\0132#.grafeas.v1be" +
       "ta1.provenance.Command\022=\n\017built_artifact" +
       "s\030\004 \003(\0132$.grafeas.v1beta1.provenance.Art" +
-      "ifact\022/\n\013create_time\030\005 \001(\0132\032.google.prot" +
+      "ifact\022/\n\013create_time\030\005 \001(\0132\032.google.prot",
       "obuf.Timestamp\022.\n\nstart_time\030\006 \001(\0132\032.goo" +
       "gle.protobuf.Timestamp\022,\n\010end_time\030\007 \001(\013" +
       "2\032.google.protobuf.Timestamp\022\017\n\007creator\030" +
@@ -82,7 +82,7 @@ public static void registerAllExtensions(
       "ons\030\014 \003(\0132=.grafeas.v1beta1.provenance.B" +
       "uildProvenance.BuildOptionsEntry\022\027\n\017buil" +
       "der_version\030\r \001(\t\0323\n\021BuildOptionsEntry\022\013" +
-      "\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\315\002\n\006Sourc" +
+      "\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\315\002\n\006Sourc",
       "e\022#\n\033artifact_storage_source_uri\030\001 \001(\t\022G" +
       "\n\013file_hashes\030\002 \003(\01322.grafeas.v1beta1.pr" +
       "ovenance.Source.FileHashesEntry\0226\n\007conte" +
@@ -92,7 +92,7 @@ public static void registerAllExtensions(
       "ileHashesEntry\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001" +
       "(\0132&.grafeas.v1beta1.provenance.FileHash" +
       "es:\0028\001\"A\n\nFileHashes\0223\n\tfile_hash\030\001 \003(\0132" +
-      " .grafeas.v1beta1.provenance.Hash\"\201\001\n\004Ha" +
+      " .grafeas.v1beta1.provenance.Hash\"\201\001\n\004Ha",
       "sh\0227\n\004type\030\001 \001(\0162).grafeas.v1beta1.prove" +
       "nance.Hash.HashType\022\r\n\005value\030\002 \001(\014\"1\n\010Ha" +
       "shType\022\031\n\025HASH_TYPE_UNSPECIFIED\020\000\022\n\n\006SHA" +
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "ksum\030\001 \001(\t\022\n\n\002id\030\002 \001(\t\022\r\n\005names\030\003 \003(\tB\207\001" +
       "\n\035io.grafeas.v1beta1.provenanceP\001Z^googl" +
       "e.golang.org/genproto/googleapis/devtool" +
-      "s/containeranalysis/v1beta1/provenance;p" +
+      "s/containeranalysis/v1beta1/provenance;p",
       "rovenance\242\002\003GRAb\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Source.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Source.java
index ee8759ef14c1..0139135d353c 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Source.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/provenance/Source.java
@@ -34,9 +34,6 @@ private Source(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private Source(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -89,13 +93,6 @@ private Source(
                 input.readMessage(io.grafeas.v1beta1.source.SourceContext.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -117,7 +114,6 @@ private Source(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -128,7 +124,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.provenance.Provenance.internal_static_grafeas_v1beta1_provenance_Source_fieldAccessorTable
@@ -397,7 +392,6 @@ public io.grafeas.v1beta1.source.SourceContextOrBuilder getAdditionalContextsOrB
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -407,7 +401,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getArtifactStorageSourceUriBytes().isEmpty()) {
@@ -428,7 +421,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -582,7 +574,6 @@ public static io.grafeas.v1beta1.provenance.Source parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -590,7 +581,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.provenance.Source prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -640,7 +630,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.provenance.Provenance.internal_static_grafeas_v1beta1_provenance_Source_fieldAccessorTable
@@ -664,7 +653,6 @@ private void maybeForceBuilderInitialization() {
         getAdditionalContextsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       artifactStorageSourceUri_ = "";
@@ -685,18 +673,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.provenance.Provenance.internal_static_grafeas_v1beta1_provenance_Source_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.provenance.Source getDefaultInstanceForType() {
       return io.grafeas.v1beta1.provenance.Source.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.provenance.Source build() {
       io.grafeas.v1beta1.provenance.Source result = buildPartial();
       if (!result.isInitialized()) {
@@ -705,7 +690,6 @@ public io.grafeas.v1beta1.provenance.Source build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.provenance.Source buildPartial() {
       io.grafeas.v1beta1.provenance.Source result = new io.grafeas.v1beta1.provenance.Source(this);
       int from_bitField0_ = bitField0_;
@@ -732,39 +716,32 @@ public io.grafeas.v1beta1.provenance.Source buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.provenance.Source) {
         return mergeFrom((io.grafeas.v1beta1.provenance.Source)other);
@@ -816,12 +793,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.provenance.Source other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1639,13 +1614,11 @@ public io.grafeas.v1beta1.source.SourceContext.Builder addAdditionalContextsBuil
       }
       return additionalContextsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1667,12 +1640,11 @@ public static io.grafeas.v1beta1.provenance.Source getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Source parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Source(input, extensionRegistry);
+        return new Source(input, extensionRegistry);
     }
   };
 
@@ -1685,7 +1657,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.provenance.Source getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/AliasContext.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/AliasContext.java
index acc636a6a54d..5407a3041b51 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/AliasContext.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/AliasContext.java
@@ -34,9 +34,6 @@ private AliasContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private AliasContext(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -60,13 +64,6 @@ private AliasContext(
             name_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private AliasContext(
     return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_AliasContext_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_AliasContext_fieldAccessorTable
@@ -266,7 +262,6 @@ public int getKindValue() {
    * .grafeas.v1beta1.source.AliasContext.Kind kind = 1;
    */
   public io.grafeas.v1beta1.source.AliasContext.Kind getKind() {
-    @SuppressWarnings("deprecation")
     io.grafeas.v1beta1.source.AliasContext.Kind result = io.grafeas.v1beta1.source.AliasContext.Kind.valueOf(kind_);
     return result == null ? io.grafeas.v1beta1.source.AliasContext.Kind.UNRECOGNIZED : result;
   }
@@ -314,7 +309,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -324,7 +318,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (kind_ != io.grafeas.v1beta1.source.AliasContext.Kind.KIND_UNSPECIFIED.getNumber()) {
@@ -336,7 +329,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -458,7 +450,6 @@ public static io.grafeas.v1beta1.source.AliasContext parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -466,7 +457,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.source.AliasContext prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -494,7 +484,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_AliasContext_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_AliasContext_fieldAccessorTable
@@ -517,7 +506,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       kind_ = 0;
@@ -527,18 +515,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_AliasContext_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.source.AliasContext getDefaultInstanceForType() {
       return io.grafeas.v1beta1.source.AliasContext.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.source.AliasContext build() {
       io.grafeas.v1beta1.source.AliasContext result = buildPartial();
       if (!result.isInitialized()) {
@@ -547,7 +532,6 @@ public io.grafeas.v1beta1.source.AliasContext build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.source.AliasContext buildPartial() {
       io.grafeas.v1beta1.source.AliasContext result = new io.grafeas.v1beta1.source.AliasContext(this);
       result.kind_ = kind_;
@@ -556,39 +540,32 @@ public io.grafeas.v1beta1.source.AliasContext buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.source.AliasContext) {
         return mergeFrom((io.grafeas.v1beta1.source.AliasContext)other);
@@ -612,12 +589,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.source.AliasContext other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -667,7 +642,6 @@ public Builder setKindValue(int value) {
      * .grafeas.v1beta1.source.AliasContext.Kind kind = 1;
      */
     public io.grafeas.v1beta1.source.AliasContext.Kind getKind() {
-      @SuppressWarnings("deprecation")
       io.grafeas.v1beta1.source.AliasContext.Kind result = io.grafeas.v1beta1.source.AliasContext.Kind.valueOf(kind_);
       return result == null ? io.grafeas.v1beta1.source.AliasContext.Kind.UNRECOGNIZED : result;
     }
@@ -789,13 +763,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -817,12 +789,11 @@ public static io.grafeas.v1beta1.source.AliasContext getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AliasContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AliasContext(input, extensionRegistry);
+        return new AliasContext(input, extensionRegistry);
     }
   };
 
@@ -835,7 +806,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.source.AliasContext getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/CloudRepoSourceContext.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/CloudRepoSourceContext.java
index 7174a05169d6..10339fc8a5c5 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/CloudRepoSourceContext.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/CloudRepoSourceContext.java
@@ -33,9 +33,6 @@ private CloudRepoSourceContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private CloudRepoSourceContext(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             io.grafeas.v1beta1.source.RepoId.Builder subBuilder = null;
             if (repoId_ != null) {
@@ -80,13 +84,6 @@ private CloudRepoSourceContext(
             revisionCase_ = 3;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private CloudRepoSourceContext(
     return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_CloudRepoSourceContext_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_CloudRepoSourceContext_fieldAccessorTable
@@ -273,7 +269,6 @@ public io.grafeas.v1beta1.source.AliasContextOrBuilder getAliasContextOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -283,7 +278,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (repoId_ != null) {
@@ -298,7 +292,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -453,7 +446,6 @@ public static io.grafeas.v1beta1.source.CloudRepoSourceContext parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -461,7 +453,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.source.CloudRepoSourceContext prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -490,7 +481,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_CloudRepoSourceContext_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_CloudRepoSourceContext_fieldAccessorTable
@@ -513,7 +503,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (repoIdBuilder_ == null) {
@@ -527,18 +516,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_CloudRepoSourceContext_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.source.CloudRepoSourceContext getDefaultInstanceForType() {
       return io.grafeas.v1beta1.source.CloudRepoSourceContext.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.source.CloudRepoSourceContext build() {
       io.grafeas.v1beta1.source.CloudRepoSourceContext result = buildPartial();
       if (!result.isInitialized()) {
@@ -547,7 +533,6 @@ public io.grafeas.v1beta1.source.CloudRepoSourceContext build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.source.CloudRepoSourceContext buildPartial() {
       io.grafeas.v1beta1.source.CloudRepoSourceContext result = new io.grafeas.v1beta1.source.CloudRepoSourceContext(this);
       if (repoIdBuilder_ == null) {
@@ -570,39 +555,32 @@ public io.grafeas.v1beta1.source.CloudRepoSourceContext buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.source.CloudRepoSourceContext) {
         return mergeFrom((io.grafeas.v1beta1.source.CloudRepoSourceContext)other);
@@ -637,12 +615,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.source.CloudRepoSourceContext other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1100,13 +1076,11 @@ public io.grafeas.v1beta1.source.AliasContextOrBuilder getAliasContextOrBuilder(
       onChanged();;
       return aliasContextBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1128,12 +1102,11 @@ public static io.grafeas.v1beta1.source.CloudRepoSourceContext getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CloudRepoSourceContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CloudRepoSourceContext(input, extensionRegistry);
+        return new CloudRepoSourceContext(input, extensionRegistry);
     }
   };
 
@@ -1146,7 +1119,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.source.CloudRepoSourceContext getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/GerritSourceContext.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/GerritSourceContext.java
index 64173b4eff07..9d8bc4b96de0 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/GerritSourceContext.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/GerritSourceContext.java
@@ -34,9 +34,6 @@ private GerritSourceContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private GerritSourceContext(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -80,13 +84,6 @@ private GerritSourceContext(
             revisionCase_ = 4;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private GerritSourceContext(
     return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_GerritSourceContext_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_GerritSourceContext_fieldAccessorTable
@@ -328,7 +324,6 @@ public io.grafeas.v1beta1.source.AliasContextOrBuilder getAliasContextOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -338,7 +333,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getHostUriBytes().isEmpty()) {
@@ -356,7 +350,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -512,7 +505,6 @@ public static io.grafeas.v1beta1.source.GerritSourceContext parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -520,7 +512,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.source.GerritSourceContext prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -548,7 +539,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_GerritSourceContext_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_GerritSourceContext_fieldAccessorTable
@@ -571,7 +561,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       hostUri_ = "";
@@ -583,18 +572,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_GerritSourceContext_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.source.GerritSourceContext getDefaultInstanceForType() {
       return io.grafeas.v1beta1.source.GerritSourceContext.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.source.GerritSourceContext build() {
       io.grafeas.v1beta1.source.GerritSourceContext result = buildPartial();
       if (!result.isInitialized()) {
@@ -603,7 +589,6 @@ public io.grafeas.v1beta1.source.GerritSourceContext build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.source.GerritSourceContext buildPartial() {
       io.grafeas.v1beta1.source.GerritSourceContext result = new io.grafeas.v1beta1.source.GerritSourceContext(this);
       result.hostUri_ = hostUri_;
@@ -623,39 +608,32 @@ public io.grafeas.v1beta1.source.GerritSourceContext buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.source.GerritSourceContext) {
         return mergeFrom((io.grafeas.v1beta1.source.GerritSourceContext)other);
@@ -695,12 +673,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.source.GerritSourceContext other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1193,13 +1169,11 @@ public io.grafeas.v1beta1.source.AliasContextOrBuilder getAliasContextOrBuilder(
       onChanged();;
       return aliasContextBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1221,12 +1195,11 @@ public static io.grafeas.v1beta1.source.GerritSourceContext getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GerritSourceContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GerritSourceContext(input, extensionRegistry);
+        return new GerritSourceContext(input, extensionRegistry);
     }
   };
 
@@ -1239,7 +1212,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.source.GerritSourceContext getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/GitSourceContext.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/GitSourceContext.java
index ef5b2cc19623..2c360136f466 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/GitSourceContext.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/GitSourceContext.java
@@ -35,9 +35,6 @@ private GitSourceContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private GitSourceContext(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -61,13 +65,6 @@ private GitSourceContext(
             revisionId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -85,7 +82,6 @@ private GitSourceContext(
     return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_GitSourceContext_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_GitSourceContext_fieldAccessorTable
@@ -178,7 +174,6 @@ public java.lang.String getRevisionId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -188,7 +183,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getUrlBytes().isEmpty()) {
@@ -200,7 +194,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -322,7 +315,6 @@ public static io.grafeas.v1beta1.source.GitSourceContext parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -330,7 +322,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.source.GitSourceContext prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -359,7 +350,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_GitSourceContext_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_GitSourceContext_fieldAccessorTable
@@ -382,7 +372,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       url_ = "";
@@ -392,18 +381,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_GitSourceContext_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.source.GitSourceContext getDefaultInstanceForType() {
       return io.grafeas.v1beta1.source.GitSourceContext.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.source.GitSourceContext build() {
       io.grafeas.v1beta1.source.GitSourceContext result = buildPartial();
       if (!result.isInitialized()) {
@@ -412,7 +398,6 @@ public io.grafeas.v1beta1.source.GitSourceContext build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.source.GitSourceContext buildPartial() {
       io.grafeas.v1beta1.source.GitSourceContext result = new io.grafeas.v1beta1.source.GitSourceContext(this);
       result.url_ = url_;
@@ -421,39 +406,32 @@ public io.grafeas.v1beta1.source.GitSourceContext buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.source.GitSourceContext) {
         return mergeFrom((io.grafeas.v1beta1.source.GitSourceContext)other);
@@ -478,12 +456,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.source.GitSourceContext other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -679,13 +655,11 @@ public Builder setRevisionIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -707,12 +681,11 @@ public static io.grafeas.v1beta1.source.GitSourceContext getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GitSourceContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GitSourceContext(input, extensionRegistry);
+        return new GitSourceContext(input, extensionRegistry);
     }
   };
 
@@ -725,7 +698,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.source.GitSourceContext getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/ProjectRepoId.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/ProjectRepoId.java
index c605892ab5f6..203d61c1e09c 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/ProjectRepoId.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/ProjectRepoId.java
@@ -35,9 +35,6 @@ private ProjectRepoId(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ProjectRepoId(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -61,13 +65,6 @@ private ProjectRepoId(
             repoName_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -85,7 +82,6 @@ private ProjectRepoId(
     return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_ProjectRepoId_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_ProjectRepoId_fieldAccessorTable
@@ -178,7 +174,6 @@ public java.lang.String getRepoName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -188,7 +183,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -200,7 +194,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -322,7 +315,6 @@ public static io.grafeas.v1beta1.source.ProjectRepoId parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -330,7 +322,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.source.ProjectRepoId prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -359,7 +350,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_ProjectRepoId_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_ProjectRepoId_fieldAccessorTable
@@ -382,7 +372,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -392,18 +381,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_ProjectRepoId_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.source.ProjectRepoId getDefaultInstanceForType() {
       return io.grafeas.v1beta1.source.ProjectRepoId.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.source.ProjectRepoId build() {
       io.grafeas.v1beta1.source.ProjectRepoId result = buildPartial();
       if (!result.isInitialized()) {
@@ -412,7 +398,6 @@ public io.grafeas.v1beta1.source.ProjectRepoId build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.source.ProjectRepoId buildPartial() {
       io.grafeas.v1beta1.source.ProjectRepoId result = new io.grafeas.v1beta1.source.ProjectRepoId(this);
       result.projectId_ = projectId_;
@@ -421,39 +406,32 @@ public io.grafeas.v1beta1.source.ProjectRepoId buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.source.ProjectRepoId) {
         return mergeFrom((io.grafeas.v1beta1.source.ProjectRepoId)other);
@@ -478,12 +456,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.source.ProjectRepoId other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -679,13 +655,11 @@ public Builder setRepoNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -707,12 +681,11 @@ public static io.grafeas.v1beta1.source.ProjectRepoId getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ProjectRepoId parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ProjectRepoId(input, extensionRegistry);
+        return new ProjectRepoId(input, extensionRegistry);
     }
   };
 
@@ -725,7 +698,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.source.ProjectRepoId getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/RepoId.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/RepoId.java
index 47cbd6623831..c5a08b043526 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/RepoId.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/RepoId.java
@@ -32,9 +32,6 @@ private RepoId(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private RepoId(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             io.grafeas.v1beta1.source.ProjectRepoId.Builder subBuilder = null;
             if (idCase_ == 1) {
@@ -66,13 +70,6 @@ private RepoId(
             id_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private RepoId(
     return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_RepoId_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_RepoId_fieldAccessorTable
@@ -226,7 +222,6 @@ public java.lang.String getUid() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -236,7 +231,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (idCase_ == 1) {
@@ -248,7 +242,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -390,7 +383,6 @@ public static io.grafeas.v1beta1.source.RepoId parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -398,7 +390,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.source.RepoId prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -426,7 +417,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_RepoId_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_RepoId_fieldAccessorTable
@@ -449,7 +439,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       idCase_ = 0;
@@ -457,18 +446,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_RepoId_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.source.RepoId getDefaultInstanceForType() {
       return io.grafeas.v1beta1.source.RepoId.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.source.RepoId build() {
       io.grafeas.v1beta1.source.RepoId result = buildPartial();
       if (!result.isInitialized()) {
@@ -477,7 +463,6 @@ public io.grafeas.v1beta1.source.RepoId build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.source.RepoId buildPartial() {
       io.grafeas.v1beta1.source.RepoId result = new io.grafeas.v1beta1.source.RepoId(this);
       if (idCase_ == 1) {
@@ -495,39 +480,32 @@ public io.grafeas.v1beta1.source.RepoId buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.source.RepoId) {
         return mergeFrom((io.grafeas.v1beta1.source.RepoId)other);
@@ -559,12 +537,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.source.RepoId other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -869,13 +845,11 @@ public Builder setUidBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -897,12 +871,11 @@ public static io.grafeas.v1beta1.source.RepoId getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RepoId parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RepoId(input, extensionRegistry);
+        return new RepoId(input, extensionRegistry);
     }
   };
 
@@ -915,7 +888,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.source.RepoId getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/Source.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/Source.java
index 3a4bd1ddf010..1c6fef596494 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/Source.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/Source.java
@@ -72,7 +72,7 @@ public static void registerAllExtensions(
       "\n\003git\030\003 \001(\0132(.grafeas.v1beta1.source.Git" +
       "SourceContextH\000\022A\n\006labels\030\004 \003(\01321.grafea" +
       "s.v1beta1.source.SourceContext.LabelsEnt" +
-      "ry\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030" +
+      "ry\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030",
       "\002 \001(\t:\0028\001B\t\n\007context\"\226\001\n\014AliasContext\0227\n" +
       "\004kind\030\001 \001(\0162).grafeas.v1beta1.source.Ali" +
       "asContext.Kind\022\014\n\004name\030\002 \001(\t\"?\n\004Kind\022\024\n\020" +
@@ -82,7 +82,7 @@ public static void registerAllExtensions(
       "ce.RepoId\022\025\n\013revision_id\030\002 \001(\tH\000\022=\n\ralia" +
       "s_context\030\003 \001(\0132$.grafeas.v1beta1.source" +
       ".AliasContextH\000B\n\n\010revision\"\241\001\n\023GerritSo" +
-      "urceContext\022\020\n\010host_uri\030\001 \001(\t\022\026\n\016gerrit_" +
+      "urceContext\022\020\n\010host_uri\030\001 \001(\t\022\026\n\016gerrit_",
       "project\030\002 \001(\t\022\025\n\013revision_id\030\003 \001(\tH\000\022=\n\r" +
       "alias_context\030\004 \001(\0132$.grafeas.v1beta1.so" +
       "urce.AliasContextH\000B\n\n\010revision\"4\n\020GitSo" +
@@ -92,7 +92,7 @@ public static void registerAllExtensions(
       "\000\022\r\n\003uid\030\002 \001(\tH\000B\004\n\002id\"6\n\rProjectRepoId\022" +
       "\022\n\nproject_id\030\001 \001(\t\022\021\n\trepo_name\030\002 \001(\tB{" +
       "\n\031io.grafeas.v1beta1.sourceP\001ZVgoogle.go" +
-      "lang.org/genproto/googleapis/devtools/co" +
+      "lang.org/genproto/googleapis/devtools/co",
       "ntaineranalysis/v1beta1/source;source\242\002\003" +
       "GRAb\006proto3"
     };
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/SourceContext.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/SourceContext.java
index 3880abf0a4a0..dd0b2a5a1257 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/SourceContext.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/source/SourceContext.java
@@ -33,9 +33,6 @@ private SourceContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private SourceContext(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             io.grafeas.v1beta1.source.CloudRepoSourceContext.Builder subBuilder = null;
             if (contextCase_ == 1) {
@@ -102,13 +106,6 @@ private SourceContext(
                 labels__.getKey(), labels__.getValue());
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -127,7 +124,6 @@ private SourceContext(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -138,7 +134,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_SourceContext_fieldAccessorTable
@@ -394,7 +389,6 @@ public java.lang.String getLabelsOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -404,7 +398,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (contextCase_ == 1) {
@@ -425,7 +418,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -596,7 +588,6 @@ public static io.grafeas.v1beta1.source.SourceContext parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -604,7 +595,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.source.SourceContext prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -655,7 +645,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_SourceContext_fieldAccessorTable
@@ -678,7 +667,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       internalGetMutableLabels().clear();
@@ -687,18 +675,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.source.Source.internal_static_grafeas_v1beta1_source_SourceContext_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.source.SourceContext getDefaultInstanceForType() {
       return io.grafeas.v1beta1.source.SourceContext.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.source.SourceContext build() {
       io.grafeas.v1beta1.source.SourceContext result = buildPartial();
       if (!result.isInitialized()) {
@@ -707,7 +692,6 @@ public io.grafeas.v1beta1.source.SourceContext build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.source.SourceContext buildPartial() {
       io.grafeas.v1beta1.source.SourceContext result = new io.grafeas.v1beta1.source.SourceContext(this);
       int from_bitField0_ = bitField0_;
@@ -741,39 +725,32 @@ public io.grafeas.v1beta1.source.SourceContext buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.source.SourceContext) {
         return mergeFrom((io.grafeas.v1beta1.source.SourceContext)other);
@@ -809,12 +786,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.source.SourceContext other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1515,13 +1490,11 @@ public Builder putAllLabels(
           .putAll(values);
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1543,12 +1516,11 @@ public static io.grafeas.v1beta1.source.SourceContext getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SourceContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SourceContext(input, extensionRegistry);
+        return new SourceContext(input, extensionRegistry);
     }
   };
 
@@ -1561,7 +1533,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.source.SourceContext getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/Details.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/Details.java
index ab2d3382cd1d..bba76d59020a 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/Details.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/Details.java
@@ -39,9 +39,6 @@ private Details(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private Details(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -100,13 +104,6 @@ private Details(
                 input.readMessage(io.grafeas.v1beta1.common.RelatedUrl.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -130,7 +127,6 @@ private Details(
     return io.grafeas.v1beta1.vulnerability.VulnerabilityOuterClass.internal_static_grafeas_v1beta1_vulnerability_Details_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.vulnerability.VulnerabilityOuterClass.internal_static_grafeas_v1beta1_vulnerability_Details_fieldAccessorTable
@@ -203,7 +199,6 @@ public int getSeverityValue() {
    * .grafeas.v1beta1.vulnerability.Severity severity = 2;
    */
   public io.grafeas.v1beta1.vulnerability.Severity getSeverity() {
-    @SuppressWarnings("deprecation")
     io.grafeas.v1beta1.vulnerability.Severity result = io.grafeas.v1beta1.vulnerability.Severity.valueOf(severity_);
     return result == null ? io.grafeas.v1beta1.vulnerability.Severity.UNRECOGNIZED : result;
   }
@@ -423,7 +418,6 @@ public io.grafeas.v1beta1.common.RelatedUrlOrBuilder getRelatedUrlsOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -433,7 +427,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getTypeBytes().isEmpty()) {
@@ -460,7 +453,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -627,7 +619,6 @@ public static io.grafeas.v1beta1.vulnerability.Details parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -635,7 +626,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.vulnerability.Details prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -663,7 +653,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.vulnerability.VulnerabilityOuterClass.internal_static_grafeas_v1beta1_vulnerability_Details_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.vulnerability.VulnerabilityOuterClass.internal_static_grafeas_v1beta1_vulnerability_Details_fieldAccessorTable
@@ -688,7 +677,6 @@ private void maybeForceBuilderInitialization() {
         getRelatedUrlsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       type_ = "";
@@ -716,18 +704,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.vulnerability.VulnerabilityOuterClass.internal_static_grafeas_v1beta1_vulnerability_Details_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.vulnerability.Details getDefaultInstanceForType() {
       return io.grafeas.v1beta1.vulnerability.Details.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.vulnerability.Details build() {
       io.grafeas.v1beta1.vulnerability.Details result = buildPartial();
       if (!result.isInitialized()) {
@@ -736,7 +721,6 @@ public io.grafeas.v1beta1.vulnerability.Details build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.vulnerability.Details buildPartial() {
       io.grafeas.v1beta1.vulnerability.Details result = new io.grafeas.v1beta1.vulnerability.Details(this);
       int from_bitField0_ = bitField0_;
@@ -769,39 +753,32 @@ public io.grafeas.v1beta1.vulnerability.Details buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.vulnerability.Details) {
         return mergeFrom((io.grafeas.v1beta1.vulnerability.Details)other);
@@ -888,12 +865,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.vulnerability.Details other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1038,7 +1013,6 @@ public Builder setSeverityValue(int value) {
      * .grafeas.v1beta1.vulnerability.Severity severity = 2;
      */
     public io.grafeas.v1beta1.vulnerability.Severity getSeverity() {
-      @SuppressWarnings("deprecation")
       io.grafeas.v1beta1.vulnerability.Severity result = io.grafeas.v1beta1.vulnerability.Severity.valueOf(severity_);
       return result == null ? io.grafeas.v1beta1.vulnerability.Severity.UNRECOGNIZED : result;
     }
@@ -1935,13 +1909,11 @@ public io.grafeas.v1beta1.common.RelatedUrl.Builder addRelatedUrlsBuilder(
       }
       return relatedUrlsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1963,12 +1935,11 @@ public static io.grafeas.v1beta1.vulnerability.Details getDefaultInstance() {
 
   private static final com.google.protobuf.Parser

       PARSER = new com.google.protobuf.AbstractParser
() {
-    @java.lang.Override
     public Details parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Details(input, extensionRegistry);
+        return new Details(input, extensionRegistry);
     }
   };
 
@@ -1981,7 +1952,6 @@ public com.google.protobuf.Parser
 getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.vulnerability.Details getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/PackageIssue.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/PackageIssue.java
index f1f721ad8e90..51886a57cd0b 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/PackageIssue.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/PackageIssue.java
@@ -34,9 +34,6 @@ private PackageIssue(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private PackageIssue(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             io.grafeas.v1beta1.vulnerability.VulnerabilityLocation.Builder subBuilder = null;
             if (affectedLocation_ != null) {
@@ -80,13 +84,6 @@ private PackageIssue(
             severityName_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private PackageIssue(
     return io.grafeas.v1beta1.vulnerability.VulnerabilityOuterClass.internal_static_grafeas_v1beta1_vulnerability_PackageIssue_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.vulnerability.VulnerabilityOuterClass.internal_static_grafeas_v1beta1_vulnerability_PackageIssue_fieldAccessorTable
@@ -221,7 +217,6 @@ public java.lang.String getSeverityName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -231,7 +226,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (affectedLocation_ != null) {
@@ -246,7 +240,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -387,7 +380,6 @@ public static io.grafeas.v1beta1.vulnerability.PackageIssue parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -395,7 +387,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.vulnerability.PackageIssue prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -424,7 +415,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.vulnerability.VulnerabilityOuterClass.internal_static_grafeas_v1beta1_vulnerability_PackageIssue_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.vulnerability.VulnerabilityOuterClass.internal_static_grafeas_v1beta1_vulnerability_PackageIssue_fieldAccessorTable
@@ -447,7 +437,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (affectedLocationBuilder_ == null) {
@@ -467,18 +456,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.vulnerability.VulnerabilityOuterClass.internal_static_grafeas_v1beta1_vulnerability_PackageIssue_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.vulnerability.PackageIssue getDefaultInstanceForType() {
       return io.grafeas.v1beta1.vulnerability.PackageIssue.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.vulnerability.PackageIssue build() {
       io.grafeas.v1beta1.vulnerability.PackageIssue result = buildPartial();
       if (!result.isInitialized()) {
@@ -487,7 +473,6 @@ public io.grafeas.v1beta1.vulnerability.PackageIssue build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.vulnerability.PackageIssue buildPartial() {
       io.grafeas.v1beta1.vulnerability.PackageIssue result = new io.grafeas.v1beta1.vulnerability.PackageIssue(this);
       if (affectedLocationBuilder_ == null) {
@@ -505,39 +490,32 @@ public io.grafeas.v1beta1.vulnerability.PackageIssue buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.vulnerability.PackageIssue) {
         return mergeFrom((io.grafeas.v1beta1.vulnerability.PackageIssue)other);
@@ -564,12 +542,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.vulnerability.PackageIssue other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -982,13 +958,11 @@ public Builder setSeverityNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1010,12 +984,11 @@ public static io.grafeas.v1beta1.vulnerability.PackageIssue getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PackageIssue parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PackageIssue(input, extensionRegistry);
+        return new PackageIssue(input, extensionRegistry);
     }
   };
 
@@ -1028,7 +1001,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.vulnerability.PackageIssue getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/Vulnerability.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/Vulnerability.java
index 096d7fa6ae81..49057ae7fb9c 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/Vulnerability.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/Vulnerability.java
@@ -35,9 +35,6 @@ private Vulnerability(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private Vulnerability(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 13: {
 
             cvssScore_ = input.readFloat();
@@ -69,13 +73,6 @@ private Vulnerability(
                 input.readMessage(io.grafeas.v1beta1.vulnerability.Vulnerability.Detail.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private Vulnerability(
     return io.grafeas.v1beta1.vulnerability.VulnerabilityOuterClass.internal_static_grafeas_v1beta1_vulnerability_Vulnerability_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.vulnerability.VulnerabilityOuterClass.internal_static_grafeas_v1beta1_vulnerability_Vulnerability_fieldAccessorTable
@@ -326,9 +322,6 @@ private Detail(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -340,6 +333,13 @@ private Detail(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -414,13 +414,6 @@ private Detail(
               isObsolete_ = input.readBool();
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -438,7 +431,6 @@ private Detail(
       return io.grafeas.v1beta1.vulnerability.VulnerabilityOuterClass.internal_static_grafeas_v1beta1_vulnerability_Vulnerability_Detail_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.vulnerability.VulnerabilityOuterClass.internal_static_grafeas_v1beta1_vulnerability_Vulnerability_Detail_fieldAccessorTable
@@ -776,7 +768,6 @@ public boolean getIsObsolete() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -786,7 +777,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getCpeUriBytes().isEmpty()) {
@@ -819,7 +809,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -1010,7 +999,6 @@ public static io.grafeas.v1beta1.vulnerability.Vulnerability.Detail parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -1018,7 +1006,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(io.grafeas.v1beta1.vulnerability.Vulnerability.Detail prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -1048,7 +1035,6 @@ public static final class Builder extends
         return io.grafeas.v1beta1.vulnerability.VulnerabilityOuterClass.internal_static_grafeas_v1beta1_vulnerability_Vulnerability_Detail_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return io.grafeas.v1beta1.vulnerability.VulnerabilityOuterClass.internal_static_grafeas_v1beta1_vulnerability_Vulnerability_Detail_fieldAccessorTable
@@ -1071,7 +1057,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         cpeUri_ = "";
@@ -1107,18 +1092,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return io.grafeas.v1beta1.vulnerability.VulnerabilityOuterClass.internal_static_grafeas_v1beta1_vulnerability_Vulnerability_Detail_descriptor;
       }
 
-      @java.lang.Override
       public io.grafeas.v1beta1.vulnerability.Vulnerability.Detail getDefaultInstanceForType() {
         return io.grafeas.v1beta1.vulnerability.Vulnerability.Detail.getDefaultInstance();
       }
 
-      @java.lang.Override
       public io.grafeas.v1beta1.vulnerability.Vulnerability.Detail build() {
         io.grafeas.v1beta1.vulnerability.Vulnerability.Detail result = buildPartial();
         if (!result.isInitialized()) {
@@ -1127,7 +1109,6 @@ public io.grafeas.v1beta1.vulnerability.Vulnerability.Detail build() {
         return result;
       }
 
-      @java.lang.Override
       public io.grafeas.v1beta1.vulnerability.Vulnerability.Detail buildPartial() {
         io.grafeas.v1beta1.vulnerability.Vulnerability.Detail result = new io.grafeas.v1beta1.vulnerability.Vulnerability.Detail(this);
         result.cpeUri_ = cpeUri_;
@@ -1155,39 +1136,32 @@ public io.grafeas.v1beta1.vulnerability.Vulnerability.Detail buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof io.grafeas.v1beta1.vulnerability.Vulnerability.Detail) {
           return mergeFrom((io.grafeas.v1beta1.vulnerability.Vulnerability.Detail)other);
@@ -1236,12 +1210,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.vulnerability.Vulnerability.Detail o
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2219,13 +2191,11 @@ public Builder clearIsObsolete() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -2247,12 +2217,11 @@ public static io.grafeas.v1beta1.vulnerability.Vulnerability.Detail getDefaultIn
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Detail parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Detail(input, extensionRegistry);
+          return new Detail(input, extensionRegistry);
       }
     };
 
@@ -2265,7 +2234,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.vulnerability.Vulnerability.Detail getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -2306,7 +2274,6 @@ public int getSeverityValue() {
    * .grafeas.v1beta1.vulnerability.Severity severity = 2;
    */
   public io.grafeas.v1beta1.vulnerability.Severity getSeverity() {
-    @SuppressWarnings("deprecation")
     io.grafeas.v1beta1.vulnerability.Severity result = io.grafeas.v1beta1.vulnerability.Severity.valueOf(severity_);
     return result == null ? io.grafeas.v1beta1.vulnerability.Severity.UNRECOGNIZED : result;
   }
@@ -2377,7 +2344,6 @@ public io.grafeas.v1beta1.vulnerability.Vulnerability.DetailOrBuilder getDetails
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -2387,7 +2353,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (cvssScore_ != 0F) {
@@ -2402,7 +2367,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -2538,7 +2502,6 @@ public static io.grafeas.v1beta1.vulnerability.Vulnerability parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -2546,7 +2509,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.vulnerability.Vulnerability prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -2574,7 +2536,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.vulnerability.VulnerabilityOuterClass.internal_static_grafeas_v1beta1_vulnerability_Vulnerability_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.vulnerability.VulnerabilityOuterClass.internal_static_grafeas_v1beta1_vulnerability_Vulnerability_fieldAccessorTable
@@ -2598,7 +2559,6 @@ private void maybeForceBuilderInitialization() {
         getDetailsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       cvssScore_ = 0F;
@@ -2614,18 +2574,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.vulnerability.VulnerabilityOuterClass.internal_static_grafeas_v1beta1_vulnerability_Vulnerability_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.vulnerability.Vulnerability getDefaultInstanceForType() {
       return io.grafeas.v1beta1.vulnerability.Vulnerability.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.vulnerability.Vulnerability build() {
       io.grafeas.v1beta1.vulnerability.Vulnerability result = buildPartial();
       if (!result.isInitialized()) {
@@ -2634,7 +2591,6 @@ public io.grafeas.v1beta1.vulnerability.Vulnerability build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.vulnerability.Vulnerability buildPartial() {
       io.grafeas.v1beta1.vulnerability.Vulnerability result = new io.grafeas.v1beta1.vulnerability.Vulnerability(this);
       int from_bitField0_ = bitField0_;
@@ -2655,39 +2611,32 @@ public io.grafeas.v1beta1.vulnerability.Vulnerability buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.vulnerability.Vulnerability) {
         return mergeFrom((io.grafeas.v1beta1.vulnerability.Vulnerability)other);
@@ -2736,12 +2685,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.vulnerability.Vulnerability other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2830,7 +2777,6 @@ public Builder setSeverityValue(int value) {
      * .grafeas.v1beta1.vulnerability.Severity severity = 2;
      */
     public io.grafeas.v1beta1.vulnerability.Severity getSeverity() {
-      @SuppressWarnings("deprecation")
       io.grafeas.v1beta1.vulnerability.Severity result = io.grafeas.v1beta1.vulnerability.Severity.valueOf(severity_);
       return result == null ? io.grafeas.v1beta1.vulnerability.Severity.UNRECOGNIZED : result;
     }
@@ -3211,13 +3157,11 @@ public io.grafeas.v1beta1.vulnerability.Vulnerability.Detail.Builder addDetailsB
       }
       return detailsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -3239,12 +3183,11 @@ public static io.grafeas.v1beta1.vulnerability.Vulnerability getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Vulnerability parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Vulnerability(input, extensionRegistry);
+        return new Vulnerability(input, extensionRegistry);
     }
   };
 
@@ -3257,7 +3200,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.vulnerability.Vulnerability getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/VulnerabilityLocation.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/VulnerabilityLocation.java
index 11f6fb2cf75b..e9667cd28ecb 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/VulnerabilityLocation.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/VulnerabilityLocation.java
@@ -34,9 +34,6 @@ private VulnerabilityLocation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private VulnerabilityLocation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private VulnerabilityLocation(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private VulnerabilityLocation(
     return io.grafeas.v1beta1.vulnerability.VulnerabilityOuterClass.internal_static_grafeas_v1beta1_vulnerability_VulnerabilityLocation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return io.grafeas.v1beta1.vulnerability.VulnerabilityOuterClass.internal_static_grafeas_v1beta1_vulnerability_VulnerabilityLocation_fieldAccessorTable
@@ -225,7 +221,6 @@ public io.grafeas.v1beta1.pkg.VersionOrBuilder getVersionOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -235,7 +230,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getCpeUriBytes().isEmpty()) {
@@ -250,7 +244,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -385,7 +378,6 @@ public static io.grafeas.v1beta1.vulnerability.VulnerabilityLocation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -393,7 +385,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(io.grafeas.v1beta1.vulnerability.VulnerabilityLocation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -421,7 +412,6 @@ public static final class Builder extends
       return io.grafeas.v1beta1.vulnerability.VulnerabilityOuterClass.internal_static_grafeas_v1beta1_vulnerability_VulnerabilityLocation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return io.grafeas.v1beta1.vulnerability.VulnerabilityOuterClass.internal_static_grafeas_v1beta1_vulnerability_VulnerabilityLocation_fieldAccessorTable
@@ -444,7 +434,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       cpeUri_ = "";
@@ -460,18 +449,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return io.grafeas.v1beta1.vulnerability.VulnerabilityOuterClass.internal_static_grafeas_v1beta1_vulnerability_VulnerabilityLocation_descriptor;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.vulnerability.VulnerabilityLocation getDefaultInstanceForType() {
       return io.grafeas.v1beta1.vulnerability.VulnerabilityLocation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.vulnerability.VulnerabilityLocation build() {
       io.grafeas.v1beta1.vulnerability.VulnerabilityLocation result = buildPartial();
       if (!result.isInitialized()) {
@@ -480,7 +466,6 @@ public io.grafeas.v1beta1.vulnerability.VulnerabilityLocation build() {
       return result;
     }
 
-    @java.lang.Override
     public io.grafeas.v1beta1.vulnerability.VulnerabilityLocation buildPartial() {
       io.grafeas.v1beta1.vulnerability.VulnerabilityLocation result = new io.grafeas.v1beta1.vulnerability.VulnerabilityLocation(this);
       result.cpeUri_ = cpeUri_;
@@ -494,39 +479,32 @@ public io.grafeas.v1beta1.vulnerability.VulnerabilityLocation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof io.grafeas.v1beta1.vulnerability.VulnerabilityLocation) {
         return mergeFrom((io.grafeas.v1beta1.vulnerability.VulnerabilityLocation)other);
@@ -554,12 +532,10 @@ public Builder mergeFrom(io.grafeas.v1beta1.vulnerability.VulnerabilityLocation
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -913,13 +889,11 @@ public io.grafeas.v1beta1.pkg.VersionOrBuilder getVersionOrBuilder() {
       }
       return versionBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -941,12 +915,11 @@ public static io.grafeas.v1beta1.vulnerability.VulnerabilityLocation getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public VulnerabilityLocation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VulnerabilityLocation(input, extensionRegistry);
+        return new VulnerabilityLocation(input, extensionRegistry);
     }
   };
 
@@ -959,7 +932,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public io.grafeas.v1beta1.vulnerability.VulnerabilityLocation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/VulnerabilityOuterClass.java b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/VulnerabilityOuterClass.java
index 7ad93a4a501e..6debbb1a8cdf 100644
--- a/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/VulnerabilityOuterClass.java
+++ b/google-api-grpc/proto-google-cloud-containeranalysis-v1beta1/src/main/java/io/grafeas/v1beta1/vulnerability/VulnerabilityOuterClass.java
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "\rVulnerability\022\022\n\ncvss_score\030\001 \001(\002\0229\n\010se" +
       "verity\030\002 \001(\0162\'.grafeas.v1beta1.vulnerabi" +
       "lity.Severity\022D\n\007details\030\003 \003(\01323.grafeas" +
-      ".v1beta1.vulnerability.Vulnerability.Det" +
+      ".v1beta1.vulnerability.Vulnerability.Det",
       "ail\032\317\002\n\006Detail\022\017\n\007cpe_uri\030\001 \001(\t\022\017\n\007packa" +
       "ge\030\002 \001(\t\022>\n\024min_affected_version\030\003 \001(\0132 " +
       ".grafeas.v1beta1.package.Version\022>\n\024max_" +
@@ -67,7 +67,7 @@ public static void registerAllExtensions(
       " \001(\01324.grafeas.v1beta1.vulnerability.Vul" +
       "nerabilityLocation\022\024\n\014package_type\030\010 \001(\t" +
       "\022\023\n\013is_obsolete\030\t \001(\010\"\222\002\n\007Details\022\014\n\004typ" +
-      "e\030\001 \001(\t\0229\n\010severity\030\002 \001(\0162\'.grafeas.v1be" +
+      "e\030\001 \001(\t\0229\n\010severity\030\002 \001(\0162\'.grafeas.v1be",
       "ta1.vulnerability.Severity\022\022\n\ncvss_score" +
       "\030\003 \001(\002\022B\n\rpackage_issue\030\004 \003(\0132+.grafeas." +
       "v1beta1.vulnerability.PackageIssue\022\031\n\021sh" +
@@ -77,7 +77,7 @@ public static void registerAllExtensions(
       "ffected_location\030\001 \001(\01324.grafeas.v1beta1" +
       ".vulnerability.VulnerabilityLocation\022L\n\016" +
       "fixed_location\030\002 \001(\01324.grafeas.v1beta1.v" +
-      "ulnerability.VulnerabilityLocation\022\025\n\rse" +
+      "ulnerability.VulnerabilityLocation\022\025\n\rse",
       "verity_name\030\003 \001(\t\"l\n\025VulnerabilityLocati" +
       "on\022\017\n\007cpe_uri\030\001 \001(\t\022\017\n\007package\030\002 \001(\t\0221\n\007" +
       "version\030\003 \001(\0132 .grafeas.v1beta1.package." +
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/AcceleratorConfig.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/AcceleratorConfig.java
index 5d0dbf428de3..116350ca2780 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/AcceleratorConfig.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/AcceleratorConfig.java
@@ -35,9 +35,6 @@ private AcceleratorConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private AcceleratorConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private AcceleratorConfig(
             acceleratorCount_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private AcceleratorConfig(
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_AcceleratorConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_AcceleratorConfig_fieldAccessorTable
@@ -160,7 +156,6 @@ public int getAcceleratorCount() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -170,7 +165,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getAcceleratorTypeUriBytes().isEmpty()) {
@@ -182,7 +176,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -305,7 +298,6 @@ public static com.google.cloud.dataproc.v1.AcceleratorConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -313,7 +305,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.AcceleratorConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -342,7 +333,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_AcceleratorConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_AcceleratorConfig_fieldAccessorTable
@@ -365,7 +355,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       acceleratorTypeUri_ = "";
@@ -375,18 +364,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_AcceleratorConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.AcceleratorConfig getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.AcceleratorConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.AcceleratorConfig build() {
       com.google.cloud.dataproc.v1.AcceleratorConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -395,7 +381,6 @@ public com.google.cloud.dataproc.v1.AcceleratorConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.AcceleratorConfig buildPartial() {
       com.google.cloud.dataproc.v1.AcceleratorConfig result = new com.google.cloud.dataproc.v1.AcceleratorConfig(this);
       result.acceleratorTypeUri_ = acceleratorTypeUri_;
@@ -404,39 +389,32 @@ public com.google.cloud.dataproc.v1.AcceleratorConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.AcceleratorConfig) {
         return mergeFrom((com.google.cloud.dataproc.v1.AcceleratorConfig)other);
@@ -460,12 +438,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.AcceleratorConfig other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -640,13 +616,11 @@ public Builder clearAcceleratorCount() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -668,12 +642,11 @@ public static com.google.cloud.dataproc.v1.AcceleratorConfig getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AcceleratorConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AcceleratorConfig(input, extensionRegistry);
+        return new AcceleratorConfig(input, extensionRegistry);
     }
   };
 
@@ -686,7 +659,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.AcceleratorConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/CancelJobRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/CancelJobRequest.java
index 5ed29c4a3932..da4be2103c54 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/CancelJobRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/CancelJobRequest.java
@@ -35,9 +35,6 @@ private CancelJobRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private CancelJobRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -67,13 +71,6 @@ private CancelJobRequest(
             region_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private CancelJobRequest(
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_CancelJobRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_CancelJobRequest_fieldAccessorTable
@@ -228,7 +224,6 @@ public java.lang.String getJobId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -238,7 +233,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -253,7 +247,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -382,7 +375,6 @@ public static com.google.cloud.dataproc.v1.CancelJobRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -390,7 +382,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.CancelJobRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -418,7 +409,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_CancelJobRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_CancelJobRequest_fieldAccessorTable
@@ -441,7 +431,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -453,18 +442,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_CancelJobRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.CancelJobRequest getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.CancelJobRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.CancelJobRequest build() {
       com.google.cloud.dataproc.v1.CancelJobRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -473,7 +459,6 @@ public com.google.cloud.dataproc.v1.CancelJobRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.CancelJobRequest buildPartial() {
       com.google.cloud.dataproc.v1.CancelJobRequest result = new com.google.cloud.dataproc.v1.CancelJobRequest(this);
       result.projectId_ = projectId_;
@@ -483,39 +468,32 @@ public com.google.cloud.dataproc.v1.CancelJobRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.CancelJobRequest) {
         return mergeFrom((com.google.cloud.dataproc.v1.CancelJobRequest)other);
@@ -544,12 +522,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.CancelJobRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -839,13 +815,11 @@ public Builder setJobIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -867,12 +841,11 @@ public static com.google.cloud.dataproc.v1.CancelJobRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CancelJobRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CancelJobRequest(input, extensionRegistry);
+        return new CancelJobRequest(input, extensionRegistry);
     }
   };
 
@@ -885,7 +858,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.CancelJobRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/Cluster.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/Cluster.java
index 8bdae40576aa..a81008fb2409 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/Cluster.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/Cluster.java
@@ -37,9 +37,6 @@ private Cluster(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private Cluster(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -130,13 +134,6 @@ private Cluster(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -158,7 +155,6 @@ private Cluster(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -169,7 +165,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_Cluster_fieldAccessorTable
@@ -584,7 +579,6 @@ public com.google.cloud.dataproc.v1.ClusterMetricsOrBuilder getMetricsOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -594,7 +588,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -627,7 +620,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -821,7 +813,6 @@ public static com.google.cloud.dataproc.v1.Cluster parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -829,7 +820,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.Cluster prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -880,7 +870,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_Cluster_fieldAccessorTable
@@ -904,7 +893,6 @@ private void maybeForceBuilderInitialization() {
         getStatusHistoryFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -941,18 +929,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_Cluster_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.Cluster getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.Cluster.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.Cluster build() {
       com.google.cloud.dataproc.v1.Cluster result = buildPartial();
       if (!result.isInitialized()) {
@@ -961,7 +946,6 @@ public com.google.cloud.dataproc.v1.Cluster build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.Cluster buildPartial() {
       com.google.cloud.dataproc.v1.Cluster result = new com.google.cloud.dataproc.v1.Cluster(this);
       int from_bitField0_ = bitField0_;
@@ -1000,39 +984,32 @@ public com.google.cloud.dataproc.v1.Cluster buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.Cluster) {
         return mergeFrom((com.google.cloud.dataproc.v1.Cluster)other);
@@ -1098,12 +1075,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.Cluster other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2383,13 +2358,11 @@ public com.google.cloud.dataproc.v1.ClusterMetricsOrBuilder getMetricsOrBuilder(
       }
       return metricsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2411,12 +2384,11 @@ public static com.google.cloud.dataproc.v1.Cluster getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Cluster parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Cluster(input, extensionRegistry);
+        return new Cluster(input, extensionRegistry);
     }
   };
 
@@ -2429,7 +2401,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.Cluster getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClusterConfig.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClusterConfig.java
index 4fb1f652f91f..33e6b489464b 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClusterConfig.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClusterConfig.java
@@ -34,9 +34,6 @@ private ClusterConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ClusterConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -128,13 +132,6 @@ private ClusterConfig(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -155,7 +152,6 @@ private ClusterConfig(
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_ClusterConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_ClusterConfig_fieldAccessorTable
@@ -494,7 +490,6 @@ public com.google.cloud.dataproc.v1.NodeInitializationActionOrBuilder getInitial
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -504,7 +499,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getConfigBucketBytes().isEmpty()) {
@@ -531,7 +525,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -721,7 +714,6 @@ public static com.google.cloud.dataproc.v1.ClusterConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -729,7 +721,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.ClusterConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -757,7 +748,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_ClusterConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_ClusterConfig_fieldAccessorTable
@@ -781,7 +771,6 @@ private void maybeForceBuilderInitialization() {
         getInitializationActionsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       configBucket_ = "";
@@ -825,18 +814,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_ClusterConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.ClusterConfig getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.ClusterConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.ClusterConfig build() {
       com.google.cloud.dataproc.v1.ClusterConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -845,7 +831,6 @@ public com.google.cloud.dataproc.v1.ClusterConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.ClusterConfig buildPartial() {
       com.google.cloud.dataproc.v1.ClusterConfig result = new com.google.cloud.dataproc.v1.ClusterConfig(this);
       int from_bitField0_ = bitField0_;
@@ -890,39 +875,32 @@ public com.google.cloud.dataproc.v1.ClusterConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.ClusterConfig) {
         return mergeFrom((com.google.cloud.dataproc.v1.ClusterConfig)other);
@@ -984,12 +962,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.ClusterConfig other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2397,13 +2373,11 @@ public com.google.cloud.dataproc.v1.NodeInitializationAction.Builder addInitiali
       }
       return initializationActionsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2425,12 +2399,11 @@ public static com.google.cloud.dataproc.v1.ClusterConfig getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ClusterConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ClusterConfig(input, extensionRegistry);
+        return new ClusterConfig(input, extensionRegistry);
     }
   };
 
@@ -2443,7 +2416,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.ClusterConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClusterMetrics.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClusterMetrics.java
index 57156f78a03a..893f77da9ba9 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClusterMetrics.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClusterMetrics.java
@@ -34,9 +34,6 @@ private ClusterMetrics(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ClusterMetrics(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               hdfsMetrics_ = com.google.protobuf.MapField.newMapField(
@@ -74,13 +78,6 @@ private ClusterMetrics(
                 yarnMetrics__.getKey(), yarnMetrics__.getValue());
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -99,7 +96,6 @@ private ClusterMetrics(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -112,7 +108,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_ClusterMetrics_fieldAccessorTable
@@ -305,7 +300,6 @@ public long getYarnMetricsOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -315,7 +309,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     com.google.protobuf.GeneratedMessageV3
@@ -333,7 +326,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -473,7 +465,6 @@ public static com.google.cloud.dataproc.v1.ClusterMetrics parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -481,7 +472,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.ClusterMetrics prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -537,7 +527,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_ClusterMetrics_fieldAccessorTable
@@ -560,7 +549,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       internalGetMutableHdfsMetrics().clear();
@@ -568,18 +556,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_ClusterMetrics_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.ClusterMetrics getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.ClusterMetrics.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.ClusterMetrics build() {
       com.google.cloud.dataproc.v1.ClusterMetrics result = buildPartial();
       if (!result.isInitialized()) {
@@ -588,7 +573,6 @@ public com.google.cloud.dataproc.v1.ClusterMetrics build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.ClusterMetrics buildPartial() {
       com.google.cloud.dataproc.v1.ClusterMetrics result = new com.google.cloud.dataproc.v1.ClusterMetrics(this);
       int from_bitField0_ = bitField0_;
@@ -600,39 +584,32 @@ public com.google.cloud.dataproc.v1.ClusterMetrics buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.ClusterMetrics) {
         return mergeFrom((com.google.cloud.dataproc.v1.ClusterMetrics)other);
@@ -653,12 +630,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.ClusterMetrics other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -979,13 +954,11 @@ public Builder putAllYarnMetrics(
           .putAll(values);
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1007,12 +980,11 @@ public static com.google.cloud.dataproc.v1.ClusterMetrics getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ClusterMetrics parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ClusterMetrics(input, extensionRegistry);
+        return new ClusterMetrics(input, extensionRegistry);
     }
   };
 
@@ -1025,7 +997,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.ClusterMetrics getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClusterOperationMetadata.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClusterOperationMetadata.java
index 9ffe26e17e5d..2e90904ea0dd 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClusterOperationMetadata.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClusterOperationMetadata.java
@@ -38,9 +38,6 @@ private ClusterOperationMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private ClusterOperationMetadata(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 58: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -120,13 +124,6 @@ private ClusterOperationMetadata(
             warnings_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -151,7 +148,6 @@ private ClusterOperationMetadata(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -162,7 +158,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.OperationsProto.internal_static_google_cloud_dataproc_v1_ClusterOperationMetadata_fieldAccessorTable
@@ -565,7 +560,6 @@ public java.lang.String getWarnings(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -575,7 +569,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getClusterNameBytes().isEmpty()) {
@@ -608,7 +601,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -797,7 +789,6 @@ public static com.google.cloud.dataproc.v1.ClusterOperationMetadata parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -805,7 +796,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.ClusterOperationMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -855,7 +845,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.OperationsProto.internal_static_google_cloud_dataproc_v1_ClusterOperationMetadata_fieldAccessorTable
@@ -879,7 +868,6 @@ private void maybeForceBuilderInitialization() {
         getStatusHistoryFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       clusterName_ = "";
@@ -908,18 +896,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.OperationsProto.internal_static_google_cloud_dataproc_v1_ClusterOperationMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.ClusterOperationMetadata getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.ClusterOperationMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.ClusterOperationMetadata build() {
       com.google.cloud.dataproc.v1.ClusterOperationMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -928,7 +913,6 @@ public com.google.cloud.dataproc.v1.ClusterOperationMetadata build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.ClusterOperationMetadata buildPartial() {
       com.google.cloud.dataproc.v1.ClusterOperationMetadata result = new com.google.cloud.dataproc.v1.ClusterOperationMetadata(this);
       int from_bitField0_ = bitField0_;
@@ -963,39 +947,32 @@ public com.google.cloud.dataproc.v1.ClusterOperationMetadata buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.ClusterOperationMetadata) {
         return mergeFrom((com.google.cloud.dataproc.v1.ClusterOperationMetadata)other);
@@ -1069,12 +1046,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.ClusterOperationMetadata o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2195,13 +2170,11 @@ public Builder addWarningsBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2223,12 +2196,11 @@ public static com.google.cloud.dataproc.v1.ClusterOperationMetadata getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ClusterOperationMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ClusterOperationMetadata(input, extensionRegistry);
+        return new ClusterOperationMetadata(input, extensionRegistry);
     }
   };
 
@@ -2241,7 +2213,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.ClusterOperationMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClusterOperationStatus.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClusterOperationStatus.java
index 2891ea1d9fce..3fd10cb74ea2 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClusterOperationStatus.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClusterOperationStatus.java
@@ -35,9 +35,6 @@ private ClusterOperationStatus(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ClusterOperationStatus(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -80,13 +84,6 @@ private ClusterOperationStatus(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private ClusterOperationStatus(
     return com.google.cloud.dataproc.v1.OperationsProto.internal_static_google_cloud_dataproc_v1_ClusterOperationStatus_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.OperationsProto.internal_static_google_cloud_dataproc_v1_ClusterOperationStatus_fieldAccessorTable
@@ -284,7 +280,6 @@ public int getStateValue() {
    * .google.cloud.dataproc.v1.ClusterOperationStatus.State state = 1;
    */
   public com.google.cloud.dataproc.v1.ClusterOperationStatus.State getState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dataproc.v1.ClusterOperationStatus.State result = com.google.cloud.dataproc.v1.ClusterOperationStatus.State.valueOf(state_);
     return result == null ? com.google.cloud.dataproc.v1.ClusterOperationStatus.State.UNRECOGNIZED : result;
   }
@@ -407,7 +402,6 @@ public com.google.protobuf.TimestampOrBuilder getStateStartTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -417,7 +411,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (state_ != com.google.cloud.dataproc.v1.ClusterOperationStatus.State.UNKNOWN.getNumber()) {
@@ -435,7 +428,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -577,7 +569,6 @@ public static com.google.cloud.dataproc.v1.ClusterOperationStatus parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -585,7 +576,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.ClusterOperationStatus prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -613,7 +603,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1.OperationsProto.internal_static_google_cloud_dataproc_v1_ClusterOperationStatus_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.OperationsProto.internal_static_google_cloud_dataproc_v1_ClusterOperationStatus_fieldAccessorTable
@@ -636,7 +625,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       state_ = 0;
@@ -654,18 +642,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.OperationsProto.internal_static_google_cloud_dataproc_v1_ClusterOperationStatus_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.ClusterOperationStatus getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.ClusterOperationStatus.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.ClusterOperationStatus build() {
       com.google.cloud.dataproc.v1.ClusterOperationStatus result = buildPartial();
       if (!result.isInitialized()) {
@@ -674,7 +659,6 @@ public com.google.cloud.dataproc.v1.ClusterOperationStatus build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.ClusterOperationStatus buildPartial() {
       com.google.cloud.dataproc.v1.ClusterOperationStatus result = new com.google.cloud.dataproc.v1.ClusterOperationStatus(this);
       result.state_ = state_;
@@ -689,39 +673,32 @@ public com.google.cloud.dataproc.v1.ClusterOperationStatus buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.ClusterOperationStatus) {
         return mergeFrom((com.google.cloud.dataproc.v1.ClusterOperationStatus)other);
@@ -752,12 +729,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.ClusterOperationStatus oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -807,7 +782,6 @@ public Builder setStateValue(int value) {
      * .google.cloud.dataproc.v1.ClusterOperationStatus.State state = 1;
      */
     public com.google.cloud.dataproc.v1.ClusterOperationStatus.State getState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dataproc.v1.ClusterOperationStatus.State result = com.google.cloud.dataproc.v1.ClusterOperationStatus.State.valueOf(state_);
       return result == null ? com.google.cloud.dataproc.v1.ClusterOperationStatus.State.UNRECOGNIZED : result;
     }
@@ -1171,13 +1145,11 @@ public com.google.protobuf.TimestampOrBuilder getStateStartTimeOrBuilder() {
       }
       return stateStartTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1199,12 +1171,11 @@ public static com.google.cloud.dataproc.v1.ClusterOperationStatus getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ClusterOperationStatus parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ClusterOperationStatus(input, extensionRegistry);
+        return new ClusterOperationStatus(input, extensionRegistry);
     }
   };
 
@@ -1217,7 +1188,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.ClusterOperationStatus getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClusterStatus.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClusterStatus.java
index 6ea4de8f56bb..0ac29ad67d88 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClusterStatus.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClusterStatus.java
@@ -35,9 +35,6 @@ private ClusterStatus(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ClusterStatus(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -80,13 +84,6 @@ private ClusterStatus(
             substate_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private ClusterStatus(
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_ClusterStatus_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_ClusterStatus_fieldAccessorTable
@@ -451,7 +447,6 @@ public int getStateValue() {
    * .google.cloud.dataproc.v1.ClusterStatus.State state = 1;
    */
   public com.google.cloud.dataproc.v1.ClusterStatus.State getState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dataproc.v1.ClusterStatus.State result = com.google.cloud.dataproc.v1.ClusterStatus.State.valueOf(state_);
     return result == null ? com.google.cloud.dataproc.v1.ClusterStatus.State.UNRECOGNIZED : result;
   }
@@ -553,13 +548,11 @@ public int getSubstateValue() {
    * .google.cloud.dataproc.v1.ClusterStatus.Substate substate = 4;
    */
   public com.google.cloud.dataproc.v1.ClusterStatus.Substate getSubstate() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dataproc.v1.ClusterStatus.Substate result = com.google.cloud.dataproc.v1.ClusterStatus.Substate.valueOf(substate_);
     return result == null ? com.google.cloud.dataproc.v1.ClusterStatus.Substate.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -569,7 +562,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (state_ != com.google.cloud.dataproc.v1.ClusterStatus.State.UNKNOWN.getNumber()) {
@@ -587,7 +579,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -729,7 +720,6 @@ public static com.google.cloud.dataproc.v1.ClusterStatus parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -737,7 +727,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.ClusterStatus prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -765,7 +754,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_ClusterStatus_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_ClusterStatus_fieldAccessorTable
@@ -788,7 +776,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       state_ = 0;
@@ -806,18 +793,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_ClusterStatus_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.ClusterStatus getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.ClusterStatus.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.ClusterStatus build() {
       com.google.cloud.dataproc.v1.ClusterStatus result = buildPartial();
       if (!result.isInitialized()) {
@@ -826,7 +810,6 @@ public com.google.cloud.dataproc.v1.ClusterStatus build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.ClusterStatus buildPartial() {
       com.google.cloud.dataproc.v1.ClusterStatus result = new com.google.cloud.dataproc.v1.ClusterStatus(this);
       result.state_ = state_;
@@ -841,39 +824,32 @@ public com.google.cloud.dataproc.v1.ClusterStatus buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.ClusterStatus) {
         return mergeFrom((com.google.cloud.dataproc.v1.ClusterStatus)other);
@@ -903,12 +879,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.ClusterStatus other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -958,7 +932,6 @@ public Builder setStateValue(int value) {
      * .google.cloud.dataproc.v1.ClusterStatus.State state = 1;
      */
     public com.google.cloud.dataproc.v1.ClusterStatus.State getState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dataproc.v1.ClusterStatus.State result = com.google.cloud.dataproc.v1.ClusterStatus.State.valueOf(state_);
       return result == null ? com.google.cloud.dataproc.v1.ClusterStatus.State.UNRECOGNIZED : result;
     }
@@ -1268,7 +1241,6 @@ public Builder setSubstateValue(int value) {
      * .google.cloud.dataproc.v1.ClusterStatus.Substate substate = 4;
      */
     public com.google.cloud.dataproc.v1.ClusterStatus.Substate getSubstate() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dataproc.v1.ClusterStatus.Substate result = com.google.cloud.dataproc.v1.ClusterStatus.Substate.valueOf(substate_);
       return result == null ? com.google.cloud.dataproc.v1.ClusterStatus.Substate.UNRECOGNIZED : result;
     }
@@ -1303,13 +1275,11 @@ public Builder clearSubstate() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1331,12 +1301,11 @@ public static com.google.cloud.dataproc.v1.ClusterStatus getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ClusterStatus parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ClusterStatus(input, extensionRegistry);
+        return new ClusterStatus(input, extensionRegistry);
     }
   };
 
@@ -1349,7 +1318,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.ClusterStatus getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClustersProto.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClustersProto.java
index 77bdf564b851..fd671c10eb5d 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClustersProto.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ClustersProto.java
@@ -152,7 +152,7 @@ public static void registerAllExtensions(
       "oto\032\037google/protobuf/timestamp.proto\"\245\003\n" +
       "\007Cluster\022\022\n\nproject_id\030\001 \001(\t\022\024\n\014cluster_" +
       "name\030\002 \001(\t\0227\n\006config\030\003 \001(\0132\'.google.clou" +
-      "d.dataproc.v1.ClusterConfig\022=\n\006labels\030\010 " +
+      "d.dataproc.v1.ClusterConfig\022=\n\006labels\030\010 ",
       "\003(\0132-.google.cloud.dataproc.v1.Cluster.L" +
       "abelsEntry\0227\n\006status\030\004 \001(\0132\'.google.clou" +
       "d.dataproc.v1.ClusterStatus\022?\n\016status_hi" +
@@ -162,7 +162,7 @@ public static void registerAllExtensions(
       "lusterMetrics\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(" +
       "\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\341\003\n\rClusterConfig\022\025" +
       "\n\rconfig_bucket\030\001 \001(\t\022F\n\022gce_cluster_con" +
-      "fig\030\010 \001(\0132*.google.cloud.dataproc.v1.Gce" +
+      "fig\030\010 \001(\0132*.google.cloud.dataproc.v1.Gce",
       "ClusterConfig\022D\n\rmaster_config\030\t \001(\0132-.g" +
       "oogle.cloud.dataproc.v1.InstanceGroupCon" +
       "fig\022D\n\rworker_config\030\n \001(\0132-.google.clou" +
@@ -172,7 +172,7 @@ public static void registerAllExtensions(
       "tware_config\030\r \001(\0132(.google.cloud.datapr" +
       "oc.v1.SoftwareConfig\022R\n\026initialization_a" +
       "ctions\030\013 \003(\01322.google.cloud.dataproc.v1." +
-      "NodeInitializationAction\"\257\002\n\020GceClusterC" +
+      "NodeInitializationAction\"\257\002\n\020GceClusterC",
       "onfig\022\020\n\010zone_uri\030\001 \001(\t\022\023\n\013network_uri\030\002" +
       " \001(\t\022\026\n\016subnetwork_uri\030\006 \001(\t\022\030\n\020internal" +
       "_ip_only\030\007 \001(\010\022\027\n\017service_account\030\010 \001(\t\022" +
@@ -182,7 +182,7 @@ public static void registerAllExtensions(
       "y\032/\n\rMetadataEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value" +
       "\030\002 \001(\t:\0028\001\"\323\002\n\023InstanceGroupConfig\022\025\n\rnu" +
       "m_instances\030\001 \001(\005\022\026\n\016instance_names\030\002 \003(" +
-      "\t\022\021\n\timage_uri\030\003 \001(\t\022\030\n\020machine_type_uri" +
+      "\t\022\021\n\timage_uri\030\003 \001(\t\022\030\n\020machine_type_uri",
       "\030\004 \001(\t\0229\n\013disk_config\030\005 \001(\0132$.google.clo" +
       "ud.dataproc.v1.DiskConfig\022\026\n\016is_preempti" +
       "ble\030\006 \001(\010\022J\n\024managed_group_config\030\007 \001(\0132" +
@@ -192,7 +192,7 @@ public static void registerAllExtensions(
       "gedGroupConfig\022\036\n\026instance_template_name" +
       "\030\001 \001(\t\022#\n\033instance_group_manager_name\030\002 " +
       "\001(\t\"L\n\021AcceleratorConfig\022\034\n\024accelerator_" +
-      "type_uri\030\001 \001(\t\022\031\n\021accelerator_count\030\002 \001(" +
+      "type_uri\030\001 \001(\t\022\031\n\021accelerator_count\030\002 \001(",
       "\005\"?\n\nDiskConfig\022\031\n\021boot_disk_size_gb\030\001 \001" +
       "(\005\022\026\n\016num_local_ssds\030\002 \001(\005\"i\n\030NodeInitia" +
       "lizationAction\022\027\n\017executable_file\030\001 \001(\t\022" +
@@ -202,7 +202,7 @@ public static void registerAllExtensions(
       "rStatus.State\022\016\n\006detail\030\002 \001(\t\0224\n\020state_s" +
       "tart_time\030\003 \001(\0132\032.google.protobuf.Timest" +
       "amp\022B\n\010substate\030\004 \001(\01620.google.cloud.dat" +
-      "aproc.v1.ClusterStatus.Substate\"V\n\005State" +
+      "aproc.v1.ClusterStatus.Substate\"V\n\005State",
       "\022\013\n\007UNKNOWN\020\000\022\014\n\010CREATING\020\001\022\013\n\007RUNNING\020\002" +
       "\022\t\n\005ERROR\020\003\022\014\n\010DELETING\020\004\022\014\n\010UPDATING\020\005\"" +
       "<\n\010Substate\022\017\n\013UNSPECIFIED\020\000\022\r\n\tUNHEALTH" +
@@ -212,7 +212,7 @@ public static void registerAllExtensions(
       "onfig.PropertiesEntry\0321\n\017PropertiesEntry" +
       "\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\232\002\n\016Clu" +
       "sterMetrics\022O\n\014hdfs_metrics\030\001 \003(\01329.goog" +
-      "le.cloud.dataproc.v1.ClusterMetrics.Hdfs" +
+      "le.cloud.dataproc.v1.ClusterMetrics.Hdfs",
       "MetricsEntry\022O\n\014yarn_metrics\030\002 \003(\01329.goo" +
       "gle.cloud.dataproc.v1.ClusterMetrics.Yar" +
       "nMetricsEntry\0322\n\020HdfsMetricsEntry\022\013\n\003key" +
@@ -222,7 +222,7 @@ public static void registerAllExtensions(
       "\t\022\016\n\006region\030\003 \001(\t\0222\n\007cluster\030\002 \001(\0132!.goo" +
       "gle.cloud.dataproc.v1.Cluster\"\265\001\n\024Update" +
       "ClusterRequest\022\022\n\nproject_id\030\001 \001(\t\022\016\n\006re" +
-      "gion\030\005 \001(\t\022\024\n\014cluster_name\030\002 \001(\t\0222\n\007clus" +
+      "gion\030\005 \001(\t\022\024\n\014cluster_name\030\002 \001(\t\0222\n\007clus",
       "ter\030\003 \001(\0132!.google.cloud.dataproc.v1.Clu" +
       "ster\022/\n\013update_mask\030\004 \001(\0132\032.google.proto" +
       "buf.FieldMask\"P\n\024DeleteClusterRequest\022\022\n" +
@@ -232,7 +232,7 @@ public static void registerAllExtensions(
       "ter_name\030\002 \001(\t\"p\n\023ListClustersRequest\022\022\n" +
       "\nproject_id\030\001 \001(\t\022\016\n\006region\030\004 \001(\t\022\016\n\006fil" +
       "ter\030\005 \001(\t\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_tok" +
-      "en\030\003 \001(\t\"d\n\024ListClustersResponse\0223\n\010clus" +
+      "en\030\003 \001(\t\"d\n\024ListClustersResponse\0223\n\010clus",
       "ters\030\001 \003(\0132!.google.cloud.dataproc.v1.Cl" +
       "uster\022\027\n\017next_page_token\030\002 \001(\t\"R\n\026Diagno" +
       "seClusterRequest\022\022\n\nproject_id\030\001 \001(\t\022\016\n\006" +
@@ -242,7 +242,7 @@ public static void registerAllExtensions(
       "\022..google.cloud.dataproc.v1.CreateCluste" +
       "rRequest\032\035.google.longrunning.Operation\"" +
       "D\202\323\344\223\002>\"3/v1/projects/{project_id}/regio" +
-      "ns/{region}/clusters:\007cluster\022\263\001\n\rUpdate" +
+      "ns/{region}/clusters:\007cluster\022\263\001\n\rUpdate",
       "Cluster\022..google.cloud.dataproc.v1.Updat" +
       "eClusterRequest\032\035.google.longrunning.Ope" +
       "ration\"S\202\323\344\223\002M2B/v1/projects/{project_id" +
@@ -252,7 +252,7 @@ public static void registerAllExtensions(
       "google.longrunning.Operation\"J\202\323\344\223\002D*B/v" +
       "1/projects/{project_id}/regions/{region}" +
       "/clusters/{cluster_name}\022\250\001\n\nGetCluster\022" +
-      "+.google.cloud.dataproc.v1.GetClusterReq" +
+      "+.google.cloud.dataproc.v1.GetClusterReq",
       "uest\032!.google.cloud.dataproc.v1.Cluster\"" +
       "J\202\323\344\223\002D\022B/v1/projects/{project_id}/regio" +
       "ns/{region}/clusters/{cluster_name}\022\252\001\n\014" +
@@ -262,7 +262,7 @@ public static void registerAllExtensions(
       "/projects/{project_id}/regions/{region}/" +
       "clusters\022\272\001\n\017DiagnoseCluster\0220.google.cl" +
       "oud.dataproc.v1.DiagnoseClusterRequest\032\035" +
-      ".google.longrunning.Operation\"V\202\323\344\223\002P\"K/" +
+      ".google.longrunning.Operation\"V\202\323\344\223\002P\"K/",
       "v1/projects/{project_id}/regions/{region" +
       "}/clusters/{cluster_name}:diagnose:\001*Bq\n" +
       "\034com.google.cloud.dataproc.v1B\rClustersP" +
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/CreateClusterRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/CreateClusterRequest.java
index 24628270daa2..e3c573770678 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/CreateClusterRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/CreateClusterRequest.java
@@ -34,9 +34,6 @@ private CreateClusterRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private CreateClusterRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private CreateClusterRequest(
             region_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private CreateClusterRequest(
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_CreateClusterRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_CreateClusterRequest_fieldAccessorTable
@@ -225,7 +221,6 @@ public com.google.cloud.dataproc.v1.ClusterOrBuilder getClusterOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -235,7 +230,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -250,7 +244,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -385,7 +378,6 @@ public static com.google.cloud.dataproc.v1.CreateClusterRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -393,7 +385,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.CreateClusterRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -421,7 +412,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_CreateClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_CreateClusterRequest_fieldAccessorTable
@@ -444,7 +434,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -460,18 +449,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_CreateClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.CreateClusterRequest getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.CreateClusterRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.CreateClusterRequest build() {
       com.google.cloud.dataproc.v1.CreateClusterRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -480,7 +466,6 @@ public com.google.cloud.dataproc.v1.CreateClusterRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.CreateClusterRequest buildPartial() {
       com.google.cloud.dataproc.v1.CreateClusterRequest result = new com.google.cloud.dataproc.v1.CreateClusterRequest(this);
       result.projectId_ = projectId_;
@@ -494,39 +479,32 @@ public com.google.cloud.dataproc.v1.CreateClusterRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.CreateClusterRequest) {
         return mergeFrom((com.google.cloud.dataproc.v1.CreateClusterRequest)other);
@@ -554,12 +532,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.CreateClusterRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -913,13 +889,11 @@ public com.google.cloud.dataproc.v1.ClusterOrBuilder getClusterOrBuilder() {
       }
       return clusterBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -941,12 +915,11 @@ public static com.google.cloud.dataproc.v1.CreateClusterRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateClusterRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateClusterRequest(input, extensionRegistry);
+        return new CreateClusterRequest(input, extensionRegistry);
     }
   };
 
@@ -959,7 +932,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.CreateClusterRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DeleteClusterRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DeleteClusterRequest.java
index 9d4fdf59cd00..9f7a0f19681c 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DeleteClusterRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DeleteClusterRequest.java
@@ -35,9 +35,6 @@ private DeleteClusterRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private DeleteClusterRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -67,13 +71,6 @@ private DeleteClusterRequest(
             region_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private DeleteClusterRequest(
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_DeleteClusterRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_DeleteClusterRequest_fieldAccessorTable
@@ -228,7 +224,6 @@ public java.lang.String getClusterName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -238,7 +233,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -253,7 +247,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -382,7 +375,6 @@ public static com.google.cloud.dataproc.v1.DeleteClusterRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -390,7 +382,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.DeleteClusterRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -418,7 +409,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_DeleteClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_DeleteClusterRequest_fieldAccessorTable
@@ -441,7 +431,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -453,18 +442,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_DeleteClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.DeleteClusterRequest getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.DeleteClusterRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.DeleteClusterRequest build() {
       com.google.cloud.dataproc.v1.DeleteClusterRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -473,7 +459,6 @@ public com.google.cloud.dataproc.v1.DeleteClusterRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.DeleteClusterRequest buildPartial() {
       com.google.cloud.dataproc.v1.DeleteClusterRequest result = new com.google.cloud.dataproc.v1.DeleteClusterRequest(this);
       result.projectId_ = projectId_;
@@ -483,39 +468,32 @@ public com.google.cloud.dataproc.v1.DeleteClusterRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.DeleteClusterRequest) {
         return mergeFrom((com.google.cloud.dataproc.v1.DeleteClusterRequest)other);
@@ -544,12 +522,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.DeleteClusterRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -839,13 +815,11 @@ public Builder setClusterNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -867,12 +841,11 @@ public static com.google.cloud.dataproc.v1.DeleteClusterRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteClusterRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteClusterRequest(input, extensionRegistry);
+        return new DeleteClusterRequest(input, extensionRegistry);
     }
   };
 
@@ -885,7 +858,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.DeleteClusterRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DeleteJobRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DeleteJobRequest.java
index 098669967326..ebbbaf2b8eef 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DeleteJobRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DeleteJobRequest.java
@@ -35,9 +35,6 @@ private DeleteJobRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private DeleteJobRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -67,13 +71,6 @@ private DeleteJobRequest(
             region_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private DeleteJobRequest(
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_DeleteJobRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_DeleteJobRequest_fieldAccessorTable
@@ -228,7 +224,6 @@ public java.lang.String getJobId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -238,7 +233,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -253,7 +247,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -382,7 +375,6 @@ public static com.google.cloud.dataproc.v1.DeleteJobRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -390,7 +382,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.DeleteJobRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -418,7 +409,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_DeleteJobRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_DeleteJobRequest_fieldAccessorTable
@@ -441,7 +431,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -453,18 +442,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_DeleteJobRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.DeleteJobRequest getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.DeleteJobRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.DeleteJobRequest build() {
       com.google.cloud.dataproc.v1.DeleteJobRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -473,7 +459,6 @@ public com.google.cloud.dataproc.v1.DeleteJobRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.DeleteJobRequest buildPartial() {
       com.google.cloud.dataproc.v1.DeleteJobRequest result = new com.google.cloud.dataproc.v1.DeleteJobRequest(this);
       result.projectId_ = projectId_;
@@ -483,39 +468,32 @@ public com.google.cloud.dataproc.v1.DeleteJobRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.DeleteJobRequest) {
         return mergeFrom((com.google.cloud.dataproc.v1.DeleteJobRequest)other);
@@ -544,12 +522,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.DeleteJobRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -839,13 +815,11 @@ public Builder setJobIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -867,12 +841,11 @@ public static com.google.cloud.dataproc.v1.DeleteJobRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteJobRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteJobRequest(input, extensionRegistry);
+        return new DeleteJobRequest(input, extensionRegistry);
     }
   };
 
@@ -885,7 +858,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.DeleteJobRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DiagnoseClusterRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DiagnoseClusterRequest.java
index 7e1cb166de31..ee3f6886fc6a 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DiagnoseClusterRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DiagnoseClusterRequest.java
@@ -35,9 +35,6 @@ private DiagnoseClusterRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private DiagnoseClusterRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -67,13 +71,6 @@ private DiagnoseClusterRequest(
             region_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private DiagnoseClusterRequest(
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_DiagnoseClusterRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_DiagnoseClusterRequest_fieldAccessorTable
@@ -228,7 +224,6 @@ public java.lang.String getClusterName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -238,7 +233,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -253,7 +247,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -382,7 +375,6 @@ public static com.google.cloud.dataproc.v1.DiagnoseClusterRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -390,7 +382,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.DiagnoseClusterRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -418,7 +409,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_DiagnoseClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_DiagnoseClusterRequest_fieldAccessorTable
@@ -441,7 +431,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -453,18 +442,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_DiagnoseClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.DiagnoseClusterRequest getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.DiagnoseClusterRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.DiagnoseClusterRequest build() {
       com.google.cloud.dataproc.v1.DiagnoseClusterRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -473,7 +459,6 @@ public com.google.cloud.dataproc.v1.DiagnoseClusterRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.DiagnoseClusterRequest buildPartial() {
       com.google.cloud.dataproc.v1.DiagnoseClusterRequest result = new com.google.cloud.dataproc.v1.DiagnoseClusterRequest(this);
       result.projectId_ = projectId_;
@@ -483,39 +468,32 @@ public com.google.cloud.dataproc.v1.DiagnoseClusterRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.DiagnoseClusterRequest) {
         return mergeFrom((com.google.cloud.dataproc.v1.DiagnoseClusterRequest)other);
@@ -544,12 +522,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.DiagnoseClusterRequest oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -839,13 +815,11 @@ public Builder setClusterNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -867,12 +841,11 @@ public static com.google.cloud.dataproc.v1.DiagnoseClusterRequest getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DiagnoseClusterRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DiagnoseClusterRequest(input, extensionRegistry);
+        return new DiagnoseClusterRequest(input, extensionRegistry);
     }
   };
 
@@ -885,7 +858,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.DiagnoseClusterRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DiagnoseClusterResults.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DiagnoseClusterResults.java
index 2eceb9a994ec..d967ff50f1e2 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DiagnoseClusterResults.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DiagnoseClusterResults.java
@@ -33,9 +33,6 @@ private DiagnoseClusterResults(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DiagnoseClusterResults(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            outputUri_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DiagnoseClusterResults(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            outputUri_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DiagnoseClusterResults(
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_DiagnoseClusterResults_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_DiagnoseClusterResults_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getOutputUri() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getOutputUriBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.dataproc.v1.DiagnoseClusterResults parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.DiagnoseClusterResults prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_DiagnoseClusterResults_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_DiagnoseClusterResults_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       outputUri_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_DiagnoseClusterResults_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.DiagnoseClusterResults getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.DiagnoseClusterResults.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.DiagnoseClusterResults build() {
       com.google.cloud.dataproc.v1.DiagnoseClusterResults result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.dataproc.v1.DiagnoseClusterResults build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.DiagnoseClusterResults buildPartial() {
       com.google.cloud.dataproc.v1.DiagnoseClusterResults result = new com.google.cloud.dataproc.v1.DiagnoseClusterResults(this);
       result.outputUri_ = outputUri_;
@@ -361,39 +346,32 @@ public com.google.cloud.dataproc.v1.DiagnoseClusterResults buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.DiagnoseClusterResults) {
         return mergeFrom((com.google.cloud.dataproc.v1.DiagnoseClusterResults)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.DiagnoseClusterResults oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setOutputUriBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.dataproc.v1.DiagnoseClusterResults getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DiagnoseClusterResults parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DiagnoseClusterResults(input, extensionRegistry);
+        return new DiagnoseClusterResults(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.DiagnoseClusterResults getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DiskConfig.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DiskConfig.java
index 145f82ecf8a6..80b5f04706e9 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DiskConfig.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/DiskConfig.java
@@ -34,9 +34,6 @@ private DiskConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private DiskConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
 
             bootDiskSizeGb_ = input.readInt32();
@@ -58,13 +62,6 @@ private DiskConfig(
             numLocalSsds_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -82,7 +79,6 @@ private DiskConfig(
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_DiskConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_DiskConfig_fieldAccessorTable
@@ -122,7 +118,6 @@ public int getNumLocalSsds() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -132,7 +127,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (bootDiskSizeGb_ != 0) {
@@ -144,7 +138,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -268,7 +261,6 @@ public static com.google.cloud.dataproc.v1.DiskConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -276,7 +268,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.DiskConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -304,7 +295,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_DiskConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_DiskConfig_fieldAccessorTable
@@ -327,7 +317,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       bootDiskSizeGb_ = 0;
@@ -337,18 +326,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_DiskConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.DiskConfig getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.DiskConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.DiskConfig build() {
       com.google.cloud.dataproc.v1.DiskConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -357,7 +343,6 @@ public com.google.cloud.dataproc.v1.DiskConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.DiskConfig buildPartial() {
       com.google.cloud.dataproc.v1.DiskConfig result = new com.google.cloud.dataproc.v1.DiskConfig(this);
       result.bootDiskSizeGb_ = bootDiskSizeGb_;
@@ -366,39 +351,32 @@ public com.google.cloud.dataproc.v1.DiskConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.DiskConfig) {
         return mergeFrom((com.google.cloud.dataproc.v1.DiskConfig)other);
@@ -421,12 +399,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.DiskConfig other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -535,13 +511,11 @@ public Builder clearNumLocalSsds() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -563,12 +537,11 @@ public static com.google.cloud.dataproc.v1.DiskConfig getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DiskConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DiskConfig(input, extensionRegistry);
+        return new DiskConfig(input, extensionRegistry);
     }
   };
 
@@ -581,7 +554,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.DiskConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/GceClusterConfig.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/GceClusterConfig.java
index 410fcbe334c0..a9b1697f3818 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/GceClusterConfig.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/GceClusterConfig.java
@@ -40,9 +40,6 @@ private GceClusterConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -54,6 +51,13 @@ private GceClusterConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -114,13 +118,6 @@ private GceClusterConfig(
             serviceAccount_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -145,7 +142,6 @@ private GceClusterConfig(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -156,7 +152,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_GceClusterConfig_fieldAccessorTable
@@ -638,7 +633,6 @@ public java.lang.String getMetadataOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -648,7 +642,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getZoneUriBytes().isEmpty()) {
@@ -681,7 +674,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -870,7 +862,6 @@ public static com.google.cloud.dataproc.v1.GceClusterConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -878,7 +869,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.GceClusterConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -929,7 +919,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_GceClusterConfig_fieldAccessorTable
@@ -952,7 +941,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       zoneUri_ = "";
@@ -973,18 +961,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_GceClusterConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.GceClusterConfig getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.GceClusterConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.GceClusterConfig build() {
       com.google.cloud.dataproc.v1.GceClusterConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -993,7 +978,6 @@ public com.google.cloud.dataproc.v1.GceClusterConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.GceClusterConfig buildPartial() {
       com.google.cloud.dataproc.v1.GceClusterConfig result = new com.google.cloud.dataproc.v1.GceClusterConfig(this);
       int from_bitField0_ = bitField0_;
@@ -1020,39 +1004,32 @@ public com.google.cloud.dataproc.v1.GceClusterConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.GceClusterConfig) {
         return mergeFrom((com.google.cloud.dataproc.v1.GceClusterConfig)other);
@@ -1110,12 +1087,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.GceClusterConfig other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2200,13 +2175,11 @@ public Builder putAllMetadata(
           .putAll(values);
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2228,12 +2201,11 @@ public static com.google.cloud.dataproc.v1.GceClusterConfig getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GceClusterConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GceClusterConfig(input, extensionRegistry);
+        return new GceClusterConfig(input, extensionRegistry);
     }
   };
 
@@ -2246,7 +2218,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.GceClusterConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/GetClusterRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/GetClusterRequest.java
index 8325f106179a..5f4787d73906 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/GetClusterRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/GetClusterRequest.java
@@ -35,9 +35,6 @@ private GetClusterRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private GetClusterRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -67,13 +71,6 @@ private GetClusterRequest(
             region_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private GetClusterRequest(
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_GetClusterRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_GetClusterRequest_fieldAccessorTable
@@ -228,7 +224,6 @@ public java.lang.String getClusterName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -238,7 +233,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -253,7 +247,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -382,7 +375,6 @@ public static com.google.cloud.dataproc.v1.GetClusterRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -390,7 +382,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.GetClusterRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -418,7 +409,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_GetClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_GetClusterRequest_fieldAccessorTable
@@ -441,7 +431,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -453,18 +442,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_GetClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.GetClusterRequest getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.GetClusterRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.GetClusterRequest build() {
       com.google.cloud.dataproc.v1.GetClusterRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -473,7 +459,6 @@ public com.google.cloud.dataproc.v1.GetClusterRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.GetClusterRequest buildPartial() {
       com.google.cloud.dataproc.v1.GetClusterRequest result = new com.google.cloud.dataproc.v1.GetClusterRequest(this);
       result.projectId_ = projectId_;
@@ -483,39 +468,32 @@ public com.google.cloud.dataproc.v1.GetClusterRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.GetClusterRequest) {
         return mergeFrom((com.google.cloud.dataproc.v1.GetClusterRequest)other);
@@ -544,12 +522,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.GetClusterRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -839,13 +815,11 @@ public Builder setClusterNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -867,12 +841,11 @@ public static com.google.cloud.dataproc.v1.GetClusterRequest getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetClusterRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetClusterRequest(input, extensionRegistry);
+        return new GetClusterRequest(input, extensionRegistry);
     }
   };
 
@@ -885,7 +858,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.GetClusterRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/GetJobRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/GetJobRequest.java
index a2262c28dcbc..6556ffc9af10 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/GetJobRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/GetJobRequest.java
@@ -35,9 +35,6 @@ private GetJobRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private GetJobRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -67,13 +71,6 @@ private GetJobRequest(
             region_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private GetJobRequest(
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_GetJobRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_GetJobRequest_fieldAccessorTable
@@ -228,7 +224,6 @@ public java.lang.String getJobId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -238,7 +233,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -253,7 +247,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -382,7 +375,6 @@ public static com.google.cloud.dataproc.v1.GetJobRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -390,7 +382,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.GetJobRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -418,7 +409,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_GetJobRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_GetJobRequest_fieldAccessorTable
@@ -441,7 +431,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -453,18 +442,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_GetJobRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.GetJobRequest getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.GetJobRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.GetJobRequest build() {
       com.google.cloud.dataproc.v1.GetJobRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -473,7 +459,6 @@ public com.google.cloud.dataproc.v1.GetJobRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.GetJobRequest buildPartial() {
       com.google.cloud.dataproc.v1.GetJobRequest result = new com.google.cloud.dataproc.v1.GetJobRequest(this);
       result.projectId_ = projectId_;
@@ -483,39 +468,32 @@ public com.google.cloud.dataproc.v1.GetJobRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.GetJobRequest) {
         return mergeFrom((com.google.cloud.dataproc.v1.GetJobRequest)other);
@@ -544,12 +522,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.GetJobRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -839,13 +815,11 @@ public Builder setJobIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -867,12 +841,11 @@ public static com.google.cloud.dataproc.v1.GetJobRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetJobRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetJobRequest(input, extensionRegistry);
+        return new GetJobRequest(input, extensionRegistry);
     }
   };
 
@@ -885,7 +858,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.GetJobRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/HadoopJob.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/HadoopJob.java
index 6c28ffaf8d86..94a0886b9441 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/HadoopJob.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/HadoopJob.java
@@ -38,9 +38,6 @@ private HadoopJob(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private HadoopJob(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             driverCase_ = 1;
@@ -126,13 +130,6 @@ private HadoopJob(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -163,7 +160,6 @@ private HadoopJob(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -174,7 +170,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_HadoopJob_fieldAccessorTable
@@ -683,7 +678,6 @@ public com.google.cloud.dataproc.v1.LoggingConfigOrBuilder getLoggingConfigOrBui
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -693,7 +687,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (driverCase_ == 1) {
@@ -726,7 +719,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -952,7 +944,6 @@ public static com.google.cloud.dataproc.v1.HadoopJob parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -960,7 +951,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.HadoopJob prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1012,7 +1002,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_HadoopJob_fieldAccessorTable
@@ -1035,7 +1024,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       args_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -1058,18 +1046,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_HadoopJob_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.HadoopJob getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.HadoopJob.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.HadoopJob build() {
       com.google.cloud.dataproc.v1.HadoopJob result = buildPartial();
       if (!result.isInitialized()) {
@@ -1078,7 +1063,6 @@ public com.google.cloud.dataproc.v1.HadoopJob build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.HadoopJob buildPartial() {
       com.google.cloud.dataproc.v1.HadoopJob result = new com.google.cloud.dataproc.v1.HadoopJob(this);
       int from_bitField0_ = bitField0_;
@@ -1122,39 +1106,32 @@ public com.google.cloud.dataproc.v1.HadoopJob buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.HadoopJob) {
         return mergeFrom((com.google.cloud.dataproc.v1.HadoopJob)other);
@@ -1233,12 +1210,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.HadoopJob other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2414,13 +2389,11 @@ public com.google.cloud.dataproc.v1.LoggingConfigOrBuilder getLoggingConfigOrBui
       }
       return loggingConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2442,12 +2415,11 @@ public static com.google.cloud.dataproc.v1.HadoopJob getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public HadoopJob parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new HadoopJob(input, extensionRegistry);
+        return new HadoopJob(input, extensionRegistry);
     }
   };
 
@@ -2460,7 +2432,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.HadoopJob getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/HiveJob.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/HiveJob.java
index 1dc938768949..47e3940fc6bf 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/HiveJob.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/HiveJob.java
@@ -35,9 +35,6 @@ private HiveJob(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private HiveJob(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             queriesCase_ = 1;
@@ -109,13 +113,6 @@ private HiveJob(
             jarFileUris_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -137,7 +134,6 @@ private HiveJob(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -150,7 +146,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_HiveJob_fieldAccessorTable
@@ -555,7 +550,6 @@ public java.lang.String getJarFileUris(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -565,7 +559,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (queriesCase_ == 1) {
@@ -595,7 +588,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -792,7 +784,6 @@ public static com.google.cloud.dataproc.v1.HiveJob parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -800,7 +791,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.HiveJob prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -855,7 +845,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_HiveJob_fieldAccessorTable
@@ -878,7 +867,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       continueOnFailure_ = false;
@@ -892,18 +880,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_HiveJob_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.HiveJob getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.HiveJob.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.HiveJob build() {
       com.google.cloud.dataproc.v1.HiveJob result = buildPartial();
       if (!result.isInitialized()) {
@@ -912,7 +897,6 @@ public com.google.cloud.dataproc.v1.HiveJob build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.HiveJob buildPartial() {
       com.google.cloud.dataproc.v1.HiveJob result = new com.google.cloud.dataproc.v1.HiveJob(this);
       int from_bitField0_ = bitField0_;
@@ -943,39 +927,32 @@ public com.google.cloud.dataproc.v1.HiveJob buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.HiveJob) {
         return mergeFrom((com.google.cloud.dataproc.v1.HiveJob)other);
@@ -1024,12 +1001,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.HiveJob other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1857,13 +1832,11 @@ public Builder addJarFileUrisBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1885,12 +1858,11 @@ public static com.google.cloud.dataproc.v1.HiveJob getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public HiveJob parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new HiveJob(input, extensionRegistry);
+        return new HiveJob(input, extensionRegistry);
     }
   };
 
@@ -1903,7 +1875,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.HiveJob getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/InstanceGroupConfig.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/InstanceGroupConfig.java
index 111283dcf971..5c9744e37630 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/InstanceGroupConfig.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/InstanceGroupConfig.java
@@ -39,9 +39,6 @@ private InstanceGroupConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private InstanceGroupConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
 
             numInstances_ = input.readInt32();
@@ -119,13 +123,6 @@ private InstanceGroupConfig(
                 input.readMessage(com.google.cloud.dataproc.v1.AcceleratorConfig.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -149,7 +146,6 @@ private InstanceGroupConfig(
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_InstanceGroupConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_InstanceGroupConfig_fieldAccessorTable
@@ -475,7 +471,6 @@ public com.google.cloud.dataproc.v1.AcceleratorConfigOrBuilder getAcceleratorsOr
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -485,7 +480,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (numInstances_ != 0) {
@@ -515,7 +509,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -704,7 +697,6 @@ public static com.google.cloud.dataproc.v1.InstanceGroupConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -712,7 +704,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.InstanceGroupConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -741,7 +732,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_InstanceGroupConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_InstanceGroupConfig_fieldAccessorTable
@@ -765,7 +755,6 @@ private void maybeForceBuilderInitialization() {
         getAcceleratorsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       numInstances_ = 0;
@@ -799,18 +788,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_InstanceGroupConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.InstanceGroupConfig getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.InstanceGroupConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.InstanceGroupConfig build() {
       com.google.cloud.dataproc.v1.InstanceGroupConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -819,7 +805,6 @@ public com.google.cloud.dataproc.v1.InstanceGroupConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.InstanceGroupConfig buildPartial() {
       com.google.cloud.dataproc.v1.InstanceGroupConfig result = new com.google.cloud.dataproc.v1.InstanceGroupConfig(this);
       int from_bitField0_ = bitField0_;
@@ -857,39 +842,32 @@ public com.google.cloud.dataproc.v1.InstanceGroupConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.InstanceGroupConfig) {
         return mergeFrom((com.google.cloud.dataproc.v1.InstanceGroupConfig)other);
@@ -962,12 +940,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.InstanceGroupConfig other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2106,13 +2082,11 @@ public com.google.cloud.dataproc.v1.AcceleratorConfig.Builder addAcceleratorsBui
       }
       return acceleratorsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2134,12 +2108,11 @@ public static com.google.cloud.dataproc.v1.InstanceGroupConfig getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public InstanceGroupConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InstanceGroupConfig(input, extensionRegistry);
+        return new InstanceGroupConfig(input, extensionRegistry);
     }
   };
 
@@ -2152,7 +2125,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.InstanceGroupConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/Job.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/Job.java
index 8bc9bbdbbeaa..c77b2411b636 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/Job.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/Job.java
@@ -36,9 +36,6 @@ private Job(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private Job(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.dataproc.v1.JobReference.Builder subBuilder = null;
             if (reference_ != null) {
@@ -229,13 +233,6 @@ private Job(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -260,7 +257,6 @@ private Job(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -271,7 +267,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_Job_fieldAccessorTable
@@ -1027,7 +1022,6 @@ public com.google.cloud.dataproc.v1.JobSchedulingOrBuilder getSchedulingOrBuilde
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1037,7 +1031,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (reference_ != null) {
@@ -1091,7 +1084,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1384,7 +1376,6 @@ public static com.google.cloud.dataproc.v1.Job parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1392,7 +1383,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.Job prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1442,7 +1432,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_Job_fieldAccessorTable
@@ -1467,7 +1456,6 @@ private void maybeForceBuilderInitialization() {
         getYarnApplicationsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (referenceBuilder_ == null) {
@@ -1516,18 +1504,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_Job_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.Job getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.Job.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.Job build() {
       com.google.cloud.dataproc.v1.Job result = buildPartial();
       if (!result.isInitialized()) {
@@ -1536,7 +1521,6 @@ public com.google.cloud.dataproc.v1.Job build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.Job buildPartial() {
       com.google.cloud.dataproc.v1.Job result = new com.google.cloud.dataproc.v1.Job(this);
       int from_bitField0_ = bitField0_;
@@ -1631,39 +1615,32 @@ public com.google.cloud.dataproc.v1.Job buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.Job) {
         return mergeFrom((com.google.cloud.dataproc.v1.Job)other);
@@ -1783,12 +1760,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.Job other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4559,13 +4534,11 @@ public com.google.cloud.dataproc.v1.JobSchedulingOrBuilder getSchedulingOrBuilde
       }
       return schedulingBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -4587,12 +4560,11 @@ public static com.google.cloud.dataproc.v1.Job getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Job parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Job(input, extensionRegistry);
+        return new Job(input, extensionRegistry);
     }
   };
 
@@ -4605,7 +4577,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.Job getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobPlacement.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobPlacement.java
index 8e65860185a5..e23ae7f6c80e 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobPlacement.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobPlacement.java
@@ -34,9 +34,6 @@ private JobPlacement(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private JobPlacement(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private JobPlacement(
             clusterUuid_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private JobPlacement(
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_JobPlacement_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_JobPlacement_fieldAccessorTable
@@ -179,7 +175,6 @@ public java.lang.String getClusterUuid() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -189,7 +184,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getClusterNameBytes().isEmpty()) {
@@ -201,7 +195,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -323,7 +316,6 @@ public static com.google.cloud.dataproc.v1.JobPlacement parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -331,7 +323,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.JobPlacement prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -359,7 +350,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_JobPlacement_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_JobPlacement_fieldAccessorTable
@@ -382,7 +372,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       clusterName_ = "";
@@ -392,18 +381,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_JobPlacement_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.JobPlacement getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.JobPlacement.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.JobPlacement build() {
       com.google.cloud.dataproc.v1.JobPlacement result = buildPartial();
       if (!result.isInitialized()) {
@@ -412,7 +398,6 @@ public com.google.cloud.dataproc.v1.JobPlacement build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.JobPlacement buildPartial() {
       com.google.cloud.dataproc.v1.JobPlacement result = new com.google.cloud.dataproc.v1.JobPlacement(this);
       result.clusterName_ = clusterName_;
@@ -421,39 +406,32 @@ public com.google.cloud.dataproc.v1.JobPlacement buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.JobPlacement) {
         return mergeFrom((com.google.cloud.dataproc.v1.JobPlacement)other);
@@ -478,12 +456,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.JobPlacement other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -684,13 +660,11 @@ public Builder setClusterUuidBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -712,12 +686,11 @@ public static com.google.cloud.dataproc.v1.JobPlacement getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public JobPlacement parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new JobPlacement(input, extensionRegistry);
+        return new JobPlacement(input, extensionRegistry);
     }
   };
 
@@ -730,7 +703,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.JobPlacement getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobReference.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobReference.java
index 2c0f73bc61ca..f9716aa54dc9 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobReference.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobReference.java
@@ -34,9 +34,6 @@ private JobReference(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private JobReference(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private JobReference(
             jobId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private JobReference(
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_JobReference_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_JobReference_fieldAccessorTable
@@ -187,7 +183,6 @@ public java.lang.String getJobId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -197,7 +192,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -209,7 +203,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -331,7 +324,6 @@ public static com.google.cloud.dataproc.v1.JobReference parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -339,7 +331,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.JobReference prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -367,7 +358,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_JobReference_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_JobReference_fieldAccessorTable
@@ -390,7 +380,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -400,18 +389,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_JobReference_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.JobReference getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.JobReference.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.JobReference build() {
       com.google.cloud.dataproc.v1.JobReference result = buildPartial();
       if (!result.isInitialized()) {
@@ -420,7 +406,6 @@ public com.google.cloud.dataproc.v1.JobReference build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.JobReference buildPartial() {
       com.google.cloud.dataproc.v1.JobReference result = new com.google.cloud.dataproc.v1.JobReference(this);
       result.projectId_ = projectId_;
@@ -429,39 +414,32 @@ public com.google.cloud.dataproc.v1.JobReference buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.JobReference) {
         return mergeFrom((com.google.cloud.dataproc.v1.JobReference)other);
@@ -486,12 +464,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.JobReference other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -712,13 +688,11 @@ public Builder setJobIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -740,12 +714,11 @@ public static com.google.cloud.dataproc.v1.JobReference getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public JobReference parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new JobReference(input, extensionRegistry);
+        return new JobReference(input, extensionRegistry);
     }
   };
 
@@ -758,7 +731,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.JobReference getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobScheduling.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobScheduling.java
index 74d3288db7bc..dffe47ed6fb8 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobScheduling.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobScheduling.java
@@ -35,9 +35,6 @@ private JobScheduling(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,11 +46,6 @@ private JobScheduling(
           case 0:
             done = true;
             break;
-          case 8: {
-
-            maxFailuresPerHour_ = input.readInt32();
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -61,6 +53,11 @@ private JobScheduling(
             }
             break;
           }
+          case 8: {
+
+            maxFailuresPerHour_ = input.readInt32();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -78,7 +75,6 @@ private JobScheduling(
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_JobScheduling_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_JobScheduling_fieldAccessorTable
@@ -105,7 +101,6 @@ public int getMaxFailuresPerHour() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -115,7 +110,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (maxFailuresPerHour_ != 0) {
@@ -124,7 +118,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -240,7 +233,6 @@ public static com.google.cloud.dataproc.v1.JobScheduling parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -248,7 +240,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.JobScheduling prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -278,7 +269,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_JobScheduling_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_JobScheduling_fieldAccessorTable
@@ -301,7 +291,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       maxFailuresPerHour_ = 0;
@@ -309,18 +298,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_JobScheduling_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.JobScheduling getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.JobScheduling.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.JobScheduling build() {
       com.google.cloud.dataproc.v1.JobScheduling result = buildPartial();
       if (!result.isInitialized()) {
@@ -329,7 +315,6 @@ public com.google.cloud.dataproc.v1.JobScheduling build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.JobScheduling buildPartial() {
       com.google.cloud.dataproc.v1.JobScheduling result = new com.google.cloud.dataproc.v1.JobScheduling(this);
       result.maxFailuresPerHour_ = maxFailuresPerHour_;
@@ -337,39 +322,32 @@ public com.google.cloud.dataproc.v1.JobScheduling buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.JobScheduling) {
         return mergeFrom((com.google.cloud.dataproc.v1.JobScheduling)other);
@@ -389,12 +367,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.JobScheduling other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -465,13 +441,11 @@ public Builder clearMaxFailuresPerHour() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -493,12 +467,11 @@ public static com.google.cloud.dataproc.v1.JobScheduling getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public JobScheduling parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new JobScheduling(input, extensionRegistry);
+        return new JobScheduling(input, extensionRegistry);
     }
   };
 
@@ -511,7 +484,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.JobScheduling getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobStatus.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobStatus.java
index fecbf7b65b48..8708aa31f1e5 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobStatus.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobStatus.java
@@ -35,9 +35,6 @@ private JobStatus(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private JobStatus(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -80,13 +84,6 @@ private JobStatus(
             substate_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private JobStatus(
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_JobStatus_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_JobStatus_fieldAccessorTable
@@ -548,7 +544,6 @@ public int getStateValue() {
    * .google.cloud.dataproc.v1.JobStatus.State state = 1;
    */
   public com.google.cloud.dataproc.v1.JobStatus.State getState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dataproc.v1.JobStatus.State result = com.google.cloud.dataproc.v1.JobStatus.State.valueOf(state_);
     return result == null ? com.google.cloud.dataproc.v1.JobStatus.State.UNRECOGNIZED : result;
   }
@@ -652,13 +647,11 @@ public int getSubstateValue() {
    * .google.cloud.dataproc.v1.JobStatus.Substate substate = 7;
    */
   public com.google.cloud.dataproc.v1.JobStatus.Substate getSubstate() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dataproc.v1.JobStatus.Substate result = com.google.cloud.dataproc.v1.JobStatus.Substate.valueOf(substate_);
     return result == null ? com.google.cloud.dataproc.v1.JobStatus.Substate.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -668,7 +661,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (state_ != com.google.cloud.dataproc.v1.JobStatus.State.STATE_UNSPECIFIED.getNumber()) {
@@ -686,7 +678,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -828,7 +819,6 @@ public static com.google.cloud.dataproc.v1.JobStatus parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -836,7 +826,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.JobStatus prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -864,7 +853,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_JobStatus_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_JobStatus_fieldAccessorTable
@@ -887,7 +875,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       state_ = 0;
@@ -905,18 +892,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_JobStatus_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.JobStatus getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.JobStatus.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.JobStatus build() {
       com.google.cloud.dataproc.v1.JobStatus result = buildPartial();
       if (!result.isInitialized()) {
@@ -925,7 +909,6 @@ public com.google.cloud.dataproc.v1.JobStatus build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.JobStatus buildPartial() {
       com.google.cloud.dataproc.v1.JobStatus result = new com.google.cloud.dataproc.v1.JobStatus(this);
       result.state_ = state_;
@@ -940,39 +923,32 @@ public com.google.cloud.dataproc.v1.JobStatus buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.JobStatus) {
         return mergeFrom((com.google.cloud.dataproc.v1.JobStatus)other);
@@ -1002,12 +978,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.JobStatus other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1057,7 +1031,6 @@ public Builder setStateValue(int value) {
      * .google.cloud.dataproc.v1.JobStatus.State state = 1;
      */
     public com.google.cloud.dataproc.v1.JobStatus.State getState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dataproc.v1.JobStatus.State result = com.google.cloud.dataproc.v1.JobStatus.State.valueOf(state_);
       return result == null ? com.google.cloud.dataproc.v1.JobStatus.State.UNRECOGNIZED : result;
     }
@@ -1372,7 +1345,6 @@ public Builder setSubstateValue(int value) {
      * .google.cloud.dataproc.v1.JobStatus.Substate substate = 7;
      */
     public com.google.cloud.dataproc.v1.JobStatus.Substate getSubstate() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dataproc.v1.JobStatus.Substate result = com.google.cloud.dataproc.v1.JobStatus.Substate.valueOf(substate_);
       return result == null ? com.google.cloud.dataproc.v1.JobStatus.Substate.UNRECOGNIZED : result;
     }
@@ -1407,13 +1379,11 @@ public Builder clearSubstate() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1435,12 +1405,11 @@ public static com.google.cloud.dataproc.v1.JobStatus getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public JobStatus parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new JobStatus(input, extensionRegistry);
+        return new JobStatus(input, extensionRegistry);
     }
   };
 
@@ -1453,7 +1422,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.JobStatus getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobsProto.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobsProto.java
index 13e14855d5ed..1e3b460a92c9 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobsProto.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/JobsProto.java
@@ -192,7 +192,7 @@ public static void registerAllExtensions(
       "gle.cloud.dataproc.v1.LoggingConfig.Driv" +
       "erLogLevelsEntry\032e\n\024DriverLogLevelsEntry" +
       "\022\013\n\003key\030\001 \001(\t\022<\n\005value\030\002 \001(\0162-.google.cl" +
-      "oud.dataproc.v1.LoggingConfig.Level:\0028\001\"" +
+      "oud.dataproc.v1.LoggingConfig.Level:\0028\001\"",
       "p\n\005Level\022\025\n\021LEVEL_UNSPECIFIED\020\000\022\007\n\003ALL\020\001" +
       "\022\t\n\005TRACE\020\002\022\t\n\005DEBUG\020\003\022\010\n\004INFO\020\004\022\010\n\004WARN" +
       "\020\005\022\t\n\005ERROR\020\006\022\t\n\005FATAL\020\007\022\007\n\003OFF\020\010\"\323\002\n\tHa" +
@@ -202,7 +202,7 @@ public static void registerAllExtensions(
       "chive_uris\030\006 \003(\t\022G\n\nproperties\030\007 \003(\01323.g" +
       "oogle.cloud.dataproc.v1.HadoopJob.Proper" +
       "tiesEntry\022?\n\016logging_config\030\010 \001(\0132\'.goog" +
-      "le.cloud.dataproc.v1.LoggingConfig\0321\n\017Pr" +
+      "le.cloud.dataproc.v1.LoggingConfig\0321\n\017Pr",
       "opertiesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(" +
       "\t:\0028\001B\010\n\006driver\"\321\002\n\010SparkJob\022\033\n\021main_jar" +
       "_file_uri\030\001 \001(\tH\000\022\024\n\nmain_class\030\002 \001(\tH\000\022" +
@@ -212,7 +212,7 @@ public static void registerAllExtensions(
       "c.v1.SparkJob.PropertiesEntry\022?\n\016logging" +
       "_config\030\010 \001(\0132\'.google.cloud.dataproc.v1" +
       ".LoggingConfig\0321\n\017PropertiesEntry\022\013\n\003key" +
-      "\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B\010\n\006driver\"\320\002\n\n" +
+      "\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B\010\n\006driver\"\320\002\n\n",
       "PySparkJob\022\034\n\024main_python_file_uri\030\001 \001(\t" +
       "\022\014\n\004args\030\002 \003(\t\022\030\n\020python_file_uris\030\003 \003(\t" +
       "\022\025\n\rjar_file_uris\030\004 \003(\t\022\021\n\tfile_uris\030\005 \003" +
@@ -222,7 +222,7 @@ public static void registerAllExtensions(
       "(\0132\'.google.cloud.dataproc.v1.LoggingCon" +
       "fig\0321\n\017PropertiesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005v" +
       "alue\030\002 \001(\t:\0028\001\"\034\n\tQueryList\022\017\n\007queries\030\001" +
-      " \003(\t\"\241\003\n\007HiveJob\022\030\n\016query_file_uri\030\001 \001(\t" +
+      " \003(\t\"\241\003\n\007HiveJob\022\030\n\016query_file_uri\030\001 \001(\t",
       "H\000\0229\n\nquery_list\030\002 \001(\0132#.google.cloud.da" +
       "taproc.v1.QueryListH\000\022\033\n\023continue_on_fai" +
       "lure\030\003 \001(\010\022P\n\020script_variables\030\004 \003(\01326.g" +
@@ -232,7 +232,7 @@ public static void registerAllExtensions(
       "try\022\025\n\rjar_file_uris\030\006 \003(\t\0326\n\024ScriptVari" +
       "ablesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\002" +
       "8\001\0321\n\017PropertiesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005va" +
-      "lue\030\002 \001(\t:\0028\001B\t\n\007queries\"\321\003\n\013SparkSqlJob" +
+      "lue\030\002 \001(\t:\0028\001B\t\n\007queries\"\321\003\n\013SparkSqlJob",
       "\022\030\n\016query_file_uri\030\001 \001(\tH\000\0229\n\nquery_list" +
       "\030\002 \001(\0132#.google.cloud.dataproc.v1.QueryL" +
       "istH\000\022T\n\020script_variables\030\003 \003(\0132:.google" +
@@ -242,7 +242,7 @@ public static void registerAllExtensions(
       "sEntry\022\025\n\rjar_file_uris\0308 \003(\t\022?\n\016logging" +
       "_config\030\006 \001(\0132\'.google.cloud.dataproc.v1" +
       ".LoggingConfig\0326\n\024ScriptVariablesEntry\022\013" +
-      "\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0321\n\017Proper" +
+      "\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0321\n\017Proper",
       "tiesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028" +
       "\001B\t\n\007queries\"\337\003\n\006PigJob\022\030\n\016query_file_ur" +
       "i\030\001 \001(\tH\000\0229\n\nquery_list\030\002 \001(\0132#.google.c" +
@@ -252,7 +252,7 @@ public static void registerAllExtensions(
       "riptVariablesEntry\022D\n\nproperties\030\005 \003(\01320" +
       ".google.cloud.dataproc.v1.PigJob.Propert" +
       "iesEntry\022\025\n\rjar_file_uris\030\006 \003(\t\022?\n\016loggi" +
-      "ng_config\030\007 \001(\0132\'.google.cloud.dataproc." +
+      "ng_config\030\007 \001(\0132\'.google.cloud.dataproc.",
       "v1.LoggingConfig\0326\n\024ScriptVariablesEntry" +
       "\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0321\n\017Prop" +
       "ertiesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:" +
@@ -262,7 +262,7 @@ public static void registerAllExtensions(
       "ataproc.v1.JobStatus.State\022\017\n\007details\030\002 " +
       "\001(\t\0224\n\020state_start_time\030\006 \001(\0132\032.google.p" +
       "rotobuf.Timestamp\022>\n\010substate\030\007 \001(\0162,.go" +
-      "ogle.cloud.dataproc.v1.JobStatus.Substat" +
+      "ogle.cloud.dataproc.v1.JobStatus.Substat",
       "e\"\251\001\n\005State\022\025\n\021STATE_UNSPECIFIED\020\000\022\013\n\007PE" +
       "NDING\020\001\022\016\n\nSETUP_DONE\020\010\022\013\n\007RUNNING\020\002\022\022\n\016" +
       "CANCEL_PENDING\020\003\022\022\n\016CANCEL_STARTED\020\007\022\r\n\t" +
@@ -272,7 +272,7 @@ public static void registerAllExtensions(
       "TATUS\020\003\"2\n\014JobReference\022\022\n\nproject_id\030\001 " +
       "\001(\t\022\016\n\006job_id\030\002 \001(\t\"\221\002\n\017YarnApplication\022" +
       "\014\n\004name\030\001 \001(\t\022>\n\005state\030\002 \001(\0162/.google.cl" +
-      "oud.dataproc.v1.YarnApplication.State\022\020\n" +
+      "oud.dataproc.v1.YarnApplication.State\022\020\n",
       "\010progress\030\003 \001(\002\022\024\n\014tracking_url\030\004 \001(\t\"\207\001" +
       "\n\005State\022\025\n\021STATE_UNSPECIFIED\020\000\022\007\n\003NEW\020\001\022" +
       "\016\n\nNEW_SAVING\020\002\022\r\n\tSUBMITTED\020\003\022\014\n\010ACCEPT" +
@@ -282,7 +282,7 @@ public static void registerAllExtensions(
       "ce\0229\n\tplacement\030\002 \001(\0132&.google.cloud.dat" +
       "aproc.v1.JobPlacement\0229\n\nhadoop_job\030\003 \001(" +
       "\0132#.google.cloud.dataproc.v1.HadoopJobH\000" +
-      "\0227\n\tspark_job\030\004 \001(\0132\".google.cloud.datap" +
+      "\0227\n\tspark_job\030\004 \001(\0132\".google.cloud.datap",
       "roc.v1.SparkJobH\000\022;\n\013pyspark_job\030\005 \001(\0132$" +
       ".google.cloud.dataproc.v1.PySparkJobH\000\0225" +
       "\n\010hive_job\030\006 \001(\0132!.google.cloud.dataproc" +
@@ -292,7 +292,7 @@ public static void registerAllExtensions(
       "rkSqlJobH\000\0223\n\006status\030\010 \001(\0132#.google.clou" +
       "d.dataproc.v1.JobStatus\022;\n\016status_histor" +
       "y\030\r \003(\0132#.google.cloud.dataproc.v1.JobSt" +
-      "atus\022D\n\021yarn_applications\030\t \003(\0132).google" +
+      "atus\022D\n\021yarn_applications\030\t \003(\0132).google",
       ".cloud.dataproc.v1.YarnApplication\022\"\n\032dr" +
       "iver_output_resource_uri\030\021 \001(\t\022 \n\030driver" +
       "_control_files_uri\030\017 \001(\t\0229\n\006labels\030\022 \003(\013" +
@@ -302,7 +302,7 @@ public static void registerAllExtensions(
       "\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B\n\n\010type_" +
       "job\".\n\rJobScheduling\022\035\n\025max_failures_per" +
       "_hour\030\001 \001(\005\"b\n\020SubmitJobRequest\022\022\n\nproje" +
-      "ct_id\030\001 \001(\t\022\016\n\006region\030\003 \001(\t\022*\n\003job\030\002 \001(\013" +
+      "ct_id\030\001 \001(\t\022\016\n\006region\030\003 \001(\t\022*\n\003job\030\002 \001(\013",
       "2\035.google.cloud.dataproc.v1.Job\"C\n\rGetJo" +
       "bRequest\022\022\n\nproject_id\030\001 \001(\t\022\016\n\006region\030\003" +
       " \001(\t\022\016\n\006job_id\030\002 \001(\t\"\220\002\n\017ListJobsRequest" +
@@ -312,7 +312,7 @@ public static void registerAllExtensions(
       " \001(\01629.google.cloud.dataproc.v1.ListJobs" +
       "Request.JobStateMatcher\022\016\n\006filter\030\007 \001(\t\"" +
       "6\n\017JobStateMatcher\022\007\n\003ALL\020\000\022\n\n\006ACTIVE\020\001\022" +
-      "\016\n\nNON_ACTIVE\020\002\"\243\001\n\020UpdateJobRequest\022\022\n\n" +
+      "\016\n\nNON_ACTIVE\020\002\"\243\001\n\020UpdateJobRequest\022\022\n\n",
       "project_id\030\001 \001(\t\022\016\n\006region\030\002 \001(\t\022\016\n\006job_" +
       "id\030\003 \001(\t\022*\n\003job\030\004 \001(\0132\035.google.cloud.dat" +
       "aproc.v1.Job\022/\n\013update_mask\030\005 \001(\0132\032.goog" +
@@ -322,7 +322,7 @@ public static void registerAllExtensions(
       "lJobRequest\022\022\n\nproject_id\030\001 \001(\t\022\016\n\006regio" +
       "n\030\003 \001(\t\022\016\n\006job_id\030\002 \001(\t\"F\n\020DeleteJobRequ" +
       "est\022\022\n\nproject_id\030\001 \001(\t\022\016\n\006region\030\003 \001(\t\022" +
-      "\016\n\006job_id\030\002 \001(\t2\266\007\n\rJobController\022\231\001\n\tSu" +
+      "\016\n\006job_id\030\002 \001(\t2\266\007\n\rJobController\022\231\001\n\tSu",
       "bmitJob\022*.google.cloud.dataproc.v1.Submi" +
       "tJobRequest\032\035.google.cloud.dataproc.v1.J" +
       "ob\"A\202\323\344\223\002;\"6/v1/projects/{project_id}/re" +
@@ -332,7 +332,7 @@ public static void registerAllExtensions(
       "\0228/v1/projects/{project_id}/regions/{reg" +
       "ion}/jobs/{job_id}\022\232\001\n\010ListJobs\022).google" +
       ".cloud.dataproc.v1.ListJobsRequest\032*.goo" +
-      "gle.cloud.dataproc.v1.ListJobsResponse\"7" +
+      "gle.cloud.dataproc.v1.ListJobsResponse\"7",
       "\202\323\344\223\0021\022//v1/projects/{project_id}/region" +
       "s/{region}/jobs\022\235\001\n\tUpdateJob\022*.google.c" +
       "loud.dataproc.v1.UpdateJobRequest\032\035.goog" +
@@ -342,7 +342,7 @@ public static void registerAllExtensions(
       "loud.dataproc.v1.CancelJobRequest\032\035.goog" +
       "le.cloud.dataproc.v1.Job\"J\202\323\344\223\002D\"?/v1/pr" +
       "ojects/{project_id}/regions/{region}/job" +
-      "s/{job_id}:cancel:\001*\022\221\001\n\tDeleteJob\022*.goo" +
+      "s/{job_id}:cancel:\001*\022\221\001\n\tDeleteJob\022*.goo",
       "gle.cloud.dataproc.v1.DeleteJobRequest\032\026" +
       ".google.protobuf.Empty\"@\202\323\344\223\002:*8/v1/proj" +
       "ects/{project_id}/regions/{region}/jobs/" +
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListClustersRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListClustersRequest.java
index cf087be5423a..2d2534ec4ec2 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListClustersRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListClustersRequest.java
@@ -37,9 +37,6 @@ private ListClustersRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private ListClustersRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -80,13 +84,6 @@ private ListClustersRequest(
             filter_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private ListClustersRequest(
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_ListClustersRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_ListClustersRequest_fieldAccessorTable
@@ -324,7 +320,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -334,7 +329,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -355,7 +349,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -499,7 +492,6 @@ public static com.google.cloud.dataproc.v1.ListClustersRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -507,7 +499,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.ListClustersRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -535,7 +526,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_ListClustersRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_ListClustersRequest_fieldAccessorTable
@@ -558,7 +548,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -574,18 +563,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_ListClustersRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.ListClustersRequest getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.ListClustersRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.ListClustersRequest build() {
       com.google.cloud.dataproc.v1.ListClustersRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -594,7 +580,6 @@ public com.google.cloud.dataproc.v1.ListClustersRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.ListClustersRequest buildPartial() {
       com.google.cloud.dataproc.v1.ListClustersRequest result = new com.google.cloud.dataproc.v1.ListClustersRequest(this);
       result.projectId_ = projectId_;
@@ -606,39 +591,32 @@ public com.google.cloud.dataproc.v1.ListClustersRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.ListClustersRequest) {
         return mergeFrom((com.google.cloud.dataproc.v1.ListClustersRequest)other);
@@ -674,12 +652,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.ListClustersRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1166,13 +1142,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1194,12 +1168,11 @@ public static com.google.cloud.dataproc.v1.ListClustersRequest getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListClustersRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListClustersRequest(input, extensionRegistry);
+        return new ListClustersRequest(input, extensionRegistry);
     }
   };
 
@@ -1212,7 +1185,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.ListClustersRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListClustersResponse.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListClustersResponse.java
index ec9e2207385c..adb81340fec9 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListClustersResponse.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListClustersResponse.java
@@ -34,9 +34,6 @@ private ListClustersResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListClustersResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               clusters_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListClustersResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListClustersResponse(
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_ListClustersResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_ListClustersResponse_fieldAccessorTable
@@ -201,7 +197,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -211,7 +206,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < clusters_.size(); i++) {
@@ -223,7 +217,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.cloud.dataproc.v1.ListClustersResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.ListClustersResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_ListClustersResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_ListClustersResponse_fieldAccessorTable
@@ -408,7 +398,6 @@ private void maybeForceBuilderInitialization() {
         getClustersFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (clustersBuilder_ == null) {
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_ListClustersResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.ListClustersResponse getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.ListClustersResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.ListClustersResponse build() {
       com.google.cloud.dataproc.v1.ListClustersResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public com.google.cloud.dataproc.v1.ListClustersResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.ListClustersResponse buildPartial() {
       com.google.cloud.dataproc.v1.ListClustersResponse result = new com.google.cloud.dataproc.v1.ListClustersResponse(this);
       int from_bitField0_ = bitField0_;
@@ -462,39 +447,32 @@ public com.google.cloud.dataproc.v1.ListClustersResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.ListClustersResponse) {
         return mergeFrom((com.google.cloud.dataproc.v1.ListClustersResponse)other);
@@ -541,12 +519,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.ListClustersResponse other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -976,13 +952,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1004,12 +978,11 @@ public static com.google.cloud.dataproc.v1.ListClustersResponse getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListClustersResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListClustersResponse(input, extensionRegistry);
+        return new ListClustersResponse(input, extensionRegistry);
     }
   };
 
@@ -1022,7 +995,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.ListClustersResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListJobsRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListJobsRequest.java
index f2ab45b9d5b4..a1efdd26f503 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListJobsRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListJobsRequest.java
@@ -39,9 +39,6 @@ private ListJobsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private ListJobsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -94,13 +98,6 @@ private ListJobsRequest(
             filter_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -118,7 +115,6 @@ private ListJobsRequest(
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_ListJobsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_ListJobsRequest_fieldAccessorTable
@@ -474,7 +470,6 @@ public int getJobStateMatcherValue() {
    * .google.cloud.dataproc.v1.ListJobsRequest.JobStateMatcher job_state_matcher = 5;
    */
   public com.google.cloud.dataproc.v1.ListJobsRequest.JobStateMatcher getJobStateMatcher() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dataproc.v1.ListJobsRequest.JobStateMatcher result = com.google.cloud.dataproc.v1.ListJobsRequest.JobStateMatcher.valueOf(jobStateMatcher_);
     return result == null ? com.google.cloud.dataproc.v1.ListJobsRequest.JobStateMatcher.UNRECOGNIZED : result;
   }
@@ -540,7 +535,6 @@ public java.lang.String getFilter() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -550,7 +544,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -577,7 +570,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -735,7 +727,6 @@ public static com.google.cloud.dataproc.v1.ListJobsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -743,7 +734,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.ListJobsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -771,7 +761,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_ListJobsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_ListJobsRequest_fieldAccessorTable
@@ -794,7 +783,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -814,18 +802,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_ListJobsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.ListJobsRequest getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.ListJobsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.ListJobsRequest build() {
       com.google.cloud.dataproc.v1.ListJobsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -834,7 +819,6 @@ public com.google.cloud.dataproc.v1.ListJobsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.ListJobsRequest buildPartial() {
       com.google.cloud.dataproc.v1.ListJobsRequest result = new com.google.cloud.dataproc.v1.ListJobsRequest(this);
       result.projectId_ = projectId_;
@@ -848,39 +832,32 @@ public com.google.cloud.dataproc.v1.ListJobsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.ListJobsRequest) {
         return mergeFrom((com.google.cloud.dataproc.v1.ListJobsRequest)other);
@@ -923,12 +900,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.ListJobsRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1393,7 +1368,6 @@ public Builder setJobStateMatcherValue(int value) {
      * .google.cloud.dataproc.v1.ListJobsRequest.JobStateMatcher job_state_matcher = 5;
      */
     public com.google.cloud.dataproc.v1.ListJobsRequest.JobStateMatcher getJobStateMatcher() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dataproc.v1.ListJobsRequest.JobStateMatcher result = com.google.cloud.dataproc.v1.ListJobsRequest.JobStateMatcher.valueOf(jobStateMatcher_);
       return result == null ? com.google.cloud.dataproc.v1.ListJobsRequest.JobStateMatcher.UNRECOGNIZED : result;
     }
@@ -1564,13 +1538,11 @@ public Builder setFilterBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1592,12 +1564,11 @@ public static com.google.cloud.dataproc.v1.ListJobsRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListJobsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListJobsRequest(input, extensionRegistry);
+        return new ListJobsRequest(input, extensionRegistry);
     }
   };
 
@@ -1610,7 +1581,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.ListJobsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListJobsResponse.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListJobsResponse.java
index 03b78e108a52..270eb220e684 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListJobsResponse.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ListJobsResponse.java
@@ -34,9 +34,6 @@ private ListJobsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListJobsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               jobs_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListJobsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListJobsResponse(
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_ListJobsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_ListJobsResponse_fieldAccessorTable
@@ -201,7 +197,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -211,7 +206,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < jobs_.size(); i++) {
@@ -223,7 +217,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.cloud.dataproc.v1.ListJobsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.ListJobsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_ListJobsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_ListJobsResponse_fieldAccessorTable
@@ -408,7 +398,6 @@ private void maybeForceBuilderInitialization() {
         getJobsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (jobsBuilder_ == null) {
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_ListJobsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.ListJobsResponse getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.ListJobsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.ListJobsResponse build() {
       com.google.cloud.dataproc.v1.ListJobsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public com.google.cloud.dataproc.v1.ListJobsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.ListJobsResponse buildPartial() {
       com.google.cloud.dataproc.v1.ListJobsResponse result = new com.google.cloud.dataproc.v1.ListJobsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -462,39 +447,32 @@ public com.google.cloud.dataproc.v1.ListJobsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.ListJobsResponse) {
         return mergeFrom((com.google.cloud.dataproc.v1.ListJobsResponse)other);
@@ -541,12 +519,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.ListJobsResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -976,13 +952,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1004,12 +978,11 @@ public static com.google.cloud.dataproc.v1.ListJobsResponse getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListJobsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListJobsResponse(input, extensionRegistry);
+        return new ListJobsResponse(input, extensionRegistry);
     }
   };
 
@@ -1022,7 +995,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.ListJobsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/LoggingConfig.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/LoggingConfig.java
index e9d6b30b3ee6..84c59fa04cb6 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/LoggingConfig.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/LoggingConfig.java
@@ -32,9 +32,6 @@ private LoggingConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private LoggingConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               driverLogLevels_ = com.google.protobuf.MapField.newMapField(
@@ -59,13 +63,6 @@ private LoggingConfig(
                 driverLogLevels__.getKey(), driverLogLevels__.getValue());
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private LoggingConfig(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -95,7 +91,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_LoggingConfig_fieldAccessorTable
@@ -527,7 +522,6 @@ public int getDriverLogLevelsValueOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -537,7 +531,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     com.google.protobuf.GeneratedMessageV3
@@ -549,7 +542,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -673,7 +665,6 @@ public static com.google.cloud.dataproc.v1.LoggingConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -681,7 +672,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.LoggingConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -731,7 +721,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_LoggingConfig_fieldAccessorTable
@@ -754,25 +743,21 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       internalGetMutableDriverLogLevels().clear();
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_LoggingConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.LoggingConfig getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.LoggingConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.LoggingConfig build() {
       com.google.cloud.dataproc.v1.LoggingConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -781,7 +766,6 @@ public com.google.cloud.dataproc.v1.LoggingConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.LoggingConfig buildPartial() {
       com.google.cloud.dataproc.v1.LoggingConfig result = new com.google.cloud.dataproc.v1.LoggingConfig(this);
       int from_bitField0_ = bitField0_;
@@ -791,39 +775,32 @@ public com.google.cloud.dataproc.v1.LoggingConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.LoggingConfig) {
         return mergeFrom((com.google.cloud.dataproc.v1.LoggingConfig)other);
@@ -842,12 +819,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.LoggingConfig other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1148,13 +1123,11 @@ public Builder putAllDriverLogLevelsValue(
           .putAll(values);
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1176,12 +1149,11 @@ public static com.google.cloud.dataproc.v1.LoggingConfig getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LoggingConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LoggingConfig(input, extensionRegistry);
+        return new LoggingConfig(input, extensionRegistry);
     }
   };
 
@@ -1194,7 +1166,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.LoggingConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ManagedGroupConfig.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ManagedGroupConfig.java
index 592c6615bb85..b67328620d9f 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ManagedGroupConfig.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/ManagedGroupConfig.java
@@ -34,9 +34,6 @@ private ManagedGroupConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ManagedGroupConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private ManagedGroupConfig(
             instanceGroupManagerName_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private ManagedGroupConfig(
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_ManagedGroupConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_ManagedGroupConfig_fieldAccessorTable
@@ -179,7 +175,6 @@ public java.lang.String getInstanceGroupManagerName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -189,7 +184,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getInstanceTemplateNameBytes().isEmpty()) {
@@ -201,7 +195,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -323,7 +316,6 @@ public static com.google.cloud.dataproc.v1.ManagedGroupConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -331,7 +323,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.ManagedGroupConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -359,7 +350,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_ManagedGroupConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_ManagedGroupConfig_fieldAccessorTable
@@ -382,7 +372,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       instanceTemplateName_ = "";
@@ -392,18 +381,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_ManagedGroupConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.ManagedGroupConfig getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.ManagedGroupConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.ManagedGroupConfig build() {
       com.google.cloud.dataproc.v1.ManagedGroupConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -412,7 +398,6 @@ public com.google.cloud.dataproc.v1.ManagedGroupConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.ManagedGroupConfig buildPartial() {
       com.google.cloud.dataproc.v1.ManagedGroupConfig result = new com.google.cloud.dataproc.v1.ManagedGroupConfig(this);
       result.instanceTemplateName_ = instanceTemplateName_;
@@ -421,39 +406,32 @@ public com.google.cloud.dataproc.v1.ManagedGroupConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.ManagedGroupConfig) {
         return mergeFrom((com.google.cloud.dataproc.v1.ManagedGroupConfig)other);
@@ -478,12 +456,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.ManagedGroupConfig other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -684,13 +660,11 @@ public Builder setInstanceGroupManagerNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -712,12 +686,11 @@ public static com.google.cloud.dataproc.v1.ManagedGroupConfig getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ManagedGroupConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ManagedGroupConfig(input, extensionRegistry);
+        return new ManagedGroupConfig(input, extensionRegistry);
     }
   };
 
@@ -730,7 +703,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.ManagedGroupConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/NodeInitializationAction.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/NodeInitializationAction.java
index 5fbdba4310ba..b1c1ab6d8b17 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/NodeInitializationAction.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/NodeInitializationAction.java
@@ -34,9 +34,6 @@ private NodeInitializationAction(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private NodeInitializationAction(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -67,13 +71,6 @@ private NodeInitializationAction(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private NodeInitializationAction(
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_NodeInitializationAction_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_NodeInitializationAction_fieldAccessorTable
@@ -184,7 +180,6 @@ public com.google.protobuf.DurationOrBuilder getExecutionTimeoutOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -194,7 +189,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getExecutableFileBytes().isEmpty()) {
@@ -206,7 +200,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -334,7 +327,6 @@ public static com.google.cloud.dataproc.v1.NodeInitializationAction parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -342,7 +334,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.NodeInitializationAction prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -371,7 +362,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_NodeInitializationAction_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_NodeInitializationAction_fieldAccessorTable
@@ -394,7 +384,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       executableFile_ = "";
@@ -408,18 +397,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_NodeInitializationAction_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.NodeInitializationAction getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.NodeInitializationAction.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.NodeInitializationAction build() {
       com.google.cloud.dataproc.v1.NodeInitializationAction result = buildPartial();
       if (!result.isInitialized()) {
@@ -428,7 +414,6 @@ public com.google.cloud.dataproc.v1.NodeInitializationAction build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.NodeInitializationAction buildPartial() {
       com.google.cloud.dataproc.v1.NodeInitializationAction result = new com.google.cloud.dataproc.v1.NodeInitializationAction(this);
       result.executableFile_ = executableFile_;
@@ -441,39 +426,32 @@ public com.google.cloud.dataproc.v1.NodeInitializationAction buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.NodeInitializationAction) {
         return mergeFrom((com.google.cloud.dataproc.v1.NodeInitializationAction)other);
@@ -497,12 +475,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.NodeInitializationAction o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -789,13 +765,11 @@ public com.google.protobuf.DurationOrBuilder getExecutionTimeoutOrBuilder() {
       }
       return executionTimeoutBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -817,12 +791,11 @@ public static com.google.cloud.dataproc.v1.NodeInitializationAction getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public NodeInitializationAction parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new NodeInitializationAction(input, extensionRegistry);
+        return new NodeInitializationAction(input, extensionRegistry);
     }
   };
 
@@ -835,7 +808,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.NodeInitializationAction getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/OperationsProto.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/OperationsProto.java
index 1b5700bc2f71..8559b588882a 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/OperationsProto.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/OperationsProto.java
@@ -47,7 +47,7 @@ public static void registerAllExtensions(
       "26.google.cloud.dataproc.v1.ClusterOpera" +
       "tionStatus.State\022\023\n\013inner_state\030\002 \001(\t\022\017\n" +
       "\007details\030\003 \001(\t\0224\n\020state_start_time\030\004 \001(\013" +
-      "2\032.google.protobuf.Timestamp\"8\n\005State\022\013\n" +
+      "2\032.google.protobuf.Timestamp\"8\n\005State\022\013\n",
       "\007UNKNOWN\020\000\022\013\n\007PENDING\020\001\022\013\n\007RUNNING\020\002\022\010\n\004" +
       "DONE\020\003\"\220\003\n\030ClusterOperationMetadata\022\024\n\014c" +
       "luster_name\030\007 \001(\t\022\024\n\014cluster_uuid\030\010 \001(\t\022" +
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "sterOperationStatus\022\026\n\016operation_type\030\013 " +
       "\001(\t\022\023\n\013description\030\014 \001(\t\022N\n\006labels\030\r \003(\013" +
       "2>.google.cloud.dataproc.v1.ClusterOpera" +
-      "tionMetadata.LabelsEntry\022\020\n\010warnings\030\016 \003" +
+      "tionMetadata.LabelsEntry\022\020\n\010warnings\030\016 \003",
       "(\t\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030" +
       "\002 \001(\t:\0028\001Bs\n\034com.google.cloud.dataproc.v" +
       "1B\017OperationsProtoP\001Z@google.golang.org/" +
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/PigJob.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/PigJob.java
index f104dfb7b0ab..2e8c8ae6460b 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/PigJob.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/PigJob.java
@@ -35,9 +35,6 @@ private PigJob(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private PigJob(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             queriesCase_ = 1;
@@ -122,13 +126,6 @@ private PigJob(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -150,7 +147,6 @@ private PigJob(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -163,7 +159,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_PigJob_fieldAccessorTable
@@ -597,7 +592,6 @@ public com.google.cloud.dataproc.v1.LoggingConfigOrBuilder getLoggingConfigOrBui
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -607,7 +601,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (queriesCase_ == 1) {
@@ -640,7 +633,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -850,7 +842,6 @@ public static com.google.cloud.dataproc.v1.PigJob parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -858,7 +849,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.PigJob prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -913,7 +903,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_PigJob_fieldAccessorTable
@@ -936,7 +925,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       continueOnFailure_ = false;
@@ -956,18 +944,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_PigJob_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.PigJob getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.PigJob.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.PigJob build() {
       com.google.cloud.dataproc.v1.PigJob result = buildPartial();
       if (!result.isInitialized()) {
@@ -976,7 +961,6 @@ public com.google.cloud.dataproc.v1.PigJob build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.PigJob buildPartial() {
       com.google.cloud.dataproc.v1.PigJob result = new com.google.cloud.dataproc.v1.PigJob(this);
       int from_bitField0_ = bitField0_;
@@ -1012,39 +996,32 @@ public com.google.cloud.dataproc.v1.PigJob buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.PigJob) {
         return mergeFrom((com.google.cloud.dataproc.v1.PigJob)other);
@@ -1096,12 +1073,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.PigJob other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2073,13 +2048,11 @@ public com.google.cloud.dataproc.v1.LoggingConfigOrBuilder getLoggingConfigOrBui
       }
       return loggingConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2101,12 +2074,11 @@ public static com.google.cloud.dataproc.v1.PigJob getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PigJob parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PigJob(input, extensionRegistry);
+        return new PigJob(input, extensionRegistry);
     }
   };
 
@@ -2119,7 +2091,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.PigJob getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/PySparkJob.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/PySparkJob.java
index e354b1304128..294970ca8a09 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/PySparkJob.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/PySparkJob.java
@@ -40,9 +40,6 @@ private PySparkJob(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -54,6 +51,13 @@ private PySparkJob(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -131,13 +135,6 @@ private PySparkJob(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -171,7 +168,6 @@ private PySparkJob(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -182,7 +178,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_PySparkJob_fieldAccessorTable
@@ -622,7 +617,6 @@ public com.google.cloud.dataproc.v1.LoggingConfigOrBuilder getLoggingConfigOrBui
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -632,7 +626,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getMainPythonFileUriBytes().isEmpty()) {
@@ -665,7 +658,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -879,7 +871,6 @@ public static com.google.cloud.dataproc.v1.PySparkJob parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -887,7 +878,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.PySparkJob prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -939,7 +929,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_PySparkJob_fieldAccessorTable
@@ -962,7 +951,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       mainPythonFileUri_ = "";
@@ -987,18 +975,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_PySparkJob_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.PySparkJob getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.PySparkJob.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.PySparkJob build() {
       com.google.cloud.dataproc.v1.PySparkJob result = buildPartial();
       if (!result.isInitialized()) {
@@ -1007,7 +992,6 @@ public com.google.cloud.dataproc.v1.PySparkJob build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.PySparkJob buildPartial() {
       com.google.cloud.dataproc.v1.PySparkJob result = new com.google.cloud.dataproc.v1.PySparkJob(this);
       int from_bitField0_ = bitField0_;
@@ -1050,39 +1034,32 @@ public com.google.cloud.dataproc.v1.PySparkJob buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.PySparkJob) {
         return mergeFrom((com.google.cloud.dataproc.v1.PySparkJob)other);
@@ -1158,12 +1135,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.PySparkJob other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2305,13 +2280,11 @@ public com.google.cloud.dataproc.v1.LoggingConfigOrBuilder getLoggingConfigOrBui
       }
       return loggingConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2333,12 +2306,11 @@ public static com.google.cloud.dataproc.v1.PySparkJob getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PySparkJob parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PySparkJob(input, extensionRegistry);
+        return new PySparkJob(input, extensionRegistry);
     }
   };
 
@@ -2351,7 +2323,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.PySparkJob getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/QueryList.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/QueryList.java
index 922f85972c0f..ebe9e3d13ca9 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/QueryList.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/QueryList.java
@@ -33,9 +33,6 @@ private QueryList(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private QueryList(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -56,13 +60,6 @@ private QueryList(
             queries_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private QueryList(
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_QueryList_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_QueryList_fieldAccessorTable
@@ -185,7 +181,6 @@ public java.lang.String getQueries(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -195,7 +190,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < queries_.size(); i++) {
@@ -204,7 +198,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -326,7 +319,6 @@ public static com.google.cloud.dataproc.v1.QueryList parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -334,7 +326,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.QueryList prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -362,7 +353,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_QueryList_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_QueryList_fieldAccessorTable
@@ -385,7 +375,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       queries_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -393,18 +382,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_QueryList_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.QueryList getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.QueryList.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.QueryList build() {
       com.google.cloud.dataproc.v1.QueryList result = buildPartial();
       if (!result.isInitialized()) {
@@ -413,7 +399,6 @@ public com.google.cloud.dataproc.v1.QueryList build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.QueryList buildPartial() {
       com.google.cloud.dataproc.v1.QueryList result = new com.google.cloud.dataproc.v1.QueryList(this);
       int from_bitField0_ = bitField0_;
@@ -426,39 +411,32 @@ public com.google.cloud.dataproc.v1.QueryList buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.QueryList) {
         return mergeFrom((com.google.cloud.dataproc.v1.QueryList)other);
@@ -485,12 +463,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.QueryList other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -747,13 +723,11 @@ public Builder addQueriesBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -775,12 +749,11 @@ public static com.google.cloud.dataproc.v1.QueryList getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public QueryList parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new QueryList(input, extensionRegistry);
+        return new QueryList(input, extensionRegistry);
     }
   };
 
@@ -793,7 +766,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.QueryList getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SoftwareConfig.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SoftwareConfig.java
index 2bb21b8ea8ed..8300a825f392 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SoftwareConfig.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SoftwareConfig.java
@@ -33,9 +33,6 @@ private SoftwareConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private SoftwareConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private SoftwareConfig(
                 properties__.getKey(), properties__.getValue());
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private SoftwareConfig(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -102,7 +98,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_SoftwareConfig_fieldAccessorTable
@@ -306,7 +301,6 @@ public java.lang.String getPropertiesOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -316,7 +310,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getImageVersionBytes().isEmpty()) {
@@ -331,7 +324,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -462,7 +454,6 @@ public static com.google.cloud.dataproc.v1.SoftwareConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -470,7 +461,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.SoftwareConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -520,7 +510,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_SoftwareConfig_fieldAccessorTable
@@ -543,7 +532,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       imageVersion_ = "";
@@ -552,18 +540,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_SoftwareConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.SoftwareConfig getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.SoftwareConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.SoftwareConfig build() {
       com.google.cloud.dataproc.v1.SoftwareConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -572,7 +557,6 @@ public com.google.cloud.dataproc.v1.SoftwareConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.SoftwareConfig buildPartial() {
       com.google.cloud.dataproc.v1.SoftwareConfig result = new com.google.cloud.dataproc.v1.SoftwareConfig(this);
       int from_bitField0_ = bitField0_;
@@ -585,39 +569,32 @@ public com.google.cloud.dataproc.v1.SoftwareConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.SoftwareConfig) {
         return mergeFrom((com.google.cloud.dataproc.v1.SoftwareConfig)other);
@@ -640,12 +617,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.SoftwareConfig other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1012,13 +987,11 @@ public Builder putAllProperties(
           .putAll(values);
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1040,12 +1013,11 @@ public static com.google.cloud.dataproc.v1.SoftwareConfig getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SoftwareConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SoftwareConfig(input, extensionRegistry);
+        return new SoftwareConfig(input, extensionRegistry);
     }
   };
 
@@ -1058,7 +1030,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.SoftwareConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SparkJob.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SparkJob.java
index cedf2b2167ce..998356dc282c 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SparkJob.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SparkJob.java
@@ -37,9 +37,6 @@ private SparkJob(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private SparkJob(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             driverCase_ = 1;
@@ -125,13 +129,6 @@ private SparkJob(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -162,7 +159,6 @@ private SparkJob(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -173,7 +169,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_SparkJob_fieldAccessorTable
@@ -666,7 +661,6 @@ public com.google.cloud.dataproc.v1.LoggingConfigOrBuilder getLoggingConfigOrBui
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -676,7 +670,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (driverCase_ == 1) {
@@ -709,7 +702,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -935,7 +927,6 @@ public static com.google.cloud.dataproc.v1.SparkJob parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -943,7 +934,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.SparkJob prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -994,7 +984,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_SparkJob_fieldAccessorTable
@@ -1017,7 +1006,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       args_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -1040,18 +1028,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_SparkJob_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.SparkJob getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.SparkJob.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.SparkJob build() {
       com.google.cloud.dataproc.v1.SparkJob result = buildPartial();
       if (!result.isInitialized()) {
@@ -1060,7 +1045,6 @@ public com.google.cloud.dataproc.v1.SparkJob build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.SparkJob buildPartial() {
       com.google.cloud.dataproc.v1.SparkJob result = new com.google.cloud.dataproc.v1.SparkJob(this);
       int from_bitField0_ = bitField0_;
@@ -1104,39 +1088,32 @@ public com.google.cloud.dataproc.v1.SparkJob buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.SparkJob) {
         return mergeFrom((com.google.cloud.dataproc.v1.SparkJob)other);
@@ -1215,12 +1192,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.SparkJob other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2358,13 +2333,11 @@ public com.google.cloud.dataproc.v1.LoggingConfigOrBuilder getLoggingConfigOrBui
       }
       return loggingConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2386,12 +2359,11 @@ public static com.google.cloud.dataproc.v1.SparkJob getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SparkJob parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SparkJob(input, extensionRegistry);
+        return new SparkJob(input, extensionRegistry);
     }
   };
 
@@ -2404,7 +2376,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.SparkJob getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SparkSqlJob.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SparkSqlJob.java
index 082a7ba5295c..5b484ef1ebe2 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SparkSqlJob.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SparkSqlJob.java
@@ -34,9 +34,6 @@ private SparkSqlJob(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private SparkSqlJob(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             queriesCase_ = 1;
@@ -116,13 +120,6 @@ private SparkSqlJob(
             jarFileUris_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -144,7 +141,6 @@ private SparkSqlJob(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -157,7 +153,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_SparkSqlJob_fieldAccessorTable
@@ -568,7 +563,6 @@ public com.google.cloud.dataproc.v1.LoggingConfigOrBuilder getLoggingConfigOrBui
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -578,7 +572,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (queriesCase_ == 1) {
@@ -608,7 +601,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -809,7 +801,6 @@ public static com.google.cloud.dataproc.v1.SparkSqlJob parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -817,7 +808,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.SparkSqlJob prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -872,7 +862,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_SparkSqlJob_fieldAccessorTable
@@ -895,7 +884,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       internalGetMutableScriptVariables().clear();
@@ -913,18 +901,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_SparkSqlJob_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.SparkSqlJob getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.SparkSqlJob.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.SparkSqlJob build() {
       com.google.cloud.dataproc.v1.SparkSqlJob result = buildPartial();
       if (!result.isInitialized()) {
@@ -933,7 +918,6 @@ public com.google.cloud.dataproc.v1.SparkSqlJob build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.SparkSqlJob buildPartial() {
       com.google.cloud.dataproc.v1.SparkSqlJob result = new com.google.cloud.dataproc.v1.SparkSqlJob(this);
       int from_bitField0_ = bitField0_;
@@ -968,39 +952,32 @@ public com.google.cloud.dataproc.v1.SparkSqlJob buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.SparkSqlJob) {
         return mergeFrom((com.google.cloud.dataproc.v1.SparkSqlJob)other);
@@ -1049,12 +1026,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.SparkSqlJob other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1966,13 +1941,11 @@ public com.google.cloud.dataproc.v1.LoggingConfigOrBuilder getLoggingConfigOrBui
       }
       return loggingConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1994,12 +1967,11 @@ public static com.google.cloud.dataproc.v1.SparkSqlJob getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SparkSqlJob parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SparkSqlJob(input, extensionRegistry);
+        return new SparkSqlJob(input, extensionRegistry);
     }
   };
 
@@ -2012,7 +1984,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.SparkSqlJob getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SubmitJobRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SubmitJobRequest.java
index 05cccdda1e49..3314ff07fc49 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SubmitJobRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/SubmitJobRequest.java
@@ -34,9 +34,6 @@ private SubmitJobRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private SubmitJobRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private SubmitJobRequest(
             region_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private SubmitJobRequest(
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_SubmitJobRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_SubmitJobRequest_fieldAccessorTable
@@ -225,7 +221,6 @@ public com.google.cloud.dataproc.v1.JobOrBuilder getJobOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -235,7 +230,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -250,7 +244,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -385,7 +378,6 @@ public static com.google.cloud.dataproc.v1.SubmitJobRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -393,7 +385,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.SubmitJobRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -421,7 +412,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_SubmitJobRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_SubmitJobRequest_fieldAccessorTable
@@ -444,7 +434,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -460,18 +449,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_SubmitJobRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.SubmitJobRequest getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.SubmitJobRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.SubmitJobRequest build() {
       com.google.cloud.dataproc.v1.SubmitJobRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -480,7 +466,6 @@ public com.google.cloud.dataproc.v1.SubmitJobRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.SubmitJobRequest buildPartial() {
       com.google.cloud.dataproc.v1.SubmitJobRequest result = new com.google.cloud.dataproc.v1.SubmitJobRequest(this);
       result.projectId_ = projectId_;
@@ -494,39 +479,32 @@ public com.google.cloud.dataproc.v1.SubmitJobRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.SubmitJobRequest) {
         return mergeFrom((com.google.cloud.dataproc.v1.SubmitJobRequest)other);
@@ -554,12 +532,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.SubmitJobRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -913,13 +889,11 @@ public com.google.cloud.dataproc.v1.JobOrBuilder getJobOrBuilder() {
       }
       return jobBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -941,12 +915,11 @@ public static com.google.cloud.dataproc.v1.SubmitJobRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SubmitJobRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SubmitJobRequest(input, extensionRegistry);
+        return new SubmitJobRequest(input, extensionRegistry);
     }
   };
 
@@ -959,7 +932,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.SubmitJobRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/UpdateClusterRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/UpdateClusterRequest.java
index 17583b5e971e..fb996d8e0463 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/UpdateClusterRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/UpdateClusterRequest.java
@@ -35,9 +35,6 @@ private UpdateClusterRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private UpdateClusterRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -93,13 +97,6 @@ private UpdateClusterRequest(
             region_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -117,7 +114,6 @@ private UpdateClusterRequest(
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_UpdateClusterRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_UpdateClusterRequest_fieldAccessorTable
@@ -449,7 +445,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -459,7 +454,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -480,7 +474,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -635,7 +628,6 @@ public static com.google.cloud.dataproc.v1.UpdateClusterRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -643,7 +635,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.UpdateClusterRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -671,7 +662,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_UpdateClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_UpdateClusterRequest_fieldAccessorTable
@@ -694,7 +684,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -718,18 +707,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.ClustersProto.internal_static_google_cloud_dataproc_v1_UpdateClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.UpdateClusterRequest getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.UpdateClusterRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.UpdateClusterRequest build() {
       com.google.cloud.dataproc.v1.UpdateClusterRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -738,7 +724,6 @@ public com.google.cloud.dataproc.v1.UpdateClusterRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.UpdateClusterRequest buildPartial() {
       com.google.cloud.dataproc.v1.UpdateClusterRequest result = new com.google.cloud.dataproc.v1.UpdateClusterRequest(this);
       result.projectId_ = projectId_;
@@ -758,39 +743,32 @@ public com.google.cloud.dataproc.v1.UpdateClusterRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.UpdateClusterRequest) {
         return mergeFrom((com.google.cloud.dataproc.v1.UpdateClusterRequest)other);
@@ -825,12 +803,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.UpdateClusterRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1813,13 +1789,11 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
       }
       return updateMaskBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1841,12 +1815,11 @@ public static com.google.cloud.dataproc.v1.UpdateClusterRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateClusterRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateClusterRequest(input, extensionRegistry);
+        return new UpdateClusterRequest(input, extensionRegistry);
     }
   };
 
@@ -1859,7 +1832,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.UpdateClusterRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/UpdateJobRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/UpdateJobRequest.java
index 53711be520fd..400c93dae0ec 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/UpdateJobRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/UpdateJobRequest.java
@@ -35,9 +35,6 @@ private UpdateJobRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private UpdateJobRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -93,13 +97,6 @@ private UpdateJobRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -117,7 +114,6 @@ private UpdateJobRequest(
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_UpdateJobRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_UpdateJobRequest_fieldAccessorTable
@@ -335,7 +331,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -345,7 +340,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -366,7 +360,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -521,7 +514,6 @@ public static com.google.cloud.dataproc.v1.UpdateJobRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -529,7 +521,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.UpdateJobRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -557,7 +548,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_UpdateJobRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_UpdateJobRequest_fieldAccessorTable
@@ -580,7 +570,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -604,18 +593,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_UpdateJobRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.UpdateJobRequest getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.UpdateJobRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.UpdateJobRequest build() {
       com.google.cloud.dataproc.v1.UpdateJobRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -624,7 +610,6 @@ public com.google.cloud.dataproc.v1.UpdateJobRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.UpdateJobRequest buildPartial() {
       com.google.cloud.dataproc.v1.UpdateJobRequest result = new com.google.cloud.dataproc.v1.UpdateJobRequest(this);
       result.projectId_ = projectId_;
@@ -644,39 +629,32 @@ public com.google.cloud.dataproc.v1.UpdateJobRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.UpdateJobRequest) {
         return mergeFrom((com.google.cloud.dataproc.v1.UpdateJobRequest)other);
@@ -711,12 +689,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.UpdateJobRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1357,13 +1333,11 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
       }
       return updateMaskBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1385,12 +1359,11 @@ public static com.google.cloud.dataproc.v1.UpdateJobRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateJobRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateJobRequest(input, extensionRegistry);
+        return new UpdateJobRequest(input, extensionRegistry);
     }
   };
 
@@ -1403,7 +1376,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.UpdateJobRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/YarnApplication.java b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/YarnApplication.java
index 0488ba6cddf6..247b7752bbf1 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/YarnApplication.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1/src/main/java/com/google/cloud/dataproc/v1/YarnApplication.java
@@ -39,9 +39,6 @@ private YarnApplication(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private YarnApplication(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -76,13 +80,6 @@ private YarnApplication(
             trackingUrl_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -100,7 +97,6 @@ private YarnApplication(
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_YarnApplication_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_YarnApplication_fieldAccessorTable
@@ -408,7 +404,6 @@ public int getStateValue() {
    * .google.cloud.dataproc.v1.YarnApplication.State state = 2;
    */
   public com.google.cloud.dataproc.v1.YarnApplication.State getState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dataproc.v1.YarnApplication.State result = com.google.cloud.dataproc.v1.YarnApplication.State.valueOf(state_);
     return result == null ? com.google.cloud.dataproc.v1.YarnApplication.State.UNRECOGNIZED : result;
   }
@@ -475,7 +470,6 @@ public java.lang.String getTrackingUrl() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -485,7 +479,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -503,7 +496,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -643,7 +635,6 @@ public static com.google.cloud.dataproc.v1.YarnApplication parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -651,7 +642,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1.YarnApplication prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -682,7 +672,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_YarnApplication_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_YarnApplication_fieldAccessorTable
@@ -705,7 +694,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -719,18 +707,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1.JobsProto.internal_static_google_cloud_dataproc_v1_YarnApplication_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.YarnApplication getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1.YarnApplication.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.YarnApplication build() {
       com.google.cloud.dataproc.v1.YarnApplication result = buildPartial();
       if (!result.isInitialized()) {
@@ -739,7 +724,6 @@ public com.google.cloud.dataproc.v1.YarnApplication build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1.YarnApplication buildPartial() {
       com.google.cloud.dataproc.v1.YarnApplication result = new com.google.cloud.dataproc.v1.YarnApplication(this);
       result.name_ = name_;
@@ -750,39 +734,32 @@ public com.google.cloud.dataproc.v1.YarnApplication buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1.YarnApplication) {
         return mergeFrom((com.google.cloud.dataproc.v1.YarnApplication)other);
@@ -813,12 +790,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1.YarnApplication other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -957,7 +932,6 @@ public Builder setStateValue(int value) {
      * .google.cloud.dataproc.v1.YarnApplication.State state = 2;
      */
     public com.google.cloud.dataproc.v1.YarnApplication.State getState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dataproc.v1.YarnApplication.State result = com.google.cloud.dataproc.v1.YarnApplication.State.valueOf(state_);
       return result == null ? com.google.cloud.dataproc.v1.YarnApplication.State.UNRECOGNIZED : result;
     }
@@ -1132,13 +1106,11 @@ public Builder setTrackingUrlBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1160,12 +1132,11 @@ public static com.google.cloud.dataproc.v1.YarnApplication getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public YarnApplication parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new YarnApplication(input, extensionRegistry);
+        return new YarnApplication(input, extensionRegistry);
     }
   };
 
@@ -1178,7 +1149,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1.YarnApplication getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/AcceleratorConfig.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/AcceleratorConfig.java
index 990efc99efde..59d6853325d7 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/AcceleratorConfig.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/AcceleratorConfig.java
@@ -35,9 +35,6 @@ private AcceleratorConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private AcceleratorConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private AcceleratorConfig(
             acceleratorCount_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private AcceleratorConfig(
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_AcceleratorConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_AcceleratorConfig_fieldAccessorTable
@@ -168,7 +164,6 @@ public int getAcceleratorCount() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -178,7 +173,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getAcceleratorTypeUriBytes().isEmpty()) {
@@ -190,7 +184,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -313,7 +306,6 @@ public static com.google.cloud.dataproc.v1beta2.AcceleratorConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -321,7 +313,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.AcceleratorConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -350,7 +341,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_AcceleratorConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_AcceleratorConfig_fieldAccessorTable
@@ -373,7 +363,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       acceleratorTypeUri_ = "";
@@ -383,18 +372,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_AcceleratorConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.AcceleratorConfig getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.AcceleratorConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.AcceleratorConfig build() {
       com.google.cloud.dataproc.v1beta2.AcceleratorConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -403,7 +389,6 @@ public com.google.cloud.dataproc.v1beta2.AcceleratorConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.AcceleratorConfig buildPartial() {
       com.google.cloud.dataproc.v1beta2.AcceleratorConfig result = new com.google.cloud.dataproc.v1beta2.AcceleratorConfig(this);
       result.acceleratorTypeUri_ = acceleratorTypeUri_;
@@ -412,39 +397,32 @@ public com.google.cloud.dataproc.v1beta2.AcceleratorConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.AcceleratorConfig) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.AcceleratorConfig)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.AcceleratorConfig oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -668,13 +644,11 @@ public Builder clearAcceleratorCount() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -696,12 +670,11 @@ public static com.google.cloud.dataproc.v1beta2.AcceleratorConfig getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AcceleratorConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AcceleratorConfig(input, extensionRegistry);
+        return new AcceleratorConfig(input, extensionRegistry);
     }
   };
 
@@ -714,7 +687,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.AcceleratorConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/CancelJobRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/CancelJobRequest.java
index cad2f6e50eee..773fb8a720ae 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/CancelJobRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/CancelJobRequest.java
@@ -35,9 +35,6 @@ private CancelJobRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private CancelJobRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -67,13 +71,6 @@ private CancelJobRequest(
             region_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private CancelJobRequest(
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_CancelJobRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_CancelJobRequest_fieldAccessorTable
@@ -228,7 +224,6 @@ public java.lang.String getJobId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -238,7 +233,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -253,7 +247,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -382,7 +375,6 @@ public static com.google.cloud.dataproc.v1beta2.CancelJobRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -390,7 +382,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.CancelJobRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -418,7 +409,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_CancelJobRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_CancelJobRequest_fieldAccessorTable
@@ -441,7 +431,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -453,18 +442,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_CancelJobRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.CancelJobRequest getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.CancelJobRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.CancelJobRequest build() {
       com.google.cloud.dataproc.v1beta2.CancelJobRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -473,7 +459,6 @@ public com.google.cloud.dataproc.v1beta2.CancelJobRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.CancelJobRequest buildPartial() {
       com.google.cloud.dataproc.v1beta2.CancelJobRequest result = new com.google.cloud.dataproc.v1beta2.CancelJobRequest(this);
       result.projectId_ = projectId_;
@@ -483,39 +468,32 @@ public com.google.cloud.dataproc.v1beta2.CancelJobRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.CancelJobRequest) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.CancelJobRequest)other);
@@ -544,12 +522,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.CancelJobRequest othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -839,13 +815,11 @@ public Builder setJobIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -867,12 +841,11 @@ public static com.google.cloud.dataproc.v1beta2.CancelJobRequest getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CancelJobRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CancelJobRequest(input, extensionRegistry);
+        return new CancelJobRequest(input, extensionRegistry);
     }
   };
 
@@ -885,7 +858,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.CancelJobRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/Cluster.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/Cluster.java
index 35f46528be92..e673615f6ba9 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/Cluster.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/Cluster.java
@@ -37,9 +37,6 @@ private Cluster(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private Cluster(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -130,13 +134,6 @@ private Cluster(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -158,7 +155,6 @@ private Cluster(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -169,7 +165,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_Cluster_fieldAccessorTable
@@ -584,7 +579,6 @@ public com.google.cloud.dataproc.v1beta2.ClusterMetricsOrBuilder getMetricsOrBui
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -594,7 +588,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -627,7 +620,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -821,7 +813,6 @@ public static com.google.cloud.dataproc.v1beta2.Cluster parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -829,7 +820,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.Cluster prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -880,7 +870,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_Cluster_fieldAccessorTable
@@ -904,7 +893,6 @@ private void maybeForceBuilderInitialization() {
         getStatusHistoryFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -941,18 +929,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_Cluster_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.Cluster getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.Cluster.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.Cluster build() {
       com.google.cloud.dataproc.v1beta2.Cluster result = buildPartial();
       if (!result.isInitialized()) {
@@ -961,7 +946,6 @@ public com.google.cloud.dataproc.v1beta2.Cluster build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.Cluster buildPartial() {
       com.google.cloud.dataproc.v1beta2.Cluster result = new com.google.cloud.dataproc.v1beta2.Cluster(this);
       int from_bitField0_ = bitField0_;
@@ -1000,39 +984,32 @@ public com.google.cloud.dataproc.v1beta2.Cluster buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.Cluster) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.Cluster)other);
@@ -1098,12 +1075,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.Cluster other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2383,13 +2358,11 @@ public com.google.cloud.dataproc.v1beta2.ClusterMetricsOrBuilder getMetricsOrBui
       }
       return metricsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2411,12 +2384,11 @@ public static com.google.cloud.dataproc.v1beta2.Cluster getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Cluster parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Cluster(input, extensionRegistry);
+        return new Cluster(input, extensionRegistry);
     }
   };
 
@@ -2429,7 +2401,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.Cluster getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterConfig.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterConfig.java
index 7bc95dfcbc9e..6a06ccdc5d55 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterConfig.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterConfig.java
@@ -34,9 +34,6 @@ private ClusterConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ClusterConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -141,13 +145,6 @@ private ClusterConfig(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -168,7 +165,6 @@ private ClusterConfig(
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_ClusterConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_ClusterConfig_fieldAccessorTable
@@ -540,7 +536,6 @@ public com.google.cloud.dataproc.v1beta2.NodeInitializationActionOrBuilder getIn
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -550,7 +545,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getConfigBucketBytes().isEmpty()) {
@@ -580,7 +574,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -783,7 +776,6 @@ public static com.google.cloud.dataproc.v1beta2.ClusterConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -791,7 +783,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.ClusterConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -819,7 +810,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_ClusterConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_ClusterConfig_fieldAccessorTable
@@ -843,7 +833,6 @@ private void maybeForceBuilderInitialization() {
         getInitializationActionsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       configBucket_ = "";
@@ -893,18 +882,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_ClusterConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ClusterConfig getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.ClusterConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ClusterConfig build() {
       com.google.cloud.dataproc.v1beta2.ClusterConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -913,7 +899,6 @@ public com.google.cloud.dataproc.v1beta2.ClusterConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ClusterConfig buildPartial() {
       com.google.cloud.dataproc.v1beta2.ClusterConfig result = new com.google.cloud.dataproc.v1beta2.ClusterConfig(this);
       int from_bitField0_ = bitField0_;
@@ -963,39 +948,32 @@ public com.google.cloud.dataproc.v1beta2.ClusterConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.ClusterConfig) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.ClusterConfig)other);
@@ -1060,12 +1038,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.ClusterConfig other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2626,13 +2602,11 @@ public com.google.cloud.dataproc.v1beta2.NodeInitializationAction.Builder addIni
       }
       return initializationActionsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2654,12 +2628,11 @@ public static com.google.cloud.dataproc.v1beta2.ClusterConfig getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ClusterConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ClusterConfig(input, extensionRegistry);
+        return new ClusterConfig(input, extensionRegistry);
     }
   };
 
@@ -2672,7 +2645,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.ClusterConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterMetrics.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterMetrics.java
index c5b508a058f4..e4e721a727b6 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterMetrics.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterMetrics.java
@@ -34,9 +34,6 @@ private ClusterMetrics(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ClusterMetrics(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               hdfsMetrics_ = com.google.protobuf.MapField.newMapField(
@@ -74,13 +78,6 @@ private ClusterMetrics(
                 yarnMetrics__.getKey(), yarnMetrics__.getValue());
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -99,7 +96,6 @@ private ClusterMetrics(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -112,7 +108,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_ClusterMetrics_fieldAccessorTable
@@ -305,7 +300,6 @@ public long getYarnMetricsOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -315,7 +309,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     com.google.protobuf.GeneratedMessageV3
@@ -333,7 +326,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -473,7 +465,6 @@ public static com.google.cloud.dataproc.v1beta2.ClusterMetrics parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -481,7 +472,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.ClusterMetrics prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -537,7 +527,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_ClusterMetrics_fieldAccessorTable
@@ -560,7 +549,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       internalGetMutableHdfsMetrics().clear();
@@ -568,18 +556,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_ClusterMetrics_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ClusterMetrics getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.ClusterMetrics.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ClusterMetrics build() {
       com.google.cloud.dataproc.v1beta2.ClusterMetrics result = buildPartial();
       if (!result.isInitialized()) {
@@ -588,7 +573,6 @@ public com.google.cloud.dataproc.v1beta2.ClusterMetrics build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ClusterMetrics buildPartial() {
       com.google.cloud.dataproc.v1beta2.ClusterMetrics result = new com.google.cloud.dataproc.v1beta2.ClusterMetrics(this);
       int from_bitField0_ = bitField0_;
@@ -600,39 +584,32 @@ public com.google.cloud.dataproc.v1beta2.ClusterMetrics buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.ClusterMetrics) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.ClusterMetrics)other);
@@ -653,12 +630,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.ClusterMetrics other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -979,13 +954,11 @@ public Builder putAllYarnMetrics(
           .putAll(values);
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1007,12 +980,11 @@ public static com.google.cloud.dataproc.v1beta2.ClusterMetrics getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ClusterMetrics parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ClusterMetrics(input, extensionRegistry);
+        return new ClusterMetrics(input, extensionRegistry);
     }
   };
 
@@ -1025,7 +997,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.ClusterMetrics getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterOperation.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterOperation.java
index ef617f02cd08..a696342fd663 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterOperation.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterOperation.java
@@ -35,9 +35,6 @@ private ClusterOperation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ClusterOperation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ClusterOperation(
             done_ = input.readBool();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ClusterOperation(
     return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_ClusterOperation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_ClusterOperation_fieldAccessorTable
@@ -196,7 +192,6 @@ public boolean getDone() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -206,7 +201,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getOperationIdBytes().isEmpty()) {
@@ -221,7 +215,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -352,7 +345,6 @@ public static com.google.cloud.dataproc.v1beta2.ClusterOperation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -360,7 +352,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.ClusterOperation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -388,7 +379,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_ClusterOperation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_ClusterOperation_fieldAccessorTable
@@ -411,7 +401,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       operationId_ = "";
@@ -423,18 +412,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_ClusterOperation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ClusterOperation getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.ClusterOperation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ClusterOperation build() {
       com.google.cloud.dataproc.v1beta2.ClusterOperation result = buildPartial();
       if (!result.isInitialized()) {
@@ -443,7 +429,6 @@ public com.google.cloud.dataproc.v1beta2.ClusterOperation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ClusterOperation buildPartial() {
       com.google.cloud.dataproc.v1beta2.ClusterOperation result = new com.google.cloud.dataproc.v1beta2.ClusterOperation(this);
       result.operationId_ = operationId_;
@@ -453,39 +438,32 @@ public com.google.cloud.dataproc.v1beta2.ClusterOperation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.ClusterOperation) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.ClusterOperation)other);
@@ -513,12 +491,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.ClusterOperation othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -752,13 +728,11 @@ public Builder clearDone() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -780,12 +754,11 @@ public static com.google.cloud.dataproc.v1beta2.ClusterOperation getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ClusterOperation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ClusterOperation(input, extensionRegistry);
+        return new ClusterOperation(input, extensionRegistry);
     }
   };
 
@@ -798,7 +771,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.ClusterOperation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterOperationMetadata.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterOperationMetadata.java
index 281fa5617115..2f9effff375c 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterOperationMetadata.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterOperationMetadata.java
@@ -38,9 +38,6 @@ private ClusterOperationMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private ClusterOperationMetadata(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 58: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -120,13 +124,6 @@ private ClusterOperationMetadata(
             warnings_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -151,7 +148,6 @@ private ClusterOperationMetadata(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -162,7 +158,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.OperationsProto.internal_static_google_cloud_dataproc_v1beta2_ClusterOperationMetadata_fieldAccessorTable
@@ -565,7 +560,6 @@ public java.lang.String getWarnings(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -575,7 +569,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getClusterNameBytes().isEmpty()) {
@@ -608,7 +601,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -797,7 +789,6 @@ public static com.google.cloud.dataproc.v1beta2.ClusterOperationMetadata parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -805,7 +796,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.ClusterOperationMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -855,7 +845,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.OperationsProto.internal_static_google_cloud_dataproc_v1beta2_ClusterOperationMetadata_fieldAccessorTable
@@ -879,7 +868,6 @@ private void maybeForceBuilderInitialization() {
         getStatusHistoryFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       clusterName_ = "";
@@ -908,18 +896,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.OperationsProto.internal_static_google_cloud_dataproc_v1beta2_ClusterOperationMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ClusterOperationMetadata getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.ClusterOperationMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ClusterOperationMetadata build() {
       com.google.cloud.dataproc.v1beta2.ClusterOperationMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -928,7 +913,6 @@ public com.google.cloud.dataproc.v1beta2.ClusterOperationMetadata build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ClusterOperationMetadata buildPartial() {
       com.google.cloud.dataproc.v1beta2.ClusterOperationMetadata result = new com.google.cloud.dataproc.v1beta2.ClusterOperationMetadata(this);
       int from_bitField0_ = bitField0_;
@@ -963,39 +947,32 @@ public com.google.cloud.dataproc.v1beta2.ClusterOperationMetadata buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.ClusterOperationMetadata) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.ClusterOperationMetadata)other);
@@ -1069,12 +1046,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.ClusterOperationMetad
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2195,13 +2170,11 @@ public Builder addWarningsBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2223,12 +2196,11 @@ public static com.google.cloud.dataproc.v1beta2.ClusterOperationMetadata getDefa
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ClusterOperationMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ClusterOperationMetadata(input, extensionRegistry);
+        return new ClusterOperationMetadata(input, extensionRegistry);
     }
   };
 
@@ -2241,7 +2213,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.ClusterOperationMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterOperationStatus.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterOperationStatus.java
index 69f1d3e09a47..8b1355a07f02 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterOperationStatus.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterOperationStatus.java
@@ -35,9 +35,6 @@ private ClusterOperationStatus(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ClusterOperationStatus(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -80,13 +84,6 @@ private ClusterOperationStatus(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private ClusterOperationStatus(
     return com.google.cloud.dataproc.v1beta2.OperationsProto.internal_static_google_cloud_dataproc_v1beta2_ClusterOperationStatus_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.OperationsProto.internal_static_google_cloud_dataproc_v1beta2_ClusterOperationStatus_fieldAccessorTable
@@ -284,7 +280,6 @@ public int getStateValue() {
    * .google.cloud.dataproc.v1beta2.ClusterOperationStatus.State state = 1;
    */
   public com.google.cloud.dataproc.v1beta2.ClusterOperationStatus.State getState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dataproc.v1beta2.ClusterOperationStatus.State result = com.google.cloud.dataproc.v1beta2.ClusterOperationStatus.State.valueOf(state_);
     return result == null ? com.google.cloud.dataproc.v1beta2.ClusterOperationStatus.State.UNRECOGNIZED : result;
   }
@@ -407,7 +402,6 @@ public com.google.protobuf.TimestampOrBuilder getStateStartTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -417,7 +411,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (state_ != com.google.cloud.dataproc.v1beta2.ClusterOperationStatus.State.UNKNOWN.getNumber()) {
@@ -435,7 +428,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -577,7 +569,6 @@ public static com.google.cloud.dataproc.v1beta2.ClusterOperationStatus parseFrom
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -585,7 +576,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.ClusterOperationStatus prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -613,7 +603,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.OperationsProto.internal_static_google_cloud_dataproc_v1beta2_ClusterOperationStatus_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.OperationsProto.internal_static_google_cloud_dataproc_v1beta2_ClusterOperationStatus_fieldAccessorTable
@@ -636,7 +625,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       state_ = 0;
@@ -654,18 +642,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.OperationsProto.internal_static_google_cloud_dataproc_v1beta2_ClusterOperationStatus_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ClusterOperationStatus getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.ClusterOperationStatus.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ClusterOperationStatus build() {
       com.google.cloud.dataproc.v1beta2.ClusterOperationStatus result = buildPartial();
       if (!result.isInitialized()) {
@@ -674,7 +659,6 @@ public com.google.cloud.dataproc.v1beta2.ClusterOperationStatus build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ClusterOperationStatus buildPartial() {
       com.google.cloud.dataproc.v1beta2.ClusterOperationStatus result = new com.google.cloud.dataproc.v1beta2.ClusterOperationStatus(this);
       result.state_ = state_;
@@ -689,39 +673,32 @@ public com.google.cloud.dataproc.v1beta2.ClusterOperationStatus buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.ClusterOperationStatus) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.ClusterOperationStatus)other);
@@ -752,12 +729,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.ClusterOperationStatu
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -807,7 +782,6 @@ public Builder setStateValue(int value) {
      * .google.cloud.dataproc.v1beta2.ClusterOperationStatus.State state = 1;
      */
     public com.google.cloud.dataproc.v1beta2.ClusterOperationStatus.State getState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dataproc.v1beta2.ClusterOperationStatus.State result = com.google.cloud.dataproc.v1beta2.ClusterOperationStatus.State.valueOf(state_);
       return result == null ? com.google.cloud.dataproc.v1beta2.ClusterOperationStatus.State.UNRECOGNIZED : result;
     }
@@ -1171,13 +1145,11 @@ public com.google.protobuf.TimestampOrBuilder getStateStartTimeOrBuilder() {
       }
       return stateStartTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1199,12 +1171,11 @@ public static com.google.cloud.dataproc.v1beta2.ClusterOperationStatus getDefaul
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ClusterOperationStatus parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ClusterOperationStatus(input, extensionRegistry);
+        return new ClusterOperationStatus(input, extensionRegistry);
     }
   };
 
@@ -1217,7 +1188,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.ClusterOperationStatus getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterSelector.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterSelector.java
index 0cb421173e4b..4493cf6359ba 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterSelector.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterSelector.java
@@ -33,9 +33,6 @@ private ClusterSelector(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ClusterSelector(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ClusterSelector(
                 clusterLabels__.getKey(), clusterLabels__.getValue());
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private ClusterSelector(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -102,7 +98,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_ClusterSelector_fieldAccessorTable
@@ -256,7 +251,6 @@ public java.lang.String getClusterLabelsOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -266,7 +260,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getZoneBytes().isEmpty()) {
@@ -281,7 +274,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -412,7 +404,6 @@ public static com.google.cloud.dataproc.v1beta2.ClusterSelector parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -420,7 +411,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.ClusterSelector prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -470,7 +460,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_ClusterSelector_fieldAccessorTable
@@ -493,7 +482,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       zone_ = "";
@@ -502,18 +490,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_ClusterSelector_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ClusterSelector getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.ClusterSelector.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ClusterSelector build() {
       com.google.cloud.dataproc.v1beta2.ClusterSelector result = buildPartial();
       if (!result.isInitialized()) {
@@ -522,7 +507,6 @@ public com.google.cloud.dataproc.v1beta2.ClusterSelector build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ClusterSelector buildPartial() {
       com.google.cloud.dataproc.v1beta2.ClusterSelector result = new com.google.cloud.dataproc.v1beta2.ClusterSelector(this);
       int from_bitField0_ = bitField0_;
@@ -535,39 +519,32 @@ public com.google.cloud.dataproc.v1beta2.ClusterSelector buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.ClusterSelector) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.ClusterSelector)other);
@@ -590,12 +567,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.ClusterSelector other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -876,13 +851,11 @@ public Builder putAllClusterLabels(
           .putAll(values);
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -904,12 +877,11 @@ public static com.google.cloud.dataproc.v1beta2.ClusterSelector getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ClusterSelector parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ClusterSelector(input, extensionRegistry);
+        return new ClusterSelector(input, extensionRegistry);
     }
   };
 
@@ -922,7 +894,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.ClusterSelector getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterStatus.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterStatus.java
index b5c05475f07b..39f01205e134 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterStatus.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClusterStatus.java
@@ -35,9 +35,6 @@ private ClusterStatus(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ClusterStatus(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -80,13 +84,6 @@ private ClusterStatus(
             substate_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private ClusterStatus(
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_ClusterStatus_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_ClusterStatus_fieldAccessorTable
@@ -463,7 +459,6 @@ public int getStateValue() {
    * .google.cloud.dataproc.v1beta2.ClusterStatus.State state = 1;
    */
   public com.google.cloud.dataproc.v1beta2.ClusterStatus.State getState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dataproc.v1beta2.ClusterStatus.State result = com.google.cloud.dataproc.v1beta2.ClusterStatus.State.valueOf(state_);
     return result == null ? com.google.cloud.dataproc.v1beta2.ClusterStatus.State.UNRECOGNIZED : result;
   }
@@ -565,13 +560,11 @@ public int getSubstateValue() {
    * .google.cloud.dataproc.v1beta2.ClusterStatus.Substate substate = 4;
    */
   public com.google.cloud.dataproc.v1beta2.ClusterStatus.Substate getSubstate() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dataproc.v1beta2.ClusterStatus.Substate result = com.google.cloud.dataproc.v1beta2.ClusterStatus.Substate.valueOf(substate_);
     return result == null ? com.google.cloud.dataproc.v1beta2.ClusterStatus.Substate.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -581,7 +574,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (state_ != com.google.cloud.dataproc.v1beta2.ClusterStatus.State.UNKNOWN.getNumber()) {
@@ -599,7 +591,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -741,7 +732,6 @@ public static com.google.cloud.dataproc.v1beta2.ClusterStatus parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -749,7 +739,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.ClusterStatus prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -777,7 +766,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_ClusterStatus_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_ClusterStatus_fieldAccessorTable
@@ -800,7 +788,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       state_ = 0;
@@ -818,18 +805,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_ClusterStatus_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ClusterStatus getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.ClusterStatus.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ClusterStatus build() {
       com.google.cloud.dataproc.v1beta2.ClusterStatus result = buildPartial();
       if (!result.isInitialized()) {
@@ -838,7 +822,6 @@ public com.google.cloud.dataproc.v1beta2.ClusterStatus build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ClusterStatus buildPartial() {
       com.google.cloud.dataproc.v1beta2.ClusterStatus result = new com.google.cloud.dataproc.v1beta2.ClusterStatus(this);
       result.state_ = state_;
@@ -853,39 +836,32 @@ public com.google.cloud.dataproc.v1beta2.ClusterStatus buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.ClusterStatus) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.ClusterStatus)other);
@@ -915,12 +891,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.ClusterStatus other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -970,7 +944,6 @@ public Builder setStateValue(int value) {
      * .google.cloud.dataproc.v1beta2.ClusterStatus.State state = 1;
      */
     public com.google.cloud.dataproc.v1beta2.ClusterStatus.State getState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dataproc.v1beta2.ClusterStatus.State result = com.google.cloud.dataproc.v1beta2.ClusterStatus.State.valueOf(state_);
       return result == null ? com.google.cloud.dataproc.v1beta2.ClusterStatus.State.UNRECOGNIZED : result;
     }
@@ -1280,7 +1253,6 @@ public Builder setSubstateValue(int value) {
      * .google.cloud.dataproc.v1beta2.ClusterStatus.Substate substate = 4;
      */
     public com.google.cloud.dataproc.v1beta2.ClusterStatus.Substate getSubstate() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dataproc.v1beta2.ClusterStatus.Substate result = com.google.cloud.dataproc.v1beta2.ClusterStatus.Substate.valueOf(substate_);
       return result == null ? com.google.cloud.dataproc.v1beta2.ClusterStatus.Substate.UNRECOGNIZED : result;
     }
@@ -1315,13 +1287,11 @@ public Builder clearSubstate() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1343,12 +1313,11 @@ public static com.google.cloud.dataproc.v1beta2.ClusterStatus getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ClusterStatus parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ClusterStatus(input, extensionRegistry);
+        return new ClusterStatus(input, extensionRegistry);
     }
   };
 
@@ -1361,7 +1330,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.ClusterStatus getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClustersProto.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClustersProto.java
index 31d41dd5a1e8..2f409c26f6fc 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClustersProto.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ClustersProto.java
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       "eld_mask.proto\032\037google/protobuf/timestam" +
       "p.proto\"\276\003\n\007Cluster\022\022\n\nproject_id\030\001 \001(\t\022" +
       "\024\n\014cluster_name\030\002 \001(\t\022<\n\006config\030\003 \001(\0132,." +
-      "google.cloud.dataproc.v1beta2.ClusterCon" +
+      "google.cloud.dataproc.v1beta2.ClusterCon",
       "fig\022B\n\006labels\030\010 \003(\01322.google.cloud.datap" +
       "roc.v1beta2.Cluster.LabelsEntry\022<\n\006statu" +
       "s\030\004 \001(\0132,.google.cloud.dataproc.v1beta2." +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       "(\0132-.google.cloud.dataproc.v1beta2.Clust" +
       "erMetrics\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n" +
       "\005value\030\002 \001(\t:\0028\001\"\311\004\n\rClusterConfig\022\025\n\rco" +
-      "nfig_bucket\030\001 \001(\t\022K\n\022gce_cluster_config\030" +
+      "nfig_bucket\030\001 \001(\t\022K\n\022gce_cluster_config\030",
       "\010 \001(\0132/.google.cloud.dataproc.v1beta2.Gc" +
       "eClusterConfig\022I\n\rmaster_config\030\t \001(\01322." +
       "google.cloud.dataproc.v1beta2.InstanceGr" +
@@ -177,7 +177,7 @@ public static void registerAllExtensions(
       "google.cloud.dataproc.v1beta2.InstanceGr" +
       "oupConfig\022F\n\017software_config\030\r \001(\0132-.goo" +
       "gle.cloud.dataproc.v1beta2.SoftwareConfi" +
-      "g\022H\n\020lifecycle_config\030\016 \001(\0132..google.clo" +
+      "g\022H\n\020lifecycle_config\030\016 \001(\0132..google.clo",
       "ud.dataproc.v1beta2.LifecycleConfig\022W\n\026i" +
       "nitialization_actions\030\013 \003(\01327.google.clo" +
       "ud.dataproc.v1beta2.NodeInitializationAc" +
@@ -187,7 +187,7 @@ public static void registerAllExtensions(
       "rvice_account\030\010 \001(\t\022\036\n\026service_account_s" +
       "copes\030\003 \003(\t\022\014\n\004tags\030\004 \003(\t\022O\n\010metadata\030\005 " +
       "\003(\0132=.google.cloud.dataproc.v1beta2.GceC" +
-      "lusterConfig.MetadataEntry\032/\n\rMetadataEn" +
+      "lusterConfig.MetadataEntry\032/\n\rMetadataEn",
       "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\374\002\n\023" +
       "InstanceGroupConfig\022\025\n\rnum_instances\030\001 \001" +
       "(\005\022\026\n\016instance_names\030\002 \003(\t\022\021\n\timage_uri\030" +
@@ -197,7 +197,7 @@ public static void registerAllExtensions(
       "O\n\024managed_group_config\030\007 \001(\01321.google.c" +
       "loud.dataproc.v1beta2.ManagedGroupConfig" +
       "\022F\n\014accelerators\030\010 \003(\01320.google.cloud.da" +
-      "taproc.v1beta2.AcceleratorConfig\022\030\n\020min_" +
+      "taproc.v1beta2.AcceleratorConfig\022\030\n\020min_",
       "cpu_platform\030\t \001(\t\"Y\n\022ManagedGroupConfig" +
       "\022\036\n\026instance_template_name\030\001 \001(\t\022#\n\033inst" +
       "ance_group_manager_name\030\002 \001(\t\"L\n\021Acceler" +
@@ -207,7 +207,7 @@ public static void registerAllExtensions(
       "ize_gb\030\001 \001(\005\022\026\n\016num_local_ssds\030\002 \001(\005\"\272\001\n" +
       "\017LifecycleConfig\0222\n\017idle_delete_ttl\030\001 \001(" +
       "\0132\031.google.protobuf.Duration\0226\n\020auto_del" +
-      "ete_time\030\002 \001(\0132\032.google.protobuf.Timesta" +
+      "ete_time\030\002 \001(\0132\032.google.protobuf.Timesta",
       "mpH\000\0224\n\017auto_delete_ttl\030\003 \001(\0132\031.google.p" +
       "rotobuf.DurationH\000B\005\n\003ttl\"i\n\030NodeInitial" +
       "izationAction\022\027\n\017executable_file\030\001 \001(\t\0224" +
@@ -217,7 +217,7 @@ public static void registerAllExtensions(
       "usterStatus.State\022\016\n\006detail\030\002 \001(\t\0224\n\020sta" +
       "te_start_time\030\003 \001(\0132\032.google.protobuf.Ti" +
       "mestamp\022G\n\010substate\030\004 \001(\01625.google.cloud" +
-      ".dataproc.v1beta2.ClusterStatus.Substate" +
+      ".dataproc.v1beta2.ClusterStatus.Substate",
       "\"V\n\005State\022\013\n\007UNKNOWN\020\000\022\014\n\010CREATING\020\001\022\013\n\007" +
       "RUNNING\020\002\022\t\n\005ERROR\020\003\022\014\n\010DELETING\020\004\022\014\n\010UP" +
       "DATING\020\005\"<\n\010Substate\022\017\n\013UNSPECIFIED\020\000\022\r\n" +
@@ -227,7 +227,7 @@ public static void registerAllExtensions(
       "eta2.SoftwareConfig.PropertiesEntry\0321\n\017P" +
       "ropertiesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001" +
       "(\t:\0028\001\"\244\002\n\016ClusterMetrics\022T\n\014hdfs_metric" +
-      "s\030\001 \003(\0132>.google.cloud.dataproc.v1beta2." +
+      "s\030\001 \003(\0132>.google.cloud.dataproc.v1beta2.",
       "ClusterMetrics.HdfsMetricsEntry\022T\n\014yarn_" +
       "metrics\030\002 \003(\0132>.google.cloud.dataproc.v1" +
       "beta2.ClusterMetrics.YarnMetricsEntry\0322\n" +
@@ -237,7 +237,7 @@ public static void registerAllExtensions(
       "equest\022\022\n\nproject_id\030\001 \001(\t\022\016\n\006region\030\003 \001" +
       "(\t\0227\n\007cluster\030\002 \001(\0132&.google.cloud.datap" +
       "roc.v1beta2.Cluster\022\022\n\nrequest_id\030\004 \001(\t\"" +
-      "\220\002\n\024UpdateClusterRequest\022\022\n\nproject_id\030\001" +
+      "\220\002\n\024UpdateClusterRequest\022\022\n\nproject_id\030\001",
       " \001(\t\022\016\n\006region\030\005 \001(\t\022\024\n\014cluster_name\030\002 \001" +
       "(\t\0227\n\007cluster\030\003 \001(\0132&.google.cloud.datap" +
       "roc.v1beta2.Cluster\022@\n\035graceful_decommis" +
@@ -247,7 +247,7 @@ public static void registerAllExtensions(
       "leteClusterRequest\022\022\n\nproject_id\030\001 \001(\t\022\016" +
       "\n\006region\030\003 \001(\t\022\024\n\014cluster_name\030\002 \001(\t\022\024\n\014" +
       "cluster_uuid\030\004 \001(\t\022\022\n\nrequest_id\030\005 \001(\t\"M" +
-      "\n\021GetClusterRequest\022\022\n\nproject_id\030\001 \001(\t\022" +
+      "\n\021GetClusterRequest\022\022\n\nproject_id\030\001 \001(\t\022",
       "\016\n\006region\030\003 \001(\t\022\024\n\014cluster_name\030\002 \001(\t\"p\n" +
       "\023ListClustersRequest\022\022\n\nproject_id\030\001 \001(\t" +
       "\022\016\n\006region\030\004 \001(\t\022\016\n\006filter\030\005 \001(\t\022\021\n\tpage" +
@@ -257,7 +257,7 @@ public static void registerAllExtensions(
       "t_page_token\030\002 \001(\t\"R\n\026DiagnoseClusterReq" +
       "uest\022\022\n\nproject_id\030\001 \001(\t\022\016\n\006region\030\003 \001(\t" +
       "\022\024\n\014cluster_name\030\002 \001(\t\",\n\026DiagnoseCluste" +
-      "rResults\022\022\n\noutput_uri\030\001 \001(\t2\370\010\n\021Cluster" +
+      "rResults\022\022\n\noutput_uri\030\001 \001(\t2\370\010\n\021Cluster",
       "Controller\022\256\001\n\rCreateCluster\0223.google.cl" +
       "oud.dataproc.v1beta2.CreateClusterReques" +
       "t\032\035.google.longrunning.Operation\"I\202\323\344\223\002C" +
@@ -267,7 +267,7 @@ public static void registerAllExtensions(
       "dateClusterRequest\032\035.google.longrunning." +
       "Operation\"X\202\323\344\223\002R2G/v1beta2/projects/{pr" +
       "oject_id}/regions/{region}/clusters/{clu" +
-      "ster_name}:\007cluster\022\264\001\n\rDeleteCluster\0223." +
+      "ster_name}:\007cluster\022\264\001\n\rDeleteCluster\0223.",
       "google.cloud.dataproc.v1beta2.DeleteClus" +
       "terRequest\032\035.google.longrunning.Operatio" +
       "n\"O\202\323\344\223\002I*G/v1beta2/projects/{project_id" +
@@ -277,7 +277,7 @@ public static void registerAllExtensions(
       "ud.dataproc.v1beta2.Cluster\"O\202\323\344\223\002I\022G/v1" +
       "beta2/projects/{project_id}/regions/{reg" +
       "ion}/clusters/{cluster_name}\022\271\001\n\014ListClu" +
-      "sters\0222.google.cloud.dataproc.v1beta2.Li" +
+      "sters\0222.google.cloud.dataproc.v1beta2.Li",
       "stClustersRequest\0323.google.cloud.datapro" +
       "c.v1beta2.ListClustersResponse\"@\202\323\344\223\002:\0228" +
       "/v1beta2/projects/{project_id}/regions/{" +
@@ -287,7 +287,7 @@ public static void registerAllExtensions(
       "on\"[\202\323\344\223\002U\"P/v1beta2/projects/{project_i" +
       "d}/regions/{region}/clusters/{cluster_na" +
       "me}:diagnose:\001*B{\n!com.google.cloud.data" +
-      "proc.v1beta2B\rClustersProtoP\001ZEgoogle.go" +
+      "proc.v1beta2B\rClustersProtoP\001ZEgoogle.go",
       "lang.org/genproto/googleapis/cloud/datap" +
       "roc/v1beta2;dataprocb\006proto3"
     };
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/CreateClusterRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/CreateClusterRequest.java
index d4c15e7728fc..366280290191 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/CreateClusterRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/CreateClusterRequest.java
@@ -35,9 +35,6 @@ private CreateClusterRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private CreateClusterRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -80,13 +84,6 @@ private CreateClusterRequest(
             requestId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private CreateClusterRequest(
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_CreateClusterRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_CreateClusterRequest_fieldAccessorTable
@@ -290,7 +286,6 @@ public java.lang.String getRequestId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -300,7 +295,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -318,7 +312,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -460,7 +453,6 @@ public static com.google.cloud.dataproc.v1beta2.CreateClusterRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -468,7 +460,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.CreateClusterRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -496,7 +487,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_CreateClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_CreateClusterRequest_fieldAccessorTable
@@ -519,7 +509,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -537,18 +526,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_CreateClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.CreateClusterRequest getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.CreateClusterRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.CreateClusterRequest build() {
       com.google.cloud.dataproc.v1beta2.CreateClusterRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -557,7 +543,6 @@ public com.google.cloud.dataproc.v1beta2.CreateClusterRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.CreateClusterRequest buildPartial() {
       com.google.cloud.dataproc.v1beta2.CreateClusterRequest result = new com.google.cloud.dataproc.v1beta2.CreateClusterRequest(this);
       result.projectId_ = projectId_;
@@ -572,39 +557,32 @@ public com.google.cloud.dataproc.v1beta2.CreateClusterRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.CreateClusterRequest) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.CreateClusterRequest)other);
@@ -636,12 +614,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.CreateClusterRequest
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1124,13 +1100,11 @@ public Builder setRequestIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1152,12 +1126,11 @@ public static com.google.cloud.dataproc.v1beta2.CreateClusterRequest getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateClusterRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateClusterRequest(input, extensionRegistry);
+        return new CreateClusterRequest(input, extensionRegistry);
     }
   };
 
@@ -1170,7 +1143,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.CreateClusterRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/CreateWorkflowTemplateRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/CreateWorkflowTemplateRequest.java
index 5f5a71840c5d..ee45ff670695 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/CreateWorkflowTemplateRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/CreateWorkflowTemplateRequest.java
@@ -33,9 +33,6 @@ private CreateWorkflowTemplateRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private CreateWorkflowTemplateRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private CreateWorkflowTemplateRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private CreateWorkflowTemplateRequest(
     return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_CreateWorkflowTemplateRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_CreateWorkflowTemplateRequest_fieldAccessorTable
@@ -178,7 +174,6 @@ public com.google.cloud.dataproc.v1beta2.WorkflowTemplateOrBuilder getTemplateOr
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -188,7 +183,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -200,7 +194,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -328,7 +321,6 @@ public static com.google.cloud.dataproc.v1beta2.CreateWorkflowTemplateRequest pa
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -336,7 +328,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.CreateWorkflowTemplateRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -364,7 +355,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_CreateWorkflowTemplateRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_CreateWorkflowTemplateRequest_fieldAccessorTable
@@ -387,7 +377,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -401,18 +390,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_CreateWorkflowTemplateRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.CreateWorkflowTemplateRequest getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.CreateWorkflowTemplateRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.CreateWorkflowTemplateRequest build() {
       com.google.cloud.dataproc.v1beta2.CreateWorkflowTemplateRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -421,7 +407,6 @@ public com.google.cloud.dataproc.v1beta2.CreateWorkflowTemplateRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.CreateWorkflowTemplateRequest buildPartial() {
       com.google.cloud.dataproc.v1beta2.CreateWorkflowTemplateRequest result = new com.google.cloud.dataproc.v1beta2.CreateWorkflowTemplateRequest(this);
       result.parent_ = parent_;
@@ -434,39 +419,32 @@ public com.google.cloud.dataproc.v1beta2.CreateWorkflowTemplateRequest buildPart
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.CreateWorkflowTemplateRequest) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.CreateWorkflowTemplateRequest)other);
@@ -490,12 +468,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.CreateWorkflowTemplat
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -765,13 +741,11 @@ public com.google.cloud.dataproc.v1beta2.WorkflowTemplateOrBuilder getTemplateOr
       }
       return templateBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -793,12 +767,11 @@ public static com.google.cloud.dataproc.v1beta2.CreateWorkflowTemplateRequest ge
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateWorkflowTemplateRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateWorkflowTemplateRequest(input, extensionRegistry);
+        return new CreateWorkflowTemplateRequest(input, extensionRegistry);
     }
   };
 
@@ -811,7 +784,6 @@ public com.google.protobuf.Parser getParserForTyp
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.CreateWorkflowTemplateRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/DeleteClusterRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/DeleteClusterRequest.java
index f674bf8f654c..269f85e259e2 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/DeleteClusterRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/DeleteClusterRequest.java
@@ -37,9 +37,6 @@ private DeleteClusterRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private DeleteClusterRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -81,13 +85,6 @@ private DeleteClusterRequest(
             requestId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -105,7 +102,6 @@ private DeleteClusterRequest(
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_DeleteClusterRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_DeleteClusterRequest_fieldAccessorTable
@@ -344,7 +340,6 @@ public java.lang.String getRequestId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -354,7 +349,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -375,7 +369,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -518,7 +511,6 @@ public static com.google.cloud.dataproc.v1beta2.DeleteClusterRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -526,7 +518,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.DeleteClusterRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -554,7 +545,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_DeleteClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_DeleteClusterRequest_fieldAccessorTable
@@ -577,7 +567,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -593,18 +582,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_DeleteClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.DeleteClusterRequest getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.DeleteClusterRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.DeleteClusterRequest build() {
       com.google.cloud.dataproc.v1beta2.DeleteClusterRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -613,7 +599,6 @@ public com.google.cloud.dataproc.v1beta2.DeleteClusterRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.DeleteClusterRequest buildPartial() {
       com.google.cloud.dataproc.v1beta2.DeleteClusterRequest result = new com.google.cloud.dataproc.v1beta2.DeleteClusterRequest(this);
       result.projectId_ = projectId_;
@@ -625,39 +610,32 @@ public com.google.cloud.dataproc.v1beta2.DeleteClusterRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.DeleteClusterRequest) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.DeleteClusterRequest)other);
@@ -694,12 +672,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.DeleteClusterRequest
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1212,13 +1188,11 @@ public Builder setRequestIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1240,12 +1214,11 @@ public static com.google.cloud.dataproc.v1beta2.DeleteClusterRequest getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteClusterRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteClusterRequest(input, extensionRegistry);
+        return new DeleteClusterRequest(input, extensionRegistry);
     }
   };
 
@@ -1258,7 +1231,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.DeleteClusterRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/DeleteJobRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/DeleteJobRequest.java
index d5093167a684..77383a718938 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/DeleteJobRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/DeleteJobRequest.java
@@ -35,9 +35,6 @@ private DeleteJobRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private DeleteJobRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -67,13 +71,6 @@ private DeleteJobRequest(
             region_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private DeleteJobRequest(
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_DeleteJobRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_DeleteJobRequest_fieldAccessorTable
@@ -228,7 +224,6 @@ public java.lang.String getJobId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -238,7 +233,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -253,7 +247,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -382,7 +375,6 @@ public static com.google.cloud.dataproc.v1beta2.DeleteJobRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -390,7 +382,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.DeleteJobRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -418,7 +409,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_DeleteJobRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_DeleteJobRequest_fieldAccessorTable
@@ -441,7 +431,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -453,18 +442,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_DeleteJobRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.DeleteJobRequest getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.DeleteJobRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.DeleteJobRequest build() {
       com.google.cloud.dataproc.v1beta2.DeleteJobRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -473,7 +459,6 @@ public com.google.cloud.dataproc.v1beta2.DeleteJobRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.DeleteJobRequest buildPartial() {
       com.google.cloud.dataproc.v1beta2.DeleteJobRequest result = new com.google.cloud.dataproc.v1beta2.DeleteJobRequest(this);
       result.projectId_ = projectId_;
@@ -483,39 +468,32 @@ public com.google.cloud.dataproc.v1beta2.DeleteJobRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.DeleteJobRequest) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.DeleteJobRequest)other);
@@ -544,12 +522,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.DeleteJobRequest othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -839,13 +815,11 @@ public Builder setJobIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -867,12 +841,11 @@ public static com.google.cloud.dataproc.v1beta2.DeleteJobRequest getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteJobRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteJobRequest(input, extensionRegistry);
+        return new DeleteJobRequest(input, extensionRegistry);
     }
   };
 
@@ -885,7 +858,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.DeleteJobRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/DeleteWorkflowTemplateRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/DeleteWorkflowTemplateRequest.java
index a82e768c1ed6..225c8e77b2cf 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/DeleteWorkflowTemplateRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/DeleteWorkflowTemplateRequest.java
@@ -35,9 +35,6 @@ private DeleteWorkflowTemplateRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private DeleteWorkflowTemplateRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private DeleteWorkflowTemplateRequest(
             version_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private DeleteWorkflowTemplateRequest(
     return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_DeleteWorkflowTemplateRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_DeleteWorkflowTemplateRequest_fieldAccessorTable
@@ -154,7 +150,6 @@ public int getVersion() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -164,7 +159,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -176,7 +170,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -299,7 +292,6 @@ public static com.google.cloud.dataproc.v1beta2.DeleteWorkflowTemplateRequest pa
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -307,7 +299,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.DeleteWorkflowTemplateRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -336,7 +327,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_DeleteWorkflowTemplateRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_DeleteWorkflowTemplateRequest_fieldAccessorTable
@@ -359,7 +349,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -369,18 +358,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_DeleteWorkflowTemplateRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.DeleteWorkflowTemplateRequest getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.DeleteWorkflowTemplateRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.DeleteWorkflowTemplateRequest build() {
       com.google.cloud.dataproc.v1beta2.DeleteWorkflowTemplateRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -389,7 +375,6 @@ public com.google.cloud.dataproc.v1beta2.DeleteWorkflowTemplateRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.DeleteWorkflowTemplateRequest buildPartial() {
       com.google.cloud.dataproc.v1beta2.DeleteWorkflowTemplateRequest result = new com.google.cloud.dataproc.v1beta2.DeleteWorkflowTemplateRequest(this);
       result.name_ = name_;
@@ -398,39 +383,32 @@ public com.google.cloud.dataproc.v1beta2.DeleteWorkflowTemplateRequest buildPart
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.DeleteWorkflowTemplateRequest) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.DeleteWorkflowTemplateRequest)other);
@@ -454,12 +432,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.DeleteWorkflowTemplat
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -620,13 +596,11 @@ public Builder clearVersion() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -648,12 +622,11 @@ public static com.google.cloud.dataproc.v1beta2.DeleteWorkflowTemplateRequest ge
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteWorkflowTemplateRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteWorkflowTemplateRequest(input, extensionRegistry);
+        return new DeleteWorkflowTemplateRequest(input, extensionRegistry);
     }
   };
 
@@ -666,7 +639,6 @@ public com.google.protobuf.Parser getParserForTyp
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.DeleteWorkflowTemplateRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/DiagnoseClusterRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/DiagnoseClusterRequest.java
index 10b18ef75b12..a883599311eb 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/DiagnoseClusterRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/DiagnoseClusterRequest.java
@@ -35,9 +35,6 @@ private DiagnoseClusterRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private DiagnoseClusterRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -67,13 +71,6 @@ private DiagnoseClusterRequest(
             region_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private DiagnoseClusterRequest(
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_DiagnoseClusterRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_DiagnoseClusterRequest_fieldAccessorTable
@@ -228,7 +224,6 @@ public java.lang.String getClusterName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -238,7 +233,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -253,7 +247,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -382,7 +375,6 @@ public static com.google.cloud.dataproc.v1beta2.DiagnoseClusterRequest parseFrom
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -390,7 +382,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.DiagnoseClusterRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -418,7 +409,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_DiagnoseClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_DiagnoseClusterRequest_fieldAccessorTable
@@ -441,7 +431,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -453,18 +442,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_DiagnoseClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.DiagnoseClusterRequest getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.DiagnoseClusterRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.DiagnoseClusterRequest build() {
       com.google.cloud.dataproc.v1beta2.DiagnoseClusterRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -473,7 +459,6 @@ public com.google.cloud.dataproc.v1beta2.DiagnoseClusterRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.DiagnoseClusterRequest buildPartial() {
       com.google.cloud.dataproc.v1beta2.DiagnoseClusterRequest result = new com.google.cloud.dataproc.v1beta2.DiagnoseClusterRequest(this);
       result.projectId_ = projectId_;
@@ -483,39 +468,32 @@ public com.google.cloud.dataproc.v1beta2.DiagnoseClusterRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.DiagnoseClusterRequest) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.DiagnoseClusterRequest)other);
@@ -544,12 +522,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.DiagnoseClusterReques
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -839,13 +815,11 @@ public Builder setClusterNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -867,12 +841,11 @@ public static com.google.cloud.dataproc.v1beta2.DiagnoseClusterRequest getDefaul
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DiagnoseClusterRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DiagnoseClusterRequest(input, extensionRegistry);
+        return new DiagnoseClusterRequest(input, extensionRegistry);
     }
   };
 
@@ -885,7 +858,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.DiagnoseClusterRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/DiagnoseClusterResults.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/DiagnoseClusterResults.java
index 52075b29741e..805b6af97b38 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/DiagnoseClusterResults.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/DiagnoseClusterResults.java
@@ -33,9 +33,6 @@ private DiagnoseClusterResults(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DiagnoseClusterResults(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            outputUri_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DiagnoseClusterResults(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            outputUri_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DiagnoseClusterResults(
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_DiagnoseClusterResults_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_DiagnoseClusterResults_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getOutputUri() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getOutputUriBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.dataproc.v1beta2.DiagnoseClusterResults parseFrom
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.DiagnoseClusterResults prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_DiagnoseClusterResults_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_DiagnoseClusterResults_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       outputUri_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_DiagnoseClusterResults_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.DiagnoseClusterResults getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.DiagnoseClusterResults.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.DiagnoseClusterResults build() {
       com.google.cloud.dataproc.v1beta2.DiagnoseClusterResults result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.dataproc.v1beta2.DiagnoseClusterResults build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.DiagnoseClusterResults buildPartial() {
       com.google.cloud.dataproc.v1beta2.DiagnoseClusterResults result = new com.google.cloud.dataproc.v1beta2.DiagnoseClusterResults(this);
       result.outputUri_ = outputUri_;
@@ -361,39 +346,32 @@ public com.google.cloud.dataproc.v1beta2.DiagnoseClusterResults buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.DiagnoseClusterResults) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.DiagnoseClusterResults)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.DiagnoseClusterResult
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setOutputUriBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.dataproc.v1beta2.DiagnoseClusterResults getDefaul
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DiagnoseClusterResults parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DiagnoseClusterResults(input, extensionRegistry);
+        return new DiagnoseClusterResults(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.DiagnoseClusterResults getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/DiskConfig.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/DiskConfig.java
index 6a870c77166b..8148c0f52268 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/DiskConfig.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/DiskConfig.java
@@ -35,9 +35,6 @@ private DiskConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private DiskConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
 
             bootDiskSizeGb_ = input.readInt32();
@@ -65,13 +69,6 @@ private DiskConfig(
             bootDiskType_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -89,7 +86,6 @@ private DiskConfig(
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_DiskConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_DiskConfig_fieldAccessorTable
@@ -175,7 +171,6 @@ public int getNumLocalSsds() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -185,7 +180,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (bootDiskSizeGb_ != 0) {
@@ -200,7 +194,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -331,7 +324,6 @@ public static com.google.cloud.dataproc.v1beta2.DiskConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -339,7 +331,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.DiskConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -367,7 +358,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_DiskConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_DiskConfig_fieldAccessorTable
@@ -390,7 +380,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       bootDiskType_ = "";
@@ -402,18 +391,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_DiskConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.DiskConfig getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.DiskConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.DiskConfig build() {
       com.google.cloud.dataproc.v1beta2.DiskConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -422,7 +408,6 @@ public com.google.cloud.dataproc.v1beta2.DiskConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.DiskConfig buildPartial() {
       com.google.cloud.dataproc.v1beta2.DiskConfig result = new com.google.cloud.dataproc.v1beta2.DiskConfig(this);
       result.bootDiskType_ = bootDiskType_;
@@ -432,39 +417,32 @@ public com.google.cloud.dataproc.v1beta2.DiskConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.DiskConfig) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.DiskConfig)other);
@@ -491,12 +469,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.DiskConfig other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -704,13 +680,11 @@ public Builder clearNumLocalSsds() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -732,12 +706,11 @@ public static com.google.cloud.dataproc.v1beta2.DiskConfig getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DiskConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DiskConfig(input, extensionRegistry);
+        return new DiskConfig(input, extensionRegistry);
     }
   };
 
@@ -750,7 +723,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.DiskConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/GceClusterConfig.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/GceClusterConfig.java
index f1e9aae3edc1..238581a9dddb 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/GceClusterConfig.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/GceClusterConfig.java
@@ -40,9 +40,6 @@ private GceClusterConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -54,6 +51,13 @@ private GceClusterConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -114,13 +118,6 @@ private GceClusterConfig(
             serviceAccount_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -145,7 +142,6 @@ private GceClusterConfig(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -156,7 +152,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_GceClusterConfig_fieldAccessorTable
@@ -638,7 +633,6 @@ public java.lang.String getMetadataOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -648,7 +642,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getZoneUriBytes().isEmpty()) {
@@ -681,7 +674,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -870,7 +862,6 @@ public static com.google.cloud.dataproc.v1beta2.GceClusterConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -878,7 +869,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.GceClusterConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -929,7 +919,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_GceClusterConfig_fieldAccessorTable
@@ -952,7 +941,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       zoneUri_ = "";
@@ -973,18 +961,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_GceClusterConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.GceClusterConfig getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.GceClusterConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.GceClusterConfig build() {
       com.google.cloud.dataproc.v1beta2.GceClusterConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -993,7 +978,6 @@ public com.google.cloud.dataproc.v1beta2.GceClusterConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.GceClusterConfig buildPartial() {
       com.google.cloud.dataproc.v1beta2.GceClusterConfig result = new com.google.cloud.dataproc.v1beta2.GceClusterConfig(this);
       int from_bitField0_ = bitField0_;
@@ -1020,39 +1004,32 @@ public com.google.cloud.dataproc.v1beta2.GceClusterConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.GceClusterConfig) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.GceClusterConfig)other);
@@ -1110,12 +1087,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.GceClusterConfig othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2200,13 +2175,11 @@ public Builder putAllMetadata(
           .putAll(values);
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2228,12 +2201,11 @@ public static com.google.cloud.dataproc.v1beta2.GceClusterConfig getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GceClusterConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GceClusterConfig(input, extensionRegistry);
+        return new GceClusterConfig(input, extensionRegistry);
     }
   };
 
@@ -2246,7 +2218,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.GceClusterConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/GetClusterRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/GetClusterRequest.java
index bdfbc4c7d84c..60916181c1ed 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/GetClusterRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/GetClusterRequest.java
@@ -35,9 +35,6 @@ private GetClusterRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private GetClusterRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -67,13 +71,6 @@ private GetClusterRequest(
             region_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private GetClusterRequest(
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_GetClusterRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_GetClusterRequest_fieldAccessorTable
@@ -228,7 +224,6 @@ public java.lang.String getClusterName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -238,7 +233,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -253,7 +247,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -382,7 +375,6 @@ public static com.google.cloud.dataproc.v1beta2.GetClusterRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -390,7 +382,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.GetClusterRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -418,7 +409,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_GetClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_GetClusterRequest_fieldAccessorTable
@@ -441,7 +431,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -453,18 +442,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_GetClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.GetClusterRequest getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.GetClusterRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.GetClusterRequest build() {
       com.google.cloud.dataproc.v1beta2.GetClusterRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -473,7 +459,6 @@ public com.google.cloud.dataproc.v1beta2.GetClusterRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.GetClusterRequest buildPartial() {
       com.google.cloud.dataproc.v1beta2.GetClusterRequest result = new com.google.cloud.dataproc.v1beta2.GetClusterRequest(this);
       result.projectId_ = projectId_;
@@ -483,39 +468,32 @@ public com.google.cloud.dataproc.v1beta2.GetClusterRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.GetClusterRequest) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.GetClusterRequest)other);
@@ -544,12 +522,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.GetClusterRequest oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -839,13 +815,11 @@ public Builder setClusterNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -867,12 +841,11 @@ public static com.google.cloud.dataproc.v1beta2.GetClusterRequest getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetClusterRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetClusterRequest(input, extensionRegistry);
+        return new GetClusterRequest(input, extensionRegistry);
     }
   };
 
@@ -885,7 +858,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.GetClusterRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/GetJobRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/GetJobRequest.java
index 777635167210..3014980cb797 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/GetJobRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/GetJobRequest.java
@@ -35,9 +35,6 @@ private GetJobRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private GetJobRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -67,13 +71,6 @@ private GetJobRequest(
             region_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private GetJobRequest(
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_GetJobRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_GetJobRequest_fieldAccessorTable
@@ -228,7 +224,6 @@ public java.lang.String getJobId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -238,7 +233,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -253,7 +247,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -382,7 +375,6 @@ public static com.google.cloud.dataproc.v1beta2.GetJobRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -390,7 +382,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.GetJobRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -418,7 +409,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_GetJobRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_GetJobRequest_fieldAccessorTable
@@ -441,7 +431,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -453,18 +442,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_GetJobRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.GetJobRequest getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.GetJobRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.GetJobRequest build() {
       com.google.cloud.dataproc.v1beta2.GetJobRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -473,7 +459,6 @@ public com.google.cloud.dataproc.v1beta2.GetJobRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.GetJobRequest buildPartial() {
       com.google.cloud.dataproc.v1beta2.GetJobRequest result = new com.google.cloud.dataproc.v1beta2.GetJobRequest(this);
       result.projectId_ = projectId_;
@@ -483,39 +468,32 @@ public com.google.cloud.dataproc.v1beta2.GetJobRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.GetJobRequest) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.GetJobRequest)other);
@@ -544,12 +522,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.GetJobRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -839,13 +815,11 @@ public Builder setJobIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -867,12 +841,11 @@ public static com.google.cloud.dataproc.v1beta2.GetJobRequest getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetJobRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetJobRequest(input, extensionRegistry);
+        return new GetJobRequest(input, extensionRegistry);
     }
   };
 
@@ -885,7 +858,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.GetJobRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/GetWorkflowTemplateRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/GetWorkflowTemplateRequest.java
index 88e7fb80e3a7..ed5e82a8e6c6 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/GetWorkflowTemplateRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/GetWorkflowTemplateRequest.java
@@ -34,9 +34,6 @@ private GetWorkflowTemplateRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private GetWorkflowTemplateRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -59,13 +63,6 @@ private GetWorkflowTemplateRequest(
             version_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private GetWorkflowTemplateRequest(
     return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_GetWorkflowTemplateRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_GetWorkflowTemplateRequest_fieldAccessorTable
@@ -153,7 +149,6 @@ public int getVersion() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -163,7 +158,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -175,7 +169,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -298,7 +291,6 @@ public static com.google.cloud.dataproc.v1beta2.GetWorkflowTemplateRequest parse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -306,7 +298,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.GetWorkflowTemplateRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -334,7 +325,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_GetWorkflowTemplateRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_GetWorkflowTemplateRequest_fieldAccessorTable
@@ -357,7 +347,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -367,18 +356,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_GetWorkflowTemplateRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.GetWorkflowTemplateRequest getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.GetWorkflowTemplateRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.GetWorkflowTemplateRequest build() {
       com.google.cloud.dataproc.v1beta2.GetWorkflowTemplateRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -387,7 +373,6 @@ public com.google.cloud.dataproc.v1beta2.GetWorkflowTemplateRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.GetWorkflowTemplateRequest buildPartial() {
       com.google.cloud.dataproc.v1beta2.GetWorkflowTemplateRequest result = new com.google.cloud.dataproc.v1beta2.GetWorkflowTemplateRequest(this);
       result.name_ = name_;
@@ -396,39 +381,32 @@ public com.google.cloud.dataproc.v1beta2.GetWorkflowTemplateRequest buildPartial
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.GetWorkflowTemplateRequest) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.GetWorkflowTemplateRequest)other);
@@ -452,12 +430,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.GetWorkflowTemplateRe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -618,13 +594,11 @@ public Builder clearVersion() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -646,12 +620,11 @@ public static com.google.cloud.dataproc.v1beta2.GetWorkflowTemplateRequest getDe
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetWorkflowTemplateRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetWorkflowTemplateRequest(input, extensionRegistry);
+        return new GetWorkflowTemplateRequest(input, extensionRegistry);
     }
   };
 
@@ -664,7 +637,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.GetWorkflowTemplateRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/HadoopJob.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/HadoopJob.java
index 81ee19e7d659..6501bf4f6048 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/HadoopJob.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/HadoopJob.java
@@ -38,9 +38,6 @@ private HadoopJob(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private HadoopJob(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             driverCase_ = 1;
@@ -126,13 +130,6 @@ private HadoopJob(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -163,7 +160,6 @@ private HadoopJob(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -174,7 +170,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_HadoopJob_fieldAccessorTable
@@ -683,7 +678,6 @@ public com.google.cloud.dataproc.v1beta2.LoggingConfigOrBuilder getLoggingConfig
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -693,7 +687,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (driverCase_ == 1) {
@@ -726,7 +719,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -952,7 +944,6 @@ public static com.google.cloud.dataproc.v1beta2.HadoopJob parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -960,7 +951,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.HadoopJob prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1012,7 +1002,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_HadoopJob_fieldAccessorTable
@@ -1035,7 +1024,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       args_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -1058,18 +1046,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_HadoopJob_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.HadoopJob getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.HadoopJob.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.HadoopJob build() {
       com.google.cloud.dataproc.v1beta2.HadoopJob result = buildPartial();
       if (!result.isInitialized()) {
@@ -1078,7 +1063,6 @@ public com.google.cloud.dataproc.v1beta2.HadoopJob build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.HadoopJob buildPartial() {
       com.google.cloud.dataproc.v1beta2.HadoopJob result = new com.google.cloud.dataproc.v1beta2.HadoopJob(this);
       int from_bitField0_ = bitField0_;
@@ -1122,39 +1106,32 @@ public com.google.cloud.dataproc.v1beta2.HadoopJob buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.HadoopJob) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.HadoopJob)other);
@@ -1233,12 +1210,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.HadoopJob other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2414,13 +2389,11 @@ public com.google.cloud.dataproc.v1beta2.LoggingConfigOrBuilder getLoggingConfig
       }
       return loggingConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2442,12 +2415,11 @@ public static com.google.cloud.dataproc.v1beta2.HadoopJob getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public HadoopJob parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new HadoopJob(input, extensionRegistry);
+        return new HadoopJob(input, extensionRegistry);
     }
   };
 
@@ -2460,7 +2432,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.HadoopJob getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/HiveJob.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/HiveJob.java
index 10526216de61..e68293b443d6 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/HiveJob.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/HiveJob.java
@@ -35,9 +35,6 @@ private HiveJob(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private HiveJob(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             queriesCase_ = 1;
@@ -109,13 +113,6 @@ private HiveJob(
             jarFileUris_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -137,7 +134,6 @@ private HiveJob(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -150,7 +146,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_HiveJob_fieldAccessorTable
@@ -555,7 +550,6 @@ public java.lang.String getJarFileUris(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -565,7 +559,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (queriesCase_ == 1) {
@@ -595,7 +588,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -792,7 +784,6 @@ public static com.google.cloud.dataproc.v1beta2.HiveJob parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -800,7 +791,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.HiveJob prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -855,7 +845,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_HiveJob_fieldAccessorTable
@@ -878,7 +867,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       continueOnFailure_ = false;
@@ -892,18 +880,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_HiveJob_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.HiveJob getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.HiveJob.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.HiveJob build() {
       com.google.cloud.dataproc.v1beta2.HiveJob result = buildPartial();
       if (!result.isInitialized()) {
@@ -912,7 +897,6 @@ public com.google.cloud.dataproc.v1beta2.HiveJob build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.HiveJob buildPartial() {
       com.google.cloud.dataproc.v1beta2.HiveJob result = new com.google.cloud.dataproc.v1beta2.HiveJob(this);
       int from_bitField0_ = bitField0_;
@@ -943,39 +927,32 @@ public com.google.cloud.dataproc.v1beta2.HiveJob buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.HiveJob) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.HiveJob)other);
@@ -1024,12 +1001,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.HiveJob other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1857,13 +1832,11 @@ public Builder addJarFileUrisBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1885,12 +1858,11 @@ public static com.google.cloud.dataproc.v1beta2.HiveJob getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public HiveJob parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new HiveJob(input, extensionRegistry);
+        return new HiveJob(input, extensionRegistry);
     }
   };
 
@@ -1903,7 +1875,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.HiveJob getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/InstanceGroupConfig.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/InstanceGroupConfig.java
index b1fe652db26d..4c8c4d18d862 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/InstanceGroupConfig.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/InstanceGroupConfig.java
@@ -40,9 +40,6 @@ private InstanceGroupConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -54,6 +51,13 @@ private InstanceGroupConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
 
             numInstances_ = input.readInt32();
@@ -126,13 +130,6 @@ private InstanceGroupConfig(
             minCpuPlatform_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -156,7 +153,6 @@ private InstanceGroupConfig(
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_InstanceGroupConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_InstanceGroupConfig_fieldAccessorTable
@@ -532,7 +528,6 @@ public java.lang.String getMinCpuPlatform() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -542,7 +537,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (numInstances_ != 0) {
@@ -575,7 +569,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -771,7 +764,6 @@ public static com.google.cloud.dataproc.v1beta2.InstanceGroupConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -779,7 +771,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.InstanceGroupConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -808,7 +799,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_InstanceGroupConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_InstanceGroupConfig_fieldAccessorTable
@@ -832,7 +822,6 @@ private void maybeForceBuilderInitialization() {
         getAcceleratorsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       numInstances_ = 0;
@@ -868,18 +857,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_InstanceGroupConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.InstanceGroupConfig getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.InstanceGroupConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.InstanceGroupConfig build() {
       com.google.cloud.dataproc.v1beta2.InstanceGroupConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -888,7 +874,6 @@ public com.google.cloud.dataproc.v1beta2.InstanceGroupConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.InstanceGroupConfig buildPartial() {
       com.google.cloud.dataproc.v1beta2.InstanceGroupConfig result = new com.google.cloud.dataproc.v1beta2.InstanceGroupConfig(this);
       int from_bitField0_ = bitField0_;
@@ -927,39 +912,32 @@ public com.google.cloud.dataproc.v1beta2.InstanceGroupConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.InstanceGroupConfig) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.InstanceGroupConfig)other);
@@ -1036,12 +1014,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.InstanceGroupConfig o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2290,13 +2266,11 @@ public Builder setMinCpuPlatformBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2318,12 +2292,11 @@ public static com.google.cloud.dataproc.v1beta2.InstanceGroupConfig getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public InstanceGroupConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InstanceGroupConfig(input, extensionRegistry);
+        return new InstanceGroupConfig(input, extensionRegistry);
     }
   };
 
@@ -2336,7 +2309,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.InstanceGroupConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/InstantiateInlineWorkflowTemplateRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/InstantiateInlineWorkflowTemplateRequest.java
index a47526e26c88..68f8ea6adc10 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/InstantiateInlineWorkflowTemplateRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/InstantiateInlineWorkflowTemplateRequest.java
@@ -34,9 +34,6 @@ private InstantiateInlineWorkflowTemplateRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private InstantiateInlineWorkflowTemplateRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private InstantiateInlineWorkflowTemplateRequest(
             instanceId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private InstantiateInlineWorkflowTemplateRequest(
     return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_InstantiateInlineWorkflowTemplateRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_InstantiateInlineWorkflowTemplateRequest_fieldAccessorTable
@@ -239,7 +235,6 @@ public java.lang.String getInstanceId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -249,7 +244,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -264,7 +258,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -399,7 +392,6 @@ public static com.google.cloud.dataproc.v1beta2.InstantiateInlineWorkflowTemplat
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -407,7 +399,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.InstantiateInlineWorkflowTemplateRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -435,7 +426,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_InstantiateInlineWorkflowTemplateRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_InstantiateInlineWorkflowTemplateRequest_fieldAccessorTable
@@ -458,7 +448,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -474,18 +463,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_InstantiateInlineWorkflowTemplateRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.InstantiateInlineWorkflowTemplateRequest getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.InstantiateInlineWorkflowTemplateRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.InstantiateInlineWorkflowTemplateRequest build() {
       com.google.cloud.dataproc.v1beta2.InstantiateInlineWorkflowTemplateRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -494,7 +480,6 @@ public com.google.cloud.dataproc.v1beta2.InstantiateInlineWorkflowTemplateReques
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.InstantiateInlineWorkflowTemplateRequest buildPartial() {
       com.google.cloud.dataproc.v1beta2.InstantiateInlineWorkflowTemplateRequest result = new com.google.cloud.dataproc.v1beta2.InstantiateInlineWorkflowTemplateRequest(this);
       result.parent_ = parent_;
@@ -508,39 +493,32 @@ public com.google.cloud.dataproc.v1beta2.InstantiateInlineWorkflowTemplateReques
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.InstantiateInlineWorkflowTemplateRequest) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.InstantiateInlineWorkflowTemplateRequest)other);
@@ -568,12 +546,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.InstantiateInlineWork
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -962,13 +938,11 @@ public Builder setInstanceIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -990,12 +964,11 @@ public static com.google.cloud.dataproc.v1beta2.InstantiateInlineWorkflowTemplat
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public InstantiateInlineWorkflowTemplateRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InstantiateInlineWorkflowTemplateRequest(input, extensionRegistry);
+        return new InstantiateInlineWorkflowTemplateRequest(input, extensionRegistry);
     }
   };
 
@@ -1008,7 +981,6 @@ public com.google.protobuf.Parser getP
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.InstantiateInlineWorkflowTemplateRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/InstantiateWorkflowTemplateRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/InstantiateWorkflowTemplateRequest.java
index 3bb01dcd800b..6270ccd2dc16 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/InstantiateWorkflowTemplateRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/InstantiateWorkflowTemplateRequest.java
@@ -35,9 +35,6 @@ private InstantiateWorkflowTemplateRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private InstantiateWorkflowTemplateRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private InstantiateWorkflowTemplateRequest(
             instanceId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private InstantiateWorkflowTemplateRequest(
     return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_InstantiateWorkflowTemplateRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_InstantiateWorkflowTemplateRequest_fieldAccessorTable
@@ -216,7 +212,6 @@ public java.lang.String getInstanceId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -226,7 +221,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -241,7 +235,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -371,7 +364,6 @@ public static com.google.cloud.dataproc.v1beta2.InstantiateWorkflowTemplateReque
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -379,7 +371,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.InstantiateWorkflowTemplateRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -407,7 +398,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_InstantiateWorkflowTemplateRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_InstantiateWorkflowTemplateRequest_fieldAccessorTable
@@ -430,7 +420,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -442,18 +431,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_InstantiateWorkflowTemplateRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.InstantiateWorkflowTemplateRequest getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.InstantiateWorkflowTemplateRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.InstantiateWorkflowTemplateRequest build() {
       com.google.cloud.dataproc.v1beta2.InstantiateWorkflowTemplateRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -462,7 +448,6 @@ public com.google.cloud.dataproc.v1beta2.InstantiateWorkflowTemplateRequest buil
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.InstantiateWorkflowTemplateRequest buildPartial() {
       com.google.cloud.dataproc.v1beta2.InstantiateWorkflowTemplateRequest result = new com.google.cloud.dataproc.v1beta2.InstantiateWorkflowTemplateRequest(this);
       result.name_ = name_;
@@ -472,39 +457,32 @@ public com.google.cloud.dataproc.v1beta2.InstantiateWorkflowTemplateRequest buil
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.InstantiateWorkflowTemplateRequest) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.InstantiateWorkflowTemplateRequest)other);
@@ -532,12 +510,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.InstantiateWorkflowTe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -823,13 +799,11 @@ public Builder setInstanceIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -851,12 +825,11 @@ public static com.google.cloud.dataproc.v1beta2.InstantiateWorkflowTemplateReque
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public InstantiateWorkflowTemplateRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InstantiateWorkflowTemplateRequest(input, extensionRegistry);
+        return new InstantiateWorkflowTemplateRequest(input, extensionRegistry);
     }
   };
 
@@ -869,7 +842,6 @@ public com.google.protobuf.Parser getParserF
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.InstantiateWorkflowTemplateRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/Job.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/Job.java
index 78d53309a476..f46c326976a1 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/Job.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/Job.java
@@ -36,9 +36,6 @@ private Job(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private Job(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.dataproc.v1beta2.JobReference.Builder subBuilder = null;
             if (reference_ != null) {
@@ -229,13 +233,6 @@ private Job(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -260,7 +257,6 @@ private Job(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -271,7 +267,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_Job_fieldAccessorTable
@@ -1027,7 +1022,6 @@ public com.google.cloud.dataproc.v1beta2.JobSchedulingOrBuilder getSchedulingOrB
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1037,7 +1031,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (reference_ != null) {
@@ -1091,7 +1084,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1384,7 +1376,6 @@ public static com.google.cloud.dataproc.v1beta2.Job parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1392,7 +1383,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.Job prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1442,7 +1432,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_Job_fieldAccessorTable
@@ -1467,7 +1456,6 @@ private void maybeForceBuilderInitialization() {
         getYarnApplicationsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (referenceBuilder_ == null) {
@@ -1516,18 +1504,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_Job_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.Job getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.Job.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.Job build() {
       com.google.cloud.dataproc.v1beta2.Job result = buildPartial();
       if (!result.isInitialized()) {
@@ -1536,7 +1521,6 @@ public com.google.cloud.dataproc.v1beta2.Job build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.Job buildPartial() {
       com.google.cloud.dataproc.v1beta2.Job result = new com.google.cloud.dataproc.v1beta2.Job(this);
       int from_bitField0_ = bitField0_;
@@ -1631,39 +1615,32 @@ public com.google.cloud.dataproc.v1beta2.Job buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.Job) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.Job)other);
@@ -1783,12 +1760,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.Job other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4559,13 +4534,11 @@ public com.google.cloud.dataproc.v1beta2.JobSchedulingOrBuilder getSchedulingOrB
       }
       return schedulingBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -4587,12 +4560,11 @@ public static com.google.cloud.dataproc.v1beta2.Job getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Job parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Job(input, extensionRegistry);
+        return new Job(input, extensionRegistry);
     }
   };
 
@@ -4605,7 +4577,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.Job getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/JobPlacement.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/JobPlacement.java
index 3d793381e2ef..d95f9eb95199 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/JobPlacement.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/JobPlacement.java
@@ -34,9 +34,6 @@ private JobPlacement(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private JobPlacement(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private JobPlacement(
             clusterUuid_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private JobPlacement(
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_JobPlacement_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_JobPlacement_fieldAccessorTable
@@ -179,7 +175,6 @@ public java.lang.String getClusterUuid() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -189,7 +184,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getClusterNameBytes().isEmpty()) {
@@ -201,7 +195,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -323,7 +316,6 @@ public static com.google.cloud.dataproc.v1beta2.JobPlacement parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -331,7 +323,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.JobPlacement prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -359,7 +350,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_JobPlacement_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_JobPlacement_fieldAccessorTable
@@ -382,7 +372,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       clusterName_ = "";
@@ -392,18 +381,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_JobPlacement_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.JobPlacement getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.JobPlacement.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.JobPlacement build() {
       com.google.cloud.dataproc.v1beta2.JobPlacement result = buildPartial();
       if (!result.isInitialized()) {
@@ -412,7 +398,6 @@ public com.google.cloud.dataproc.v1beta2.JobPlacement build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.JobPlacement buildPartial() {
       com.google.cloud.dataproc.v1beta2.JobPlacement result = new com.google.cloud.dataproc.v1beta2.JobPlacement(this);
       result.clusterName_ = clusterName_;
@@ -421,39 +406,32 @@ public com.google.cloud.dataproc.v1beta2.JobPlacement buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.JobPlacement) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.JobPlacement)other);
@@ -478,12 +456,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.JobPlacement other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -684,13 +660,11 @@ public Builder setClusterUuidBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -712,12 +686,11 @@ public static com.google.cloud.dataproc.v1beta2.JobPlacement getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public JobPlacement parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new JobPlacement(input, extensionRegistry);
+        return new JobPlacement(input, extensionRegistry);
     }
   };
 
@@ -730,7 +703,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.JobPlacement getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/JobReference.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/JobReference.java
index a1cb807f00f3..e1f506397806 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/JobReference.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/JobReference.java
@@ -34,9 +34,6 @@ private JobReference(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private JobReference(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private JobReference(
             jobId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private JobReference(
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_JobReference_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_JobReference_fieldAccessorTable
@@ -187,7 +183,6 @@ public java.lang.String getJobId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -197,7 +192,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -209,7 +203,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -331,7 +324,6 @@ public static com.google.cloud.dataproc.v1beta2.JobReference parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -339,7 +331,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.JobReference prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -367,7 +358,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_JobReference_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_JobReference_fieldAccessorTable
@@ -390,7 +380,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -400,18 +389,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_JobReference_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.JobReference getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.JobReference.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.JobReference build() {
       com.google.cloud.dataproc.v1beta2.JobReference result = buildPartial();
       if (!result.isInitialized()) {
@@ -420,7 +406,6 @@ public com.google.cloud.dataproc.v1beta2.JobReference build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.JobReference buildPartial() {
       com.google.cloud.dataproc.v1beta2.JobReference result = new com.google.cloud.dataproc.v1beta2.JobReference(this);
       result.projectId_ = projectId_;
@@ -429,39 +414,32 @@ public com.google.cloud.dataproc.v1beta2.JobReference buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.JobReference) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.JobReference)other);
@@ -486,12 +464,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.JobReference other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -712,13 +688,11 @@ public Builder setJobIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -740,12 +714,11 @@ public static com.google.cloud.dataproc.v1beta2.JobReference getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public JobReference parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new JobReference(input, extensionRegistry);
+        return new JobReference(input, extensionRegistry);
     }
   };
 
@@ -758,7 +731,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.JobReference getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/JobScheduling.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/JobScheduling.java
index 17ac3bc210ce..fbde507314ec 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/JobScheduling.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/JobScheduling.java
@@ -33,9 +33,6 @@ private JobScheduling(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,11 +44,6 @@ private JobScheduling(
           case 0:
             done = true;
             break;
-          case 8: {
-
-            maxFailuresPerHour_ = input.readInt32();
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -59,6 +51,11 @@ private JobScheduling(
             }
             break;
           }
+          case 8: {
+
+            maxFailuresPerHour_ = input.readInt32();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -76,7 +73,6 @@ private JobScheduling(
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_JobScheduling_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_JobScheduling_fieldAccessorTable
@@ -103,7 +99,6 @@ public int getMaxFailuresPerHour() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -113,7 +108,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (maxFailuresPerHour_ != 0) {
@@ -122,7 +116,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -238,7 +231,6 @@ public static com.google.cloud.dataproc.v1beta2.JobScheduling parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -246,7 +238,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.JobScheduling prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -274,7 +265,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_JobScheduling_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_JobScheduling_fieldAccessorTable
@@ -297,7 +287,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       maxFailuresPerHour_ = 0;
@@ -305,18 +294,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_JobScheduling_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.JobScheduling getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.JobScheduling.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.JobScheduling build() {
       com.google.cloud.dataproc.v1beta2.JobScheduling result = buildPartial();
       if (!result.isInitialized()) {
@@ -325,7 +311,6 @@ public com.google.cloud.dataproc.v1beta2.JobScheduling build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.JobScheduling buildPartial() {
       com.google.cloud.dataproc.v1beta2.JobScheduling result = new com.google.cloud.dataproc.v1beta2.JobScheduling(this);
       result.maxFailuresPerHour_ = maxFailuresPerHour_;
@@ -333,39 +318,32 @@ public com.google.cloud.dataproc.v1beta2.JobScheduling buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.JobScheduling) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.JobScheduling)other);
@@ -385,12 +363,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.JobScheduling other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -461,13 +437,11 @@ public Builder clearMaxFailuresPerHour() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -489,12 +463,11 @@ public static com.google.cloud.dataproc.v1beta2.JobScheduling getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public JobScheduling parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new JobScheduling(input, extensionRegistry);
+        return new JobScheduling(input, extensionRegistry);
     }
   };
 
@@ -507,7 +480,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.JobScheduling getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/JobStatus.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/JobStatus.java
index d509b2654847..ab48ace090f1 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/JobStatus.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/JobStatus.java
@@ -35,9 +35,6 @@ private JobStatus(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private JobStatus(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -80,13 +84,6 @@ private JobStatus(
             substate_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private JobStatus(
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_JobStatus_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_JobStatus_fieldAccessorTable
@@ -560,7 +556,6 @@ public int getStateValue() {
    * .google.cloud.dataproc.v1beta2.JobStatus.State state = 1;
    */
   public com.google.cloud.dataproc.v1beta2.JobStatus.State getState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dataproc.v1beta2.JobStatus.State result = com.google.cloud.dataproc.v1beta2.JobStatus.State.valueOf(state_);
     return result == null ? com.google.cloud.dataproc.v1beta2.JobStatus.State.UNRECOGNIZED : result;
   }
@@ -664,13 +659,11 @@ public int getSubstateValue() {
    * .google.cloud.dataproc.v1beta2.JobStatus.Substate substate = 7;
    */
   public com.google.cloud.dataproc.v1beta2.JobStatus.Substate getSubstate() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dataproc.v1beta2.JobStatus.Substate result = com.google.cloud.dataproc.v1beta2.JobStatus.Substate.valueOf(substate_);
     return result == null ? com.google.cloud.dataproc.v1beta2.JobStatus.Substate.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -680,7 +673,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (state_ != com.google.cloud.dataproc.v1beta2.JobStatus.State.STATE_UNSPECIFIED.getNumber()) {
@@ -698,7 +690,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -840,7 +831,6 @@ public static com.google.cloud.dataproc.v1beta2.JobStatus parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -848,7 +838,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.JobStatus prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -876,7 +865,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_JobStatus_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_JobStatus_fieldAccessorTable
@@ -899,7 +887,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       state_ = 0;
@@ -917,18 +904,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_JobStatus_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.JobStatus getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.JobStatus.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.JobStatus build() {
       com.google.cloud.dataproc.v1beta2.JobStatus result = buildPartial();
       if (!result.isInitialized()) {
@@ -937,7 +921,6 @@ public com.google.cloud.dataproc.v1beta2.JobStatus build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.JobStatus buildPartial() {
       com.google.cloud.dataproc.v1beta2.JobStatus result = new com.google.cloud.dataproc.v1beta2.JobStatus(this);
       result.state_ = state_;
@@ -952,39 +935,32 @@ public com.google.cloud.dataproc.v1beta2.JobStatus buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.JobStatus) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.JobStatus)other);
@@ -1014,12 +990,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.JobStatus other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1069,7 +1043,6 @@ public Builder setStateValue(int value) {
      * .google.cloud.dataproc.v1beta2.JobStatus.State state = 1;
      */
     public com.google.cloud.dataproc.v1beta2.JobStatus.State getState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dataproc.v1beta2.JobStatus.State result = com.google.cloud.dataproc.v1beta2.JobStatus.State.valueOf(state_);
       return result == null ? com.google.cloud.dataproc.v1beta2.JobStatus.State.UNRECOGNIZED : result;
     }
@@ -1384,7 +1357,6 @@ public Builder setSubstateValue(int value) {
      * .google.cloud.dataproc.v1beta2.JobStatus.Substate substate = 7;
      */
     public com.google.cloud.dataproc.v1beta2.JobStatus.Substate getSubstate() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dataproc.v1beta2.JobStatus.Substate result = com.google.cloud.dataproc.v1beta2.JobStatus.Substate.valueOf(substate_);
       return result == null ? com.google.cloud.dataproc.v1beta2.JobStatus.Substate.UNRECOGNIZED : result;
     }
@@ -1419,13 +1391,11 @@ public Builder clearSubstate() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1447,12 +1417,11 @@ public static com.google.cloud.dataproc.v1beta2.JobStatus getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public JobStatus parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new JobStatus(input, extensionRegistry);
+        return new JobStatus(input, extensionRegistry);
     }
   };
 
@@ -1465,7 +1434,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.JobStatus getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/JobsProto.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/JobsProto.java
index a165a4fd8069..2b15c4e3e3eb 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/JobsProto.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/JobsProto.java
@@ -192,7 +192,7 @@ public static void registerAllExtensions(
       " \003(\0132A.google.cloud.dataproc.v1beta2.Log" +
       "gingConfig.DriverLogLevelsEntry\032j\n\024Drive" +
       "rLogLevelsEntry\022\013\n\003key\030\001 \001(\t\022A\n\005value\030\002 " +
-      "\001(\01622.google.cloud.dataproc.v1beta2.Logg" +
+      "\001(\01622.google.cloud.dataproc.v1beta2.Logg",
       "ingConfig.Level:\0028\001\"p\n\005Level\022\025\n\021LEVEL_UN" +
       "SPECIFIED\020\000\022\007\n\003ALL\020\001\022\t\n\005TRACE\020\002\022\t\n\005DEBUG" +
       "\020\003\022\010\n\004INFO\020\004\022\010\n\004WARN\020\005\022\t\n\005ERROR\020\006\022\t\n\005FAT" +
@@ -202,7 +202,7 @@ public static void registerAllExtensions(
       "ile_uris\030\005 \003(\t\022\024\n\014archive_uris\030\006 \003(\t\022L\n\n" +
       "properties\030\007 \003(\01328.google.cloud.dataproc" +
       ".v1beta2.HadoopJob.PropertiesEntry\022D\n\016lo" +
-      "gging_config\030\010 \001(\0132,.google.cloud.datapr" +
+      "gging_config\030\010 \001(\0132,.google.cloud.datapr",
       "oc.v1beta2.LoggingConfig\0321\n\017PropertiesEn" +
       "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B\010\n\006d" +
       "river\"\333\002\n\010SparkJob\022\033\n\021main_jar_file_uri\030" +
@@ -212,7 +212,7 @@ public static void registerAllExtensions(
       "s\030\007 \003(\01327.google.cloud.dataproc.v1beta2." +
       "SparkJob.PropertiesEntry\022D\n\016logging_conf" +
       "ig\030\010 \001(\0132,.google.cloud.dataproc.v1beta2" +
-      ".LoggingConfig\0321\n\017PropertiesEntry\022\013\n\003key" +
+      ".LoggingConfig\0321\n\017PropertiesEntry\022\013\n\003key",
       "\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B\010\n\006driver\"\332\002\n\n" +
       "PySparkJob\022\034\n\024main_python_file_uri\030\001 \001(\t" +
       "\022\014\n\004args\030\002 \003(\t\022\030\n\020python_file_uris\030\003 \003(\t" +
@@ -222,7 +222,7 @@ public static void registerAllExtensions(
       "parkJob.PropertiesEntry\022D\n\016logging_confi" +
       "g\030\010 \001(\0132,.google.cloud.dataproc.v1beta2." +
       "LoggingConfig\0321\n\017PropertiesEntry\022\013\n\003key\030" +
-      "\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\034\n\tQueryList\022\017\n" +
+      "\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\034\n\tQueryList\022\017\n",
       "\007queries\030\001 \003(\t\"\260\003\n\007HiveJob\022\030\n\016query_file" +
       "_uri\030\001 \001(\tH\000\022>\n\nquery_list\030\002 \001(\0132(.googl" +
       "e.cloud.dataproc.v1beta2.QueryListH\000\022\033\n\023" +
@@ -232,7 +232,7 @@ public static void registerAllExtensions(
       "erties\030\005 \003(\01326.google.cloud.dataproc.v1b" +
       "eta2.HiveJob.PropertiesEntry\022\025\n\rjar_file" +
       "_uris\030\006 \003(\t\0326\n\024ScriptVariablesEntry\022\013\n\003k" +
-      "ey\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0321\n\017Propertie" +
+      "ey\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0321\n\017Propertie",
       "sEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B\t" +
       "\n\007queries\"\345\003\n\013SparkSqlJob\022\030\n\016query_file_" +
       "uri\030\001 \001(\tH\000\022>\n\nquery_list\030\002 \001(\0132(.google" +
@@ -242,7 +242,7 @@ public static void registerAllExtensions(
       "sEntry\022N\n\nproperties\030\004 \003(\0132:.google.clou" +
       "d.dataproc.v1beta2.SparkSqlJob.Propertie" +
       "sEntry\022\025\n\rjar_file_uris\0308 \003(\t\022D\n\016logging" +
-      "_config\030\006 \001(\0132,.google.cloud.dataproc.v1" +
+      "_config\030\006 \001(\0132,.google.cloud.dataproc.v1",
       "beta2.LoggingConfig\0326\n\024ScriptVariablesEn" +
       "try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0321\n\017P" +
       "ropertiesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001" +
@@ -252,7 +252,7 @@ public static void registerAllExtensions(
       "\n\023continue_on_failure\030\003 \001(\010\022T\n\020script_va" +
       "riables\030\004 \003(\0132:.google.cloud.dataproc.v1" +
       "beta2.PigJob.ScriptVariablesEntry\022I\n\npro" +
-      "perties\030\005 \003(\01325.google.cloud.dataproc.v1" +
+      "perties\030\005 \003(\01325.google.cloud.dataproc.v1",
       "beta2.PigJob.PropertiesEntry\022\025\n\rjar_file" +
       "_uris\030\006 \003(\t\022D\n\016logging_config\030\007 \001(\0132,.go" +
       "ogle.cloud.dataproc.v1beta2.LoggingConfi" +
@@ -262,7 +262,7 @@ public static void registerAllExtensions(
       ":\n\014JobPlacement\022\024\n\014cluster_name\030\001 \001(\t\022\024\n" +
       "\014cluster_uuid\030\002 \001(\t\"\314\003\n\tJobStatus\022=\n\005sta" +
       "te\030\001 \001(\0162..google.cloud.dataproc.v1beta2" +
-      ".JobStatus.State\022\017\n\007details\030\002 \001(\t\0224\n\020sta" +
+      ".JobStatus.State\022\017\n\007details\030\002 \001(\t\0224\n\020sta",
       "te_start_time\030\006 \001(\0132\032.google.protobuf.Ti" +
       "mestamp\022C\n\010substate\030\007 \001(\01621.google.cloud" +
       ".dataproc.v1beta2.JobStatus.Substate\"\251\001\n" +
@@ -272,7 +272,7 @@ public static void registerAllExtensions(
       "LLED\020\004\022\010\n\004DONE\020\005\022\t\n\005ERROR\020\006\022\023\n\017ATTEMPT_F" +
       "AILURE\020\t\"H\n\010Substate\022\017\n\013UNSPECIFIED\020\000\022\r\n" +
       "\tSUBMITTED\020\001\022\n\n\006QUEUED\020\002\022\020\n\014STALE_STATUS" +
-      "\020\003\"2\n\014JobReference\022\022\n\nproject_id\030\001 \001(\t\022\016" +
+      "\020\003\"2\n\014JobReference\022\022\n\nproject_id\030\001 \001(\t\022\016",
       "\n\006job_id\030\002 \001(\t\"\226\002\n\017YarnApplication\022\014\n\004na" +
       "me\030\001 \001(\t\022C\n\005state\030\002 \001(\01624.google.cloud.d" +
       "ataproc.v1beta2.YarnApplication.State\022\020\n" +
@@ -282,7 +282,7 @@ public static void registerAllExtensions(
       "ED\020\004\022\013\n\007RUNNING\020\005\022\014\n\010FINISHED\020\006\022\n\n\006FAILE" +
       "D\020\007\022\n\n\006KILLED\020\010\"\312\007\n\003Job\022>\n\treference\030\001 \001" +
       "(\0132+.google.cloud.dataproc.v1beta2.JobRe" +
-      "ference\022>\n\tplacement\030\002 \001(\0132+.google.clou" +
+      "ference\022>\n\tplacement\030\002 \001(\0132+.google.clou",
       "d.dataproc.v1beta2.JobPlacement\022>\n\nhadoo" +
       "p_job\030\003 \001(\0132(.google.cloud.dataproc.v1be" +
       "ta2.HadoopJobH\000\022<\n\tspark_job\030\004 \001(\0132\'.goo" +
@@ -292,7 +292,7 @@ public static void registerAllExtensions(
       "\0132&.google.cloud.dataproc.v1beta2.HiveJo" +
       "bH\000\0228\n\007pig_job\030\007 \001(\0132%.google.cloud.data" +
       "proc.v1beta2.PigJobH\000\022C\n\rspark_sql_job\030\014" +
-      " \001(\0132*.google.cloud.dataproc.v1beta2.Spa" +
+      " \001(\0132*.google.cloud.dataproc.v1beta2.Spa",
       "rkSqlJobH\000\0228\n\006status\030\010 \001(\0132(.google.clou" +
       "d.dataproc.v1beta2.JobStatus\022@\n\016status_h" +
       "istory\030\r \003(\0132(.google.cloud.dataproc.v1b" +
@@ -302,7 +302,7 @@ public static void registerAllExtensions(
       "\021 \001(\t\022 \n\030driver_control_files_uri\030\017 \001(\t\022" +
       ">\n\006labels\030\022 \003(\0132..google.cloud.dataproc." +
       "v1beta2.Job.LabelsEntry\022@\n\nscheduling\030\024 " +
-      "\001(\0132,.google.cloud.dataproc.v1beta2.JobS" +
+      "\001(\0132,.google.cloud.dataproc.v1beta2.JobS",
       "cheduling\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n" +
       "\005value\030\002 \001(\t:\0028\001B\n\n\010type_job\".\n\rJobSched" +
       "uling\022\035\n\025max_failures_per_hour\030\001 \001(\005\"{\n\020" +
@@ -312,7 +312,7 @@ public static void registerAllExtensions(
       "\t\"C\n\rGetJobRequest\022\022\n\nproject_id\030\001 \001(\t\022\016" +
       "\n\006region\030\003 \001(\t\022\016\n\006job_id\030\002 \001(\t\"\225\002\n\017ListJ" +
       "obsRequest\022\022\n\nproject_id\030\001 \001(\t\022\016\n\006region" +
-      "\030\006 \001(\t\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_token\030" +
+      "\030\006 \001(\t\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_token\030",
       "\003 \001(\t\022\024\n\014cluster_name\030\004 \001(\t\022Y\n\021job_state" +
       "_matcher\030\005 \001(\0162>.google.cloud.dataproc.v" +
       "1beta2.ListJobsRequest.JobStateMatcher\022\016" +
@@ -322,7 +322,7 @@ public static void registerAllExtensions(
       "n\030\002 \001(\t\022\016\n\006job_id\030\003 \001(\t\022/\n\003job\030\004 \001(\0132\".g" +
       "oogle.cloud.dataproc.v1beta2.Job\022/\n\013upda" +
       "te_mask\030\005 \001(\0132\032.google.protobuf.FieldMas" +
-      "k\"]\n\020ListJobsResponse\0220\n\004jobs\030\001 \003(\0132\".go" +
+      "k\"]\n\020ListJobsResponse\0220\n\004jobs\030\001 \003(\0132\".go",
       "ogle.cloud.dataproc.v1beta2.Job\022\027\n\017next_" +
       "page_token\030\002 \001(\t\"F\n\020CancelJobRequest\022\022\n\n" +
       "project_id\030\001 \001(\t\022\016\n\006region\030\003 \001(\t\022\016\n\006job_" +
@@ -332,7 +332,7 @@ public static void registerAllExtensions(
       "e.cloud.dataproc.v1beta2.SubmitJobReques" +
       "t\032\".google.cloud.dataproc.v1beta2.Job\"F\202" +
       "\323\344\223\002@\";/v1beta2/projects/{project_id}/re" +
-      "gions/{region}/jobs:submit:\001*\022\241\001\n\006GetJob" +
+      "gions/{region}/jobs:submit:\001*\022\241\001\n\006GetJob",
       "\022,.google.cloud.dataproc.v1beta2.GetJobR" +
       "equest\032\".google.cloud.dataproc.v1beta2.J" +
       "ob\"E\202\323\344\223\002?\022=/v1beta2/projects/{project_i" +
@@ -342,7 +342,7 @@ public static void registerAllExtensions(
       "1beta2.ListJobsResponse\"<\202\323\344\223\0026\0224/v1beta" +
       "2/projects/{project_id}/regions/{region}" +
       "/jobs\022\254\001\n\tUpdateJob\022/.google.cloud.datap" +
-      "roc.v1beta2.UpdateJobRequest\032\".google.cl" +
+      "roc.v1beta2.UpdateJobRequest\032\".google.cl",
       "oud.dataproc.v1beta2.Job\"J\202\323\344\223\002D2=/v1bet" +
       "a2/projects/{project_id}/regions/{region" +
       "}/jobs/{job_id}:\003job\022\261\001\n\tCancelJob\022/.goo" +
@@ -352,7 +352,7 @@ public static void registerAllExtensions(
       "regions/{region}/jobs/{job_id}:cancel:\001*" +
       "\022\233\001\n\tDeleteJob\022/.google.cloud.dataproc.v" +
       "1beta2.DeleteJobRequest\032\026.google.protobu" +
-      "f.Empty\"E\202\323\344\223\002?*=/v1beta2/projects/{proj" +
+      "f.Empty\"E\202\323\344\223\002?*=/v1beta2/projects/{proj",
       "ect_id}/regions/{region}/jobs/{job_id}Bw" +
       "\n!com.google.cloud.dataproc.v1beta2B\tJob" +
       "sProtoP\001ZEgoogle.golang.org/genproto/goo" +
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/LifecycleConfig.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/LifecycleConfig.java
index c66339584d8d..8d59a10ab4a0 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/LifecycleConfig.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/LifecycleConfig.java
@@ -32,9 +32,6 @@ private LifecycleConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private LifecycleConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.protobuf.Duration.Builder subBuilder = null;
             if (idleDeleteTtl_ != null) {
@@ -87,13 +91,6 @@ private LifecycleConfig(
             ttlCase_ = 3;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -111,7 +108,6 @@ private LifecycleConfig(
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_LifecycleConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_LifecycleConfig_fieldAccessorTable
@@ -273,7 +269,6 @@ public com.google.protobuf.DurationOrBuilder getAutoDeleteTtlOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -283,7 +278,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (idleDeleteTtl_ != null) {
@@ -298,7 +292,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -454,7 +447,6 @@ public static com.google.cloud.dataproc.v1beta2.LifecycleConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -462,7 +454,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.LifecycleConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -490,7 +481,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_LifecycleConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_LifecycleConfig_fieldAccessorTable
@@ -513,7 +503,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (idleDeleteTtlBuilder_ == null) {
@@ -527,18 +516,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_LifecycleConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.LifecycleConfig getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.LifecycleConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.LifecycleConfig build() {
       com.google.cloud.dataproc.v1beta2.LifecycleConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -547,7 +533,6 @@ public com.google.cloud.dataproc.v1beta2.LifecycleConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.LifecycleConfig buildPartial() {
       com.google.cloud.dataproc.v1beta2.LifecycleConfig result = new com.google.cloud.dataproc.v1beta2.LifecycleConfig(this);
       if (idleDeleteTtlBuilder_ == null) {
@@ -574,39 +559,32 @@ public com.google.cloud.dataproc.v1beta2.LifecycleConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.LifecycleConfig) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.LifecycleConfig)other);
@@ -639,12 +617,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.LifecycleConfig other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1192,13 +1168,11 @@ public com.google.protobuf.DurationOrBuilder getAutoDeleteTtlOrBuilder() {
       onChanged();;
       return autoDeleteTtlBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1220,12 +1194,11 @@ public static com.google.cloud.dataproc.v1beta2.LifecycleConfig getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LifecycleConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LifecycleConfig(input, extensionRegistry);
+        return new LifecycleConfig(input, extensionRegistry);
     }
   };
 
@@ -1238,7 +1211,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.LifecycleConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ListClustersRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ListClustersRequest.java
index e90416531d4c..5a6a3f23e9cd 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ListClustersRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ListClustersRequest.java
@@ -37,9 +37,6 @@ private ListClustersRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private ListClustersRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -80,13 +84,6 @@ private ListClustersRequest(
             filter_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private ListClustersRequest(
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_ListClustersRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_ListClustersRequest_fieldAccessorTable
@@ -324,7 +320,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -334,7 +329,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -355,7 +349,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -499,7 +492,6 @@ public static com.google.cloud.dataproc.v1beta2.ListClustersRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -507,7 +499,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.ListClustersRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -535,7 +526,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_ListClustersRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_ListClustersRequest_fieldAccessorTable
@@ -558,7 +548,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -574,18 +563,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_ListClustersRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ListClustersRequest getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.ListClustersRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ListClustersRequest build() {
       com.google.cloud.dataproc.v1beta2.ListClustersRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -594,7 +580,6 @@ public com.google.cloud.dataproc.v1beta2.ListClustersRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ListClustersRequest buildPartial() {
       com.google.cloud.dataproc.v1beta2.ListClustersRequest result = new com.google.cloud.dataproc.v1beta2.ListClustersRequest(this);
       result.projectId_ = projectId_;
@@ -606,39 +591,32 @@ public com.google.cloud.dataproc.v1beta2.ListClustersRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.ListClustersRequest) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.ListClustersRequest)other);
@@ -674,12 +652,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.ListClustersRequest o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1166,13 +1142,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1194,12 +1168,11 @@ public static com.google.cloud.dataproc.v1beta2.ListClustersRequest getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListClustersRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListClustersRequest(input, extensionRegistry);
+        return new ListClustersRequest(input, extensionRegistry);
     }
   };
 
@@ -1212,7 +1185,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.ListClustersRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ListClustersResponse.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ListClustersResponse.java
index 573f089c6057..2d7550674c1f 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ListClustersResponse.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ListClustersResponse.java
@@ -34,9 +34,6 @@ private ListClustersResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListClustersResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               clusters_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListClustersResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListClustersResponse(
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_ListClustersResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_ListClustersResponse_fieldAccessorTable
@@ -201,7 +197,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -211,7 +206,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < clusters_.size(); i++) {
@@ -223,7 +217,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.cloud.dataproc.v1beta2.ListClustersResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.ListClustersResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_ListClustersResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_ListClustersResponse_fieldAccessorTable
@@ -408,7 +398,6 @@ private void maybeForceBuilderInitialization() {
         getClustersFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (clustersBuilder_ == null) {
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_ListClustersResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ListClustersResponse getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.ListClustersResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ListClustersResponse build() {
       com.google.cloud.dataproc.v1beta2.ListClustersResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public com.google.cloud.dataproc.v1beta2.ListClustersResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ListClustersResponse buildPartial() {
       com.google.cloud.dataproc.v1beta2.ListClustersResponse result = new com.google.cloud.dataproc.v1beta2.ListClustersResponse(this);
       int from_bitField0_ = bitField0_;
@@ -462,39 +447,32 @@ public com.google.cloud.dataproc.v1beta2.ListClustersResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.ListClustersResponse) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.ListClustersResponse)other);
@@ -541,12 +519,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.ListClustersResponse
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -976,13 +952,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1004,12 +978,11 @@ public static com.google.cloud.dataproc.v1beta2.ListClustersResponse getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListClustersResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListClustersResponse(input, extensionRegistry);
+        return new ListClustersResponse(input, extensionRegistry);
     }
   };
 
@@ -1022,7 +995,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.ListClustersResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ListJobsRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ListJobsRequest.java
index cad31e59e6c0..0f7c54b4119f 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ListJobsRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ListJobsRequest.java
@@ -39,9 +39,6 @@ private ListJobsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private ListJobsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -94,13 +98,6 @@ private ListJobsRequest(
             filter_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -118,7 +115,6 @@ private ListJobsRequest(
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_ListJobsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_ListJobsRequest_fieldAccessorTable
@@ -474,7 +470,6 @@ public int getJobStateMatcherValue() {
    * .google.cloud.dataproc.v1beta2.ListJobsRequest.JobStateMatcher job_state_matcher = 5;
    */
   public com.google.cloud.dataproc.v1beta2.ListJobsRequest.JobStateMatcher getJobStateMatcher() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dataproc.v1beta2.ListJobsRequest.JobStateMatcher result = com.google.cloud.dataproc.v1beta2.ListJobsRequest.JobStateMatcher.valueOf(jobStateMatcher_);
     return result == null ? com.google.cloud.dataproc.v1beta2.ListJobsRequest.JobStateMatcher.UNRECOGNIZED : result;
   }
@@ -540,7 +535,6 @@ public java.lang.String getFilter() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -550,7 +544,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -577,7 +570,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -735,7 +727,6 @@ public static com.google.cloud.dataproc.v1beta2.ListJobsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -743,7 +734,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.ListJobsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -771,7 +761,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_ListJobsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_ListJobsRequest_fieldAccessorTable
@@ -794,7 +783,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -814,18 +802,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_ListJobsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ListJobsRequest getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.ListJobsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ListJobsRequest build() {
       com.google.cloud.dataproc.v1beta2.ListJobsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -834,7 +819,6 @@ public com.google.cloud.dataproc.v1beta2.ListJobsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ListJobsRequest buildPartial() {
       com.google.cloud.dataproc.v1beta2.ListJobsRequest result = new com.google.cloud.dataproc.v1beta2.ListJobsRequest(this);
       result.projectId_ = projectId_;
@@ -848,39 +832,32 @@ public com.google.cloud.dataproc.v1beta2.ListJobsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.ListJobsRequest) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.ListJobsRequest)other);
@@ -923,12 +900,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.ListJobsRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1393,7 +1368,6 @@ public Builder setJobStateMatcherValue(int value) {
      * .google.cloud.dataproc.v1beta2.ListJobsRequest.JobStateMatcher job_state_matcher = 5;
      */
     public com.google.cloud.dataproc.v1beta2.ListJobsRequest.JobStateMatcher getJobStateMatcher() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dataproc.v1beta2.ListJobsRequest.JobStateMatcher result = com.google.cloud.dataproc.v1beta2.ListJobsRequest.JobStateMatcher.valueOf(jobStateMatcher_);
       return result == null ? com.google.cloud.dataproc.v1beta2.ListJobsRequest.JobStateMatcher.UNRECOGNIZED : result;
     }
@@ -1564,13 +1538,11 @@ public Builder setFilterBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1592,12 +1564,11 @@ public static com.google.cloud.dataproc.v1beta2.ListJobsRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListJobsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListJobsRequest(input, extensionRegistry);
+        return new ListJobsRequest(input, extensionRegistry);
     }
   };
 
@@ -1610,7 +1581,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.ListJobsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ListJobsResponse.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ListJobsResponse.java
index b058744758be..38ee9b7d6a84 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ListJobsResponse.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ListJobsResponse.java
@@ -34,9 +34,6 @@ private ListJobsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListJobsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               jobs_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListJobsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListJobsResponse(
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_ListJobsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_ListJobsResponse_fieldAccessorTable
@@ -201,7 +197,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -211,7 +206,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < jobs_.size(); i++) {
@@ -223,7 +217,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.cloud.dataproc.v1beta2.ListJobsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.ListJobsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_ListJobsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_ListJobsResponse_fieldAccessorTable
@@ -408,7 +398,6 @@ private void maybeForceBuilderInitialization() {
         getJobsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (jobsBuilder_ == null) {
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_ListJobsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ListJobsResponse getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.ListJobsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ListJobsResponse build() {
       com.google.cloud.dataproc.v1beta2.ListJobsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public com.google.cloud.dataproc.v1beta2.ListJobsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ListJobsResponse buildPartial() {
       com.google.cloud.dataproc.v1beta2.ListJobsResponse result = new com.google.cloud.dataproc.v1beta2.ListJobsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -462,39 +447,32 @@ public com.google.cloud.dataproc.v1beta2.ListJobsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.ListJobsResponse) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.ListJobsResponse)other);
@@ -541,12 +519,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.ListJobsResponse othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -976,13 +952,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1004,12 +978,11 @@ public static com.google.cloud.dataproc.v1beta2.ListJobsResponse getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListJobsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListJobsResponse(input, extensionRegistry);
+        return new ListJobsResponse(input, extensionRegistry);
     }
   };
 
@@ -1022,7 +995,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.ListJobsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ListWorkflowTemplatesRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ListWorkflowTemplatesRequest.java
index 8ed9ec9a2e20..19d04f924c72 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ListWorkflowTemplatesRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ListWorkflowTemplatesRequest.java
@@ -35,9 +35,6 @@ private ListWorkflowTemplatesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListWorkflowTemplatesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ListWorkflowTemplatesRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListWorkflowTemplatesRequest(
     return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_ListWorkflowTemplatesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_ListWorkflowTemplatesRequest_fieldAccessorTable
@@ -202,7 +198,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -212,7 +207,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -227,7 +221,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -357,7 +350,6 @@ public static com.google.cloud.dataproc.v1beta2.ListWorkflowTemplatesRequest par
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -365,7 +357,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.ListWorkflowTemplatesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -393,7 +384,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_ListWorkflowTemplatesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_ListWorkflowTemplatesRequest_fieldAccessorTable
@@ -416,7 +406,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -428,18 +417,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_ListWorkflowTemplatesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ListWorkflowTemplatesRequest getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.ListWorkflowTemplatesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ListWorkflowTemplatesRequest build() {
       com.google.cloud.dataproc.v1beta2.ListWorkflowTemplatesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -448,7 +434,6 @@ public com.google.cloud.dataproc.v1beta2.ListWorkflowTemplatesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ListWorkflowTemplatesRequest buildPartial() {
       com.google.cloud.dataproc.v1beta2.ListWorkflowTemplatesRequest result = new com.google.cloud.dataproc.v1beta2.ListWorkflowTemplatesRequest(this);
       result.parent_ = parent_;
@@ -458,39 +443,32 @@ public com.google.cloud.dataproc.v1beta2.ListWorkflowTemplatesRequest buildParti
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.ListWorkflowTemplatesRequest) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.ListWorkflowTemplatesRequest)other);
@@ -518,12 +496,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.ListWorkflowTemplates
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -772,13 +748,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -800,12 +774,11 @@ public static com.google.cloud.dataproc.v1beta2.ListWorkflowTemplatesRequest get
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListWorkflowTemplatesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListWorkflowTemplatesRequest(input, extensionRegistry);
+        return new ListWorkflowTemplatesRequest(input, extensionRegistry);
     }
   };
 
@@ -818,7 +791,6 @@ public com.google.protobuf.Parser getParserForType
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.ListWorkflowTemplatesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ListWorkflowTemplatesResponse.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ListWorkflowTemplatesResponse.java
index affe7cad47b7..bfd8d6dace85 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ListWorkflowTemplatesResponse.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ListWorkflowTemplatesResponse.java
@@ -34,9 +34,6 @@ private ListWorkflowTemplatesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListWorkflowTemplatesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               templates_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListWorkflowTemplatesResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListWorkflowTemplatesResponse(
     return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_ListWorkflowTemplatesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_ListWorkflowTemplatesResponse_fieldAccessorTable
@@ -201,7 +197,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -211,7 +206,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < templates_.size(); i++) {
@@ -223,7 +217,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.cloud.dataproc.v1beta2.ListWorkflowTemplatesResponse pa
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.ListWorkflowTemplatesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_ListWorkflowTemplatesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_ListWorkflowTemplatesResponse_fieldAccessorTable
@@ -408,7 +398,6 @@ private void maybeForceBuilderInitialization() {
         getTemplatesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (templatesBuilder_ == null) {
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_ListWorkflowTemplatesResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ListWorkflowTemplatesResponse getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.ListWorkflowTemplatesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ListWorkflowTemplatesResponse build() {
       com.google.cloud.dataproc.v1beta2.ListWorkflowTemplatesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public com.google.cloud.dataproc.v1beta2.ListWorkflowTemplatesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ListWorkflowTemplatesResponse buildPartial() {
       com.google.cloud.dataproc.v1beta2.ListWorkflowTemplatesResponse result = new com.google.cloud.dataproc.v1beta2.ListWorkflowTemplatesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -462,39 +447,32 @@ public com.google.cloud.dataproc.v1beta2.ListWorkflowTemplatesResponse buildPart
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.ListWorkflowTemplatesResponse) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.ListWorkflowTemplatesResponse)other);
@@ -541,12 +519,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.ListWorkflowTemplates
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -976,13 +952,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1004,12 +978,11 @@ public static com.google.cloud.dataproc.v1beta2.ListWorkflowTemplatesResponse ge
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListWorkflowTemplatesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListWorkflowTemplatesResponse(input, extensionRegistry);
+        return new ListWorkflowTemplatesResponse(input, extensionRegistry);
     }
   };
 
@@ -1022,7 +995,6 @@ public com.google.protobuf.Parser getParserForTyp
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.ListWorkflowTemplatesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/LoggingConfig.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/LoggingConfig.java
index 490da16d23ae..a416c45ebedc 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/LoggingConfig.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/LoggingConfig.java
@@ -32,9 +32,6 @@ private LoggingConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private LoggingConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               driverLogLevels_ = com.google.protobuf.MapField.newMapField(
@@ -59,13 +63,6 @@ private LoggingConfig(
                 driverLogLevels__.getKey(), driverLogLevels__.getValue());
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private LoggingConfig(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -95,7 +91,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_LoggingConfig_fieldAccessorTable
@@ -527,7 +522,6 @@ public int getDriverLogLevelsValueOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -537,7 +531,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     com.google.protobuf.GeneratedMessageV3
@@ -549,7 +542,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -673,7 +665,6 @@ public static com.google.cloud.dataproc.v1beta2.LoggingConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -681,7 +672,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.LoggingConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -731,7 +721,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_LoggingConfig_fieldAccessorTable
@@ -754,25 +743,21 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       internalGetMutableDriverLogLevels().clear();
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_LoggingConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.LoggingConfig getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.LoggingConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.LoggingConfig build() {
       com.google.cloud.dataproc.v1beta2.LoggingConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -781,7 +766,6 @@ public com.google.cloud.dataproc.v1beta2.LoggingConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.LoggingConfig buildPartial() {
       com.google.cloud.dataproc.v1beta2.LoggingConfig result = new com.google.cloud.dataproc.v1beta2.LoggingConfig(this);
       int from_bitField0_ = bitField0_;
@@ -791,39 +775,32 @@ public com.google.cloud.dataproc.v1beta2.LoggingConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.LoggingConfig) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.LoggingConfig)other);
@@ -842,12 +819,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.LoggingConfig other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1148,13 +1123,11 @@ public Builder putAllDriverLogLevelsValue(
           .putAll(values);
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1176,12 +1149,11 @@ public static com.google.cloud.dataproc.v1beta2.LoggingConfig getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LoggingConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LoggingConfig(input, extensionRegistry);
+        return new LoggingConfig(input, extensionRegistry);
     }
   };
 
@@ -1194,7 +1166,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.LoggingConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ManagedCluster.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ManagedCluster.java
index 500e43401be8..12d10a079ca7 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ManagedCluster.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ManagedCluster.java
@@ -33,9 +33,6 @@ private ManagedCluster(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ManagedCluster(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -79,13 +83,6 @@ private ManagedCluster(
                 labels__.getKey(), labels__.getValue());
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private ManagedCluster(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -115,7 +111,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_ManagedCluster_fieldAccessorTable
@@ -324,7 +319,6 @@ public java.lang.String getLabelsOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -334,7 +328,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getClusterNameBytes().isEmpty()) {
@@ -352,7 +345,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -496,7 +488,6 @@ public static com.google.cloud.dataproc.v1beta2.ManagedCluster parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -504,7 +495,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.ManagedCluster prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -554,7 +544,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_ManagedCluster_fieldAccessorTable
@@ -577,7 +566,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       clusterName_ = "";
@@ -592,18 +580,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_ManagedCluster_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ManagedCluster getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.ManagedCluster.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ManagedCluster build() {
       com.google.cloud.dataproc.v1beta2.ManagedCluster result = buildPartial();
       if (!result.isInitialized()) {
@@ -612,7 +597,6 @@ public com.google.cloud.dataproc.v1beta2.ManagedCluster build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ManagedCluster buildPartial() {
       com.google.cloud.dataproc.v1beta2.ManagedCluster result = new com.google.cloud.dataproc.v1beta2.ManagedCluster(this);
       int from_bitField0_ = bitField0_;
@@ -630,39 +614,32 @@ public com.google.cloud.dataproc.v1beta2.ManagedCluster buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.ManagedCluster) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.ManagedCluster)other);
@@ -688,12 +665,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.ManagedCluster other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1167,13 +1142,11 @@ public Builder putAllLabels(
           .putAll(values);
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1195,12 +1168,11 @@ public static com.google.cloud.dataproc.v1beta2.ManagedCluster getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ManagedCluster parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ManagedCluster(input, extensionRegistry);
+        return new ManagedCluster(input, extensionRegistry);
     }
   };
 
@@ -1213,7 +1185,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.ManagedCluster getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ManagedGroupConfig.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ManagedGroupConfig.java
index 7e37d4eed4db..c16966819b70 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ManagedGroupConfig.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/ManagedGroupConfig.java
@@ -34,9 +34,6 @@ private ManagedGroupConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ManagedGroupConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private ManagedGroupConfig(
             instanceGroupManagerName_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private ManagedGroupConfig(
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_ManagedGroupConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_ManagedGroupConfig_fieldAccessorTable
@@ -179,7 +175,6 @@ public java.lang.String getInstanceGroupManagerName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -189,7 +184,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getInstanceTemplateNameBytes().isEmpty()) {
@@ -201,7 +195,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -323,7 +316,6 @@ public static com.google.cloud.dataproc.v1beta2.ManagedGroupConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -331,7 +323,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.ManagedGroupConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -359,7 +350,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_ManagedGroupConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_ManagedGroupConfig_fieldAccessorTable
@@ -382,7 +372,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       instanceTemplateName_ = "";
@@ -392,18 +381,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_ManagedGroupConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ManagedGroupConfig getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.ManagedGroupConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ManagedGroupConfig build() {
       com.google.cloud.dataproc.v1beta2.ManagedGroupConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -412,7 +398,6 @@ public com.google.cloud.dataproc.v1beta2.ManagedGroupConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.ManagedGroupConfig buildPartial() {
       com.google.cloud.dataproc.v1beta2.ManagedGroupConfig result = new com.google.cloud.dataproc.v1beta2.ManagedGroupConfig(this);
       result.instanceTemplateName_ = instanceTemplateName_;
@@ -421,39 +406,32 @@ public com.google.cloud.dataproc.v1beta2.ManagedGroupConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.ManagedGroupConfig) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.ManagedGroupConfig)other);
@@ -478,12 +456,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.ManagedGroupConfig ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -684,13 +660,11 @@ public Builder setInstanceGroupManagerNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -712,12 +686,11 @@ public static com.google.cloud.dataproc.v1beta2.ManagedGroupConfig getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ManagedGroupConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ManagedGroupConfig(input, extensionRegistry);
+        return new ManagedGroupConfig(input, extensionRegistry);
     }
   };
 
@@ -730,7 +703,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.ManagedGroupConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/NodeInitializationAction.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/NodeInitializationAction.java
index 25fbe29279f4..26f6a62614c2 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/NodeInitializationAction.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/NodeInitializationAction.java
@@ -34,9 +34,6 @@ private NodeInitializationAction(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private NodeInitializationAction(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -67,13 +71,6 @@ private NodeInitializationAction(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private NodeInitializationAction(
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_NodeInitializationAction_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_NodeInitializationAction_fieldAccessorTable
@@ -184,7 +180,6 @@ public com.google.protobuf.DurationOrBuilder getExecutionTimeoutOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -194,7 +189,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getExecutableFileBytes().isEmpty()) {
@@ -206,7 +200,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -334,7 +327,6 @@ public static com.google.cloud.dataproc.v1beta2.NodeInitializationAction parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -342,7 +334,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.NodeInitializationAction prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -371,7 +362,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_NodeInitializationAction_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_NodeInitializationAction_fieldAccessorTable
@@ -394,7 +384,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       executableFile_ = "";
@@ -408,18 +397,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_NodeInitializationAction_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.NodeInitializationAction getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.NodeInitializationAction.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.NodeInitializationAction build() {
       com.google.cloud.dataproc.v1beta2.NodeInitializationAction result = buildPartial();
       if (!result.isInitialized()) {
@@ -428,7 +414,6 @@ public com.google.cloud.dataproc.v1beta2.NodeInitializationAction build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.NodeInitializationAction buildPartial() {
       com.google.cloud.dataproc.v1beta2.NodeInitializationAction result = new com.google.cloud.dataproc.v1beta2.NodeInitializationAction(this);
       result.executableFile_ = executableFile_;
@@ -441,39 +426,32 @@ public com.google.cloud.dataproc.v1beta2.NodeInitializationAction buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.NodeInitializationAction) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.NodeInitializationAction)other);
@@ -497,12 +475,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.NodeInitializationAct
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -789,13 +765,11 @@ public com.google.protobuf.DurationOrBuilder getExecutionTimeoutOrBuilder() {
       }
       return executionTimeoutBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -817,12 +791,11 @@ public static com.google.cloud.dataproc.v1beta2.NodeInitializationAction getDefa
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public NodeInitializationAction parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new NodeInitializationAction(input, extensionRegistry);
+        return new NodeInitializationAction(input, extensionRegistry);
     }
   };
 
@@ -835,7 +808,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.NodeInitializationAction getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/OperationsProto.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/OperationsProto.java
index e8c37aa6b171..3ccc599553ae 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/OperationsProto.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/OperationsProto.java
@@ -47,7 +47,7 @@ public static void registerAllExtensions(
       "State\022\023\n\013inner_state\030\002 \001(\t\022\017\n\007details\030\003 " +
       "\001(\t\0224\n\020state_start_time\030\004 \001(\0132\032.google.p" +
       "rotobuf.Timestamp\"8\n\005State\022\013\n\007UNKNOWN\020\000\022" +
-      "\013\n\007PENDING\020\001\022\013\n\007RUNNING\020\002\022\010\n\004DONE\020\003\"\237\003\n\030" +
+      "\013\n\007PENDING\020\001\022\013\n\007RUNNING\020\002\022\010\n\004DONE\020\003\"\237\003\n\030",
       "ClusterOperationMetadata\022\024\n\014cluster_name" +
       "\030\007 \001(\t\022\024\n\014cluster_uuid\030\010 \001(\t\022E\n\006status\030\t" +
       " \001(\01325.google.cloud.dataproc.v1beta2.Clu" +
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "(\t\022\023\n\013description\030\014 \001(\t\022S\n\006labels\030\r \003(\0132" +
       "C.google.cloud.dataproc.v1beta2.ClusterO" +
       "perationMetadata.LabelsEntry\022\020\n\010warnings" +
-      "\030\016 \003(\t\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005va" +
+      "\030\016 \003(\t\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005va",
       "lue\030\002 \001(\t:\0028\001B}\n!com.google.cloud.datapr" +
       "oc.v1beta2B\017OperationsProtoP\001ZEgoogle.go" +
       "lang.org/genproto/googleapis/cloud/datap" +
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/OrderedJob.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/OrderedJob.java
index e8f4c4e72b07..df2d27a691f3 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/OrderedJob.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/OrderedJob.java
@@ -34,9 +34,6 @@ private OrderedJob(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private OrderedJob(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -173,13 +177,6 @@ private OrderedJob(
             prerequisiteStepIds_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -201,7 +198,6 @@ private OrderedJob(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -212,7 +208,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_OrderedJob_fieldAccessorTable
@@ -752,7 +747,6 @@ public java.lang.String getPrerequisiteStepIds(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -762,7 +756,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getStepIdBytes().isEmpty()) {
@@ -801,7 +794,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1042,7 +1034,6 @@ public static com.google.cloud.dataproc.v1beta2.OrderedJob parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1050,7 +1041,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.OrderedJob prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1100,7 +1090,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_OrderedJob_fieldAccessorTable
@@ -1123,7 +1112,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       stepId_ = "";
@@ -1142,18 +1130,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_OrderedJob_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.OrderedJob getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.OrderedJob.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.OrderedJob build() {
       com.google.cloud.dataproc.v1beta2.OrderedJob result = buildPartial();
       if (!result.isInitialized()) {
@@ -1162,7 +1147,6 @@ public com.google.cloud.dataproc.v1beta2.OrderedJob build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.OrderedJob buildPartial() {
       com.google.cloud.dataproc.v1beta2.OrderedJob result = new com.google.cloud.dataproc.v1beta2.OrderedJob(this);
       int from_bitField0_ = bitField0_;
@@ -1228,39 +1212,32 @@ public com.google.cloud.dataproc.v1beta2.OrderedJob buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.OrderedJob) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.OrderedJob)other);
@@ -1325,12 +1302,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.OrderedJob other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3010,13 +2985,11 @@ public Builder addPrerequisiteStepIdsBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -3038,12 +3011,11 @@ public static com.google.cloud.dataproc.v1beta2.OrderedJob getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public OrderedJob parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new OrderedJob(input, extensionRegistry);
+        return new OrderedJob(input, extensionRegistry);
     }
   };
 
@@ -3056,7 +3028,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.OrderedJob getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/PigJob.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/PigJob.java
index d22a74871c75..4d1be6227255 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/PigJob.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/PigJob.java
@@ -35,9 +35,6 @@ private PigJob(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private PigJob(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             queriesCase_ = 1;
@@ -122,13 +126,6 @@ private PigJob(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -150,7 +147,6 @@ private PigJob(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -163,7 +159,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_PigJob_fieldAccessorTable
@@ -597,7 +592,6 @@ public com.google.cloud.dataproc.v1beta2.LoggingConfigOrBuilder getLoggingConfig
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -607,7 +601,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (queriesCase_ == 1) {
@@ -640,7 +633,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -850,7 +842,6 @@ public static com.google.cloud.dataproc.v1beta2.PigJob parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -858,7 +849,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.PigJob prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -913,7 +903,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_PigJob_fieldAccessorTable
@@ -936,7 +925,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       continueOnFailure_ = false;
@@ -956,18 +944,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_PigJob_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.PigJob getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.PigJob.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.PigJob build() {
       com.google.cloud.dataproc.v1beta2.PigJob result = buildPartial();
       if (!result.isInitialized()) {
@@ -976,7 +961,6 @@ public com.google.cloud.dataproc.v1beta2.PigJob build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.PigJob buildPartial() {
       com.google.cloud.dataproc.v1beta2.PigJob result = new com.google.cloud.dataproc.v1beta2.PigJob(this);
       int from_bitField0_ = bitField0_;
@@ -1012,39 +996,32 @@ public com.google.cloud.dataproc.v1beta2.PigJob buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.PigJob) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.PigJob)other);
@@ -1096,12 +1073,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.PigJob other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2073,13 +2048,11 @@ public com.google.cloud.dataproc.v1beta2.LoggingConfigOrBuilder getLoggingConfig
       }
       return loggingConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2101,12 +2074,11 @@ public static com.google.cloud.dataproc.v1beta2.PigJob getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PigJob parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PigJob(input, extensionRegistry);
+        return new PigJob(input, extensionRegistry);
     }
   };
 
@@ -2119,7 +2091,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.PigJob getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/PySparkJob.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/PySparkJob.java
index 896557f651ce..e1f3cf0ace7b 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/PySparkJob.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/PySparkJob.java
@@ -40,9 +40,6 @@ private PySparkJob(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -54,6 +51,13 @@ private PySparkJob(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -131,13 +135,6 @@ private PySparkJob(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -171,7 +168,6 @@ private PySparkJob(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -182,7 +178,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_PySparkJob_fieldAccessorTable
@@ -622,7 +617,6 @@ public com.google.cloud.dataproc.v1beta2.LoggingConfigOrBuilder getLoggingConfig
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -632,7 +626,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getMainPythonFileUriBytes().isEmpty()) {
@@ -665,7 +658,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -879,7 +871,6 @@ public static com.google.cloud.dataproc.v1beta2.PySparkJob parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -887,7 +878,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.PySparkJob prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -939,7 +929,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_PySparkJob_fieldAccessorTable
@@ -962,7 +951,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       mainPythonFileUri_ = "";
@@ -987,18 +975,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_PySparkJob_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.PySparkJob getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.PySparkJob.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.PySparkJob build() {
       com.google.cloud.dataproc.v1beta2.PySparkJob result = buildPartial();
       if (!result.isInitialized()) {
@@ -1007,7 +992,6 @@ public com.google.cloud.dataproc.v1beta2.PySparkJob build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.PySparkJob buildPartial() {
       com.google.cloud.dataproc.v1beta2.PySparkJob result = new com.google.cloud.dataproc.v1beta2.PySparkJob(this);
       int from_bitField0_ = bitField0_;
@@ -1050,39 +1034,32 @@ public com.google.cloud.dataproc.v1beta2.PySparkJob buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.PySparkJob) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.PySparkJob)other);
@@ -1158,12 +1135,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.PySparkJob other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2305,13 +2280,11 @@ public com.google.cloud.dataproc.v1beta2.LoggingConfigOrBuilder getLoggingConfig
       }
       return loggingConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2333,12 +2306,11 @@ public static com.google.cloud.dataproc.v1beta2.PySparkJob getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PySparkJob parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PySparkJob(input, extensionRegistry);
+        return new PySparkJob(input, extensionRegistry);
     }
   };
 
@@ -2351,7 +2323,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.PySparkJob getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/QueryList.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/QueryList.java
index 096e86533e94..96b754b88dbf 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/QueryList.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/QueryList.java
@@ -33,9 +33,6 @@ private QueryList(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private QueryList(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -56,13 +60,6 @@ private QueryList(
             queries_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private QueryList(
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_QueryList_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_QueryList_fieldAccessorTable
@@ -185,7 +181,6 @@ public java.lang.String getQueries(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -195,7 +190,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < queries_.size(); i++) {
@@ -204,7 +198,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -326,7 +319,6 @@ public static com.google.cloud.dataproc.v1beta2.QueryList parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -334,7 +326,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.QueryList prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -362,7 +353,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_QueryList_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_QueryList_fieldAccessorTable
@@ -385,7 +375,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       queries_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -393,18 +382,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_QueryList_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.QueryList getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.QueryList.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.QueryList build() {
       com.google.cloud.dataproc.v1beta2.QueryList result = buildPartial();
       if (!result.isInitialized()) {
@@ -413,7 +399,6 @@ public com.google.cloud.dataproc.v1beta2.QueryList build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.QueryList buildPartial() {
       com.google.cloud.dataproc.v1beta2.QueryList result = new com.google.cloud.dataproc.v1beta2.QueryList(this);
       int from_bitField0_ = bitField0_;
@@ -426,39 +411,32 @@ public com.google.cloud.dataproc.v1beta2.QueryList buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.QueryList) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.QueryList)other);
@@ -485,12 +463,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.QueryList other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -747,13 +723,11 @@ public Builder addQueriesBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -775,12 +749,11 @@ public static com.google.cloud.dataproc.v1beta2.QueryList getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public QueryList parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new QueryList(input, extensionRegistry);
+        return new QueryList(input, extensionRegistry);
     }
   };
 
@@ -793,7 +766,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.QueryList getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/SoftwareConfig.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/SoftwareConfig.java
index 48aeeccc3458..a2b53b008ef4 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/SoftwareConfig.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/SoftwareConfig.java
@@ -33,9 +33,6 @@ private SoftwareConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private SoftwareConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private SoftwareConfig(
                 properties__.getKey(), properties__.getValue());
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private SoftwareConfig(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -102,7 +98,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_SoftwareConfig_fieldAccessorTable
@@ -310,7 +305,6 @@ public java.lang.String getPropertiesOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -320,7 +314,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getImageVersionBytes().isEmpty()) {
@@ -335,7 +328,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -466,7 +458,6 @@ public static com.google.cloud.dataproc.v1beta2.SoftwareConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -474,7 +465,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.SoftwareConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -524,7 +514,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_SoftwareConfig_fieldAccessorTable
@@ -547,7 +536,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       imageVersion_ = "";
@@ -556,18 +544,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_SoftwareConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.SoftwareConfig getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.SoftwareConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.SoftwareConfig build() {
       com.google.cloud.dataproc.v1beta2.SoftwareConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -576,7 +561,6 @@ public com.google.cloud.dataproc.v1beta2.SoftwareConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.SoftwareConfig buildPartial() {
       com.google.cloud.dataproc.v1beta2.SoftwareConfig result = new com.google.cloud.dataproc.v1beta2.SoftwareConfig(this);
       int from_bitField0_ = bitField0_;
@@ -589,39 +573,32 @@ public com.google.cloud.dataproc.v1beta2.SoftwareConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.SoftwareConfig) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.SoftwareConfig)other);
@@ -644,12 +621,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.SoftwareConfig other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1026,13 +1001,11 @@ public Builder putAllProperties(
           .putAll(values);
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1054,12 +1027,11 @@ public static com.google.cloud.dataproc.v1beta2.SoftwareConfig getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SoftwareConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SoftwareConfig(input, extensionRegistry);
+        return new SoftwareConfig(input, extensionRegistry);
     }
   };
 
@@ -1072,7 +1044,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.SoftwareConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/SparkJob.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/SparkJob.java
index 2e9628a21302..28db3808df71 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/SparkJob.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/SparkJob.java
@@ -37,9 +37,6 @@ private SparkJob(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private SparkJob(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             driverCase_ = 1;
@@ -125,13 +129,6 @@ private SparkJob(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -162,7 +159,6 @@ private SparkJob(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -173,7 +169,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_SparkJob_fieldAccessorTable
@@ -666,7 +661,6 @@ public com.google.cloud.dataproc.v1beta2.LoggingConfigOrBuilder getLoggingConfig
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -676,7 +670,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (driverCase_ == 1) {
@@ -709,7 +702,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -935,7 +927,6 @@ public static com.google.cloud.dataproc.v1beta2.SparkJob parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -943,7 +934,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.SparkJob prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -994,7 +984,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_SparkJob_fieldAccessorTable
@@ -1017,7 +1006,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       args_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -1040,18 +1028,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_SparkJob_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.SparkJob getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.SparkJob.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.SparkJob build() {
       com.google.cloud.dataproc.v1beta2.SparkJob result = buildPartial();
       if (!result.isInitialized()) {
@@ -1060,7 +1045,6 @@ public com.google.cloud.dataproc.v1beta2.SparkJob build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.SparkJob buildPartial() {
       com.google.cloud.dataproc.v1beta2.SparkJob result = new com.google.cloud.dataproc.v1beta2.SparkJob(this);
       int from_bitField0_ = bitField0_;
@@ -1104,39 +1088,32 @@ public com.google.cloud.dataproc.v1beta2.SparkJob buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.SparkJob) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.SparkJob)other);
@@ -1215,12 +1192,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.SparkJob other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2358,13 +2333,11 @@ public com.google.cloud.dataproc.v1beta2.LoggingConfigOrBuilder getLoggingConfig
       }
       return loggingConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2386,12 +2359,11 @@ public static com.google.cloud.dataproc.v1beta2.SparkJob getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SparkJob parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SparkJob(input, extensionRegistry);
+        return new SparkJob(input, extensionRegistry);
     }
   };
 
@@ -2404,7 +2376,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.SparkJob getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/SparkSqlJob.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/SparkSqlJob.java
index 2e16f9fb036e..ff2799f22a96 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/SparkSqlJob.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/SparkSqlJob.java
@@ -34,9 +34,6 @@ private SparkSqlJob(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private SparkSqlJob(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             queriesCase_ = 1;
@@ -116,13 +120,6 @@ private SparkSqlJob(
             jarFileUris_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -144,7 +141,6 @@ private SparkSqlJob(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -157,7 +153,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_SparkSqlJob_fieldAccessorTable
@@ -568,7 +563,6 @@ public com.google.cloud.dataproc.v1beta2.LoggingConfigOrBuilder getLoggingConfig
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -578,7 +572,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (queriesCase_ == 1) {
@@ -608,7 +601,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -809,7 +801,6 @@ public static com.google.cloud.dataproc.v1beta2.SparkSqlJob parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -817,7 +808,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.SparkSqlJob prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -872,7 +862,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_SparkSqlJob_fieldAccessorTable
@@ -895,7 +884,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       internalGetMutableScriptVariables().clear();
@@ -913,18 +901,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_SparkSqlJob_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.SparkSqlJob getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.SparkSqlJob.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.SparkSqlJob build() {
       com.google.cloud.dataproc.v1beta2.SparkSqlJob result = buildPartial();
       if (!result.isInitialized()) {
@@ -933,7 +918,6 @@ public com.google.cloud.dataproc.v1beta2.SparkSqlJob build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.SparkSqlJob buildPartial() {
       com.google.cloud.dataproc.v1beta2.SparkSqlJob result = new com.google.cloud.dataproc.v1beta2.SparkSqlJob(this);
       int from_bitField0_ = bitField0_;
@@ -968,39 +952,32 @@ public com.google.cloud.dataproc.v1beta2.SparkSqlJob buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.SparkSqlJob) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.SparkSqlJob)other);
@@ -1049,12 +1026,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.SparkSqlJob other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1966,13 +1941,11 @@ public com.google.cloud.dataproc.v1beta2.LoggingConfigOrBuilder getLoggingConfig
       }
       return loggingConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1994,12 +1967,11 @@ public static com.google.cloud.dataproc.v1beta2.SparkSqlJob getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SparkSqlJob parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SparkSqlJob(input, extensionRegistry);
+        return new SparkSqlJob(input, extensionRegistry);
     }
   };
 
@@ -2012,7 +1984,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.SparkSqlJob getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/SubmitJobRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/SubmitJobRequest.java
index 341f27f258cd..6c39f06a514f 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/SubmitJobRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/SubmitJobRequest.java
@@ -35,9 +35,6 @@ private SubmitJobRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private SubmitJobRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -80,13 +84,6 @@ private SubmitJobRequest(
             requestId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private SubmitJobRequest(
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_SubmitJobRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_SubmitJobRequest_fieldAccessorTable
@@ -290,7 +286,6 @@ public java.lang.String getRequestId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -300,7 +295,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -318,7 +312,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -460,7 +453,6 @@ public static com.google.cloud.dataproc.v1beta2.SubmitJobRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -468,7 +460,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.SubmitJobRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -496,7 +487,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_SubmitJobRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_SubmitJobRequest_fieldAccessorTable
@@ -519,7 +509,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -537,18 +526,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_SubmitJobRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.SubmitJobRequest getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.SubmitJobRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.SubmitJobRequest build() {
       com.google.cloud.dataproc.v1beta2.SubmitJobRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -557,7 +543,6 @@ public com.google.cloud.dataproc.v1beta2.SubmitJobRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.SubmitJobRequest buildPartial() {
       com.google.cloud.dataproc.v1beta2.SubmitJobRequest result = new com.google.cloud.dataproc.v1beta2.SubmitJobRequest(this);
       result.projectId_ = projectId_;
@@ -572,39 +557,32 @@ public com.google.cloud.dataproc.v1beta2.SubmitJobRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.SubmitJobRequest) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.SubmitJobRequest)other);
@@ -636,12 +614,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.SubmitJobRequest othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1124,13 +1100,11 @@ public Builder setRequestIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1152,12 +1126,11 @@ public static com.google.cloud.dataproc.v1beta2.SubmitJobRequest getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SubmitJobRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SubmitJobRequest(input, extensionRegistry);
+        return new SubmitJobRequest(input, extensionRegistry);
     }
   };
 
@@ -1170,7 +1143,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.SubmitJobRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/UpdateClusterRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/UpdateClusterRequest.java
index c20d93d0efbe..31421e10216b 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/UpdateClusterRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/UpdateClusterRequest.java
@@ -36,9 +36,6 @@ private UpdateClusterRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private UpdateClusterRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -113,13 +117,6 @@ private UpdateClusterRequest(
             requestId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -137,7 +134,6 @@ private UpdateClusterRequest(
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_UpdateClusterRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_UpdateClusterRequest_fieldAccessorTable
@@ -584,7 +580,6 @@ public java.lang.String getRequestId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -594,7 +589,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -621,7 +615,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -796,7 +789,6 @@ public static com.google.cloud.dataproc.v1beta2.UpdateClusterRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -804,7 +796,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.UpdateClusterRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -832,7 +823,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_UpdateClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_UpdateClusterRequest_fieldAccessorTable
@@ -855,7 +845,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -887,18 +876,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.ClustersProto.internal_static_google_cloud_dataproc_v1beta2_UpdateClusterRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.UpdateClusterRequest getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.UpdateClusterRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.UpdateClusterRequest build() {
       com.google.cloud.dataproc.v1beta2.UpdateClusterRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -907,7 +893,6 @@ public com.google.cloud.dataproc.v1beta2.UpdateClusterRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.UpdateClusterRequest buildPartial() {
       com.google.cloud.dataproc.v1beta2.UpdateClusterRequest result = new com.google.cloud.dataproc.v1beta2.UpdateClusterRequest(this);
       result.projectId_ = projectId_;
@@ -933,39 +918,32 @@ public com.google.cloud.dataproc.v1beta2.UpdateClusterRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.UpdateClusterRequest) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.UpdateClusterRequest)other);
@@ -1007,12 +985,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.UpdateClusterRequest
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2349,13 +2325,11 @@ public Builder setRequestIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2377,12 +2351,11 @@ public static com.google.cloud.dataproc.v1beta2.UpdateClusterRequest getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateClusterRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateClusterRequest(input, extensionRegistry);
+        return new UpdateClusterRequest(input, extensionRegistry);
     }
   };
 
@@ -2395,7 +2368,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.UpdateClusterRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/UpdateJobRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/UpdateJobRequest.java
index 7bdb2d1cfb3d..f319149c97f8 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/UpdateJobRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/UpdateJobRequest.java
@@ -35,9 +35,6 @@ private UpdateJobRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private UpdateJobRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -93,13 +97,6 @@ private UpdateJobRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -117,7 +114,6 @@ private UpdateJobRequest(
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_UpdateJobRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_UpdateJobRequest_fieldAccessorTable
@@ -335,7 +331,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -345,7 +340,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -366,7 +360,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -521,7 +514,6 @@ public static com.google.cloud.dataproc.v1beta2.UpdateJobRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -529,7 +521,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.UpdateJobRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -557,7 +548,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_UpdateJobRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_UpdateJobRequest_fieldAccessorTable
@@ -580,7 +570,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -604,18 +593,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_UpdateJobRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.UpdateJobRequest getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.UpdateJobRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.UpdateJobRequest build() {
       com.google.cloud.dataproc.v1beta2.UpdateJobRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -624,7 +610,6 @@ public com.google.cloud.dataproc.v1beta2.UpdateJobRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.UpdateJobRequest buildPartial() {
       com.google.cloud.dataproc.v1beta2.UpdateJobRequest result = new com.google.cloud.dataproc.v1beta2.UpdateJobRequest(this);
       result.projectId_ = projectId_;
@@ -644,39 +629,32 @@ public com.google.cloud.dataproc.v1beta2.UpdateJobRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.UpdateJobRequest) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.UpdateJobRequest)other);
@@ -711,12 +689,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.UpdateJobRequest othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1357,13 +1333,11 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
       }
       return updateMaskBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1385,12 +1359,11 @@ public static com.google.cloud.dataproc.v1beta2.UpdateJobRequest getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateJobRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateJobRequest(input, extensionRegistry);
+        return new UpdateJobRequest(input, extensionRegistry);
     }
   };
 
@@ -1403,7 +1376,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.UpdateJobRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/UpdateWorkflowTemplateRequest.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/UpdateWorkflowTemplateRequest.java
index 7559b1f8a1dd..86b5ea1a8b4b 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/UpdateWorkflowTemplateRequest.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/UpdateWorkflowTemplateRequest.java
@@ -32,9 +32,6 @@ private UpdateWorkflowTemplateRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private UpdateWorkflowTemplateRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.dataproc.v1beta2.WorkflowTemplate.Builder subBuilder = null;
             if (template_ != null) {
@@ -59,13 +63,6 @@ private UpdateWorkflowTemplateRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private UpdateWorkflowTemplateRequest(
     return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_UpdateWorkflowTemplateRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_UpdateWorkflowTemplateRequest_fieldAccessorTable
@@ -128,7 +124,6 @@ public com.google.cloud.dataproc.v1beta2.WorkflowTemplateOrBuilder getTemplateOr
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -138,7 +133,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (template_ != null) {
@@ -147,7 +141,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -268,7 +261,6 @@ public static com.google.cloud.dataproc.v1beta2.UpdateWorkflowTemplateRequest pa
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -276,7 +268,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.UpdateWorkflowTemplateRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -304,7 +295,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_UpdateWorkflowTemplateRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_UpdateWorkflowTemplateRequest_fieldAccessorTable
@@ -327,7 +317,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (templateBuilder_ == null) {
@@ -339,18 +328,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_UpdateWorkflowTemplateRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.UpdateWorkflowTemplateRequest getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.UpdateWorkflowTemplateRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.UpdateWorkflowTemplateRequest build() {
       com.google.cloud.dataproc.v1beta2.UpdateWorkflowTemplateRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -359,7 +345,6 @@ public com.google.cloud.dataproc.v1beta2.UpdateWorkflowTemplateRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.UpdateWorkflowTemplateRequest buildPartial() {
       com.google.cloud.dataproc.v1beta2.UpdateWorkflowTemplateRequest result = new com.google.cloud.dataproc.v1beta2.UpdateWorkflowTemplateRequest(this);
       if (templateBuilder_ == null) {
@@ -371,39 +356,32 @@ public com.google.cloud.dataproc.v1beta2.UpdateWorkflowTemplateRequest buildPart
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.UpdateWorkflowTemplateRequest) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.UpdateWorkflowTemplateRequest)other);
@@ -423,12 +401,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.UpdateWorkflowTemplat
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -608,13 +584,11 @@ public com.google.cloud.dataproc.v1beta2.WorkflowTemplateOrBuilder getTemplateOr
       }
       return templateBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -636,12 +610,11 @@ public static com.google.cloud.dataproc.v1beta2.UpdateWorkflowTemplateRequest ge
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateWorkflowTemplateRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateWorkflowTemplateRequest(input, extensionRegistry);
+        return new UpdateWorkflowTemplateRequest(input, extensionRegistry);
     }
   };
 
@@ -654,7 +627,6 @@ public com.google.protobuf.Parser getParserForTyp
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.UpdateWorkflowTemplateRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowGraph.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowGraph.java
index 4da494a28ea9..c887ca45bd51 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowGraph.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowGraph.java
@@ -33,9 +33,6 @@ private WorkflowGraph(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private WorkflowGraph(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               nodes_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private WorkflowGraph(
                 input.readMessage(com.google.cloud.dataproc.v1beta2.WorkflowNode.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private WorkflowGraph(
     return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_WorkflowGraph_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_WorkflowGraph_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.cloud.dataproc.v1beta2.WorkflowNodeOrBuilder getNodesOrBuilder
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < nodes_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.dataproc.v1beta2.WorkflowGraph parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.WorkflowGraph prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_WorkflowGraph_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_WorkflowGraph_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getNodesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (nodesBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_WorkflowGraph_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.WorkflowGraph getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.WorkflowGraph.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.WorkflowGraph build() {
       com.google.cloud.dataproc.v1beta2.WorkflowGraph result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.cloud.dataproc.v1beta2.WorkflowGraph build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.WorkflowGraph buildPartial() {
       com.google.cloud.dataproc.v1beta2.WorkflowGraph result = new com.google.cloud.dataproc.v1beta2.WorkflowGraph(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.cloud.dataproc.v1beta2.WorkflowGraph buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.WorkflowGraph) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.WorkflowGraph)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.WorkflowGraph other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.cloud.dataproc.v1beta2.WorkflowNode.Builder addNodesBuilder(
       }
       return nodesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.cloud.dataproc.v1beta2.WorkflowGraph getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public WorkflowGraph parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WorkflowGraph(input, extensionRegistry);
+        return new WorkflowGraph(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.WorkflowGraph getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowMetadata.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowMetadata.java
index 21dce0c8f8dc..488b3c030333 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowMetadata.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowMetadata.java
@@ -36,9 +36,6 @@ private WorkflowMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private WorkflowMetadata(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -125,13 +129,6 @@ private WorkflowMetadata(
                 parameters__.getKey(), parameters__.getValue());
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -150,7 +147,6 @@ private WorkflowMetadata(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -161,7 +157,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_WorkflowMetadata_fieldAccessorTable
@@ -497,7 +492,6 @@ public int getStateValue() {
    * .google.cloud.dataproc.v1beta2.WorkflowMetadata.State state = 6;
    */
   public com.google.cloud.dataproc.v1beta2.WorkflowMetadata.State getState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dataproc.v1beta2.WorkflowMetadata.State result = com.google.cloud.dataproc.v1beta2.WorkflowMetadata.State.valueOf(state_);
     return result == null ? com.google.cloud.dataproc.v1beta2.WorkflowMetadata.State.UNRECOGNIZED : result;
   }
@@ -637,7 +631,6 @@ public java.lang.String getParametersOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -647,7 +640,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getTemplateBytes().isEmpty()) {
@@ -680,7 +672,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -872,7 +863,6 @@ public static com.google.cloud.dataproc.v1beta2.WorkflowMetadata parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -880,7 +870,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.WorkflowMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -930,7 +919,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_WorkflowMetadata_fieldAccessorTable
@@ -953,7 +941,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       template_ = "";
@@ -986,18 +973,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_WorkflowMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.WorkflowMetadata getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.WorkflowMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.WorkflowMetadata build() {
       com.google.cloud.dataproc.v1beta2.WorkflowMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -1006,7 +990,6 @@ public com.google.cloud.dataproc.v1beta2.WorkflowMetadata build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.WorkflowMetadata buildPartial() {
       com.google.cloud.dataproc.v1beta2.WorkflowMetadata result = new com.google.cloud.dataproc.v1beta2.WorkflowMetadata(this);
       int from_bitField0_ = bitField0_;
@@ -1037,39 +1020,32 @@ public com.google.cloud.dataproc.v1beta2.WorkflowMetadata buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.WorkflowMetadata) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.WorkflowMetadata)other);
@@ -1111,12 +1087,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.WorkflowMetadata othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1756,7 +1730,6 @@ public Builder setStateValue(int value) {
      * .google.cloud.dataproc.v1beta2.WorkflowMetadata.State state = 6;
      */
     public com.google.cloud.dataproc.v1beta2.WorkflowMetadata.State getState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dataproc.v1beta2.WorkflowMetadata.State result = com.google.cloud.dataproc.v1beta2.WorkflowMetadata.State.valueOf(state_);
       return result == null ? com.google.cloud.dataproc.v1beta2.WorkflowMetadata.State.UNRECOGNIZED : result;
     }
@@ -2029,13 +2002,11 @@ public Builder putAllParameters(
           .putAll(values);
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2057,12 +2028,11 @@ public static com.google.cloud.dataproc.v1beta2.WorkflowMetadata getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public WorkflowMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WorkflowMetadata(input, extensionRegistry);
+        return new WorkflowMetadata(input, extensionRegistry);
     }
   };
 
@@ -2075,7 +2045,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.WorkflowMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowNode.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowNode.java
index 76f42417bd12..94b1f1834039 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowNode.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowNode.java
@@ -37,9 +37,6 @@ private WorkflowNode(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private WorkflowNode(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -84,13 +88,6 @@ private WorkflowNode(
             error_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -111,7 +108,6 @@ private WorkflowNode(
     return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_WorkflowNode_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_WorkflowNode_fieldAccessorTable
@@ -457,7 +453,6 @@ public int getStateValue() {
    * .google.cloud.dataproc.v1beta2.WorkflowNode.NodeState state = 5;
    */
   public com.google.cloud.dataproc.v1beta2.WorkflowNode.NodeState getState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dataproc.v1beta2.WorkflowNode.NodeState result = com.google.cloud.dataproc.v1beta2.WorkflowNode.NodeState.valueOf(state_);
     return result == null ? com.google.cloud.dataproc.v1beta2.WorkflowNode.NodeState.UNRECOGNIZED : result;
   }
@@ -505,7 +500,6 @@ public java.lang.String getError() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -515,7 +509,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getStepIdBytes().isEmpty()) {
@@ -536,7 +529,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -686,7 +678,6 @@ public static com.google.cloud.dataproc.v1beta2.WorkflowNode parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -694,7 +685,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.WorkflowNode prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -722,7 +712,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_WorkflowNode_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_WorkflowNode_fieldAccessorTable
@@ -745,7 +734,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       stepId_ = "";
@@ -761,18 +749,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_WorkflowNode_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.WorkflowNode getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.WorkflowNode.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.WorkflowNode build() {
       com.google.cloud.dataproc.v1beta2.WorkflowNode result = buildPartial();
       if (!result.isInitialized()) {
@@ -781,7 +766,6 @@ public com.google.cloud.dataproc.v1beta2.WorkflowNode build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.WorkflowNode buildPartial() {
       com.google.cloud.dataproc.v1beta2.WorkflowNode result = new com.google.cloud.dataproc.v1beta2.WorkflowNode(this);
       int from_bitField0_ = bitField0_;
@@ -800,39 +784,32 @@ public com.google.cloud.dataproc.v1beta2.WorkflowNode buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.WorkflowNode) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.WorkflowNode)other);
@@ -874,12 +851,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.WorkflowNode other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1238,7 +1213,6 @@ public Builder setStateValue(int value) {
      * .google.cloud.dataproc.v1beta2.WorkflowNode.NodeState state = 5;
      */
     public com.google.cloud.dataproc.v1beta2.WorkflowNode.NodeState getState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dataproc.v1beta2.WorkflowNode.NodeState result = com.google.cloud.dataproc.v1beta2.WorkflowNode.NodeState.valueOf(state_);
       return result == null ? com.google.cloud.dataproc.v1beta2.WorkflowNode.NodeState.UNRECOGNIZED : result;
     }
@@ -1360,13 +1334,11 @@ public Builder setErrorBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1388,12 +1360,11 @@ public static com.google.cloud.dataproc.v1beta2.WorkflowNode getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public WorkflowNode parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WorkflowNode(input, extensionRegistry);
+        return new WorkflowNode(input, extensionRegistry);
     }
   };
 
@@ -1406,7 +1377,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.WorkflowNode getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplate.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplate.java
index 896bed458d97..daef09c24753 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplate.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplate.java
@@ -36,9 +36,6 @@ private WorkflowTemplate(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private WorkflowTemplate(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -128,13 +132,6 @@ private WorkflowTemplate(
                 input.readMessage(com.google.cloud.dataproc.v1beta2.OrderedJob.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -156,7 +153,6 @@ private WorkflowTemplate(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -167,7 +163,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_WorkflowTemplate_fieldAccessorTable
@@ -569,7 +564,6 @@ public com.google.cloud.dataproc.v1beta2.OrderedJobOrBuilder getJobsOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -579,7 +573,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -612,7 +605,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -807,7 +799,6 @@ public static com.google.cloud.dataproc.v1beta2.WorkflowTemplate parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -815,7 +806,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.WorkflowTemplate prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -865,7 +855,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_WorkflowTemplate_fieldAccessorTable
@@ -889,7 +878,6 @@ private void maybeForceBuilderInitialization() {
         getJobsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       id_ = "";
@@ -926,18 +914,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_WorkflowTemplate_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.WorkflowTemplate getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplate.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.WorkflowTemplate build() {
       com.google.cloud.dataproc.v1beta2.WorkflowTemplate result = buildPartial();
       if (!result.isInitialized()) {
@@ -946,7 +931,6 @@ public com.google.cloud.dataproc.v1beta2.WorkflowTemplate build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.WorkflowTemplate buildPartial() {
       com.google.cloud.dataproc.v1beta2.WorkflowTemplate result = new com.google.cloud.dataproc.v1beta2.WorkflowTemplate(this);
       int from_bitField0_ = bitField0_;
@@ -985,39 +969,32 @@ public com.google.cloud.dataproc.v1beta2.WorkflowTemplate buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.WorkflowTemplate) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.WorkflowTemplate)other);
@@ -1082,12 +1059,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.WorkflowTemplate othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2346,13 +2321,11 @@ public com.google.cloud.dataproc.v1beta2.OrderedJob.Builder addJobsBuilder(
       }
       return jobsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2374,12 +2347,11 @@ public static com.google.cloud.dataproc.v1beta2.WorkflowTemplate getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public WorkflowTemplate parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WorkflowTemplate(input, extensionRegistry);
+        return new WorkflowTemplate(input, extensionRegistry);
     }
   };
 
@@ -2392,7 +2364,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.WorkflowTemplate getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplatePlacement.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplatePlacement.java
index da0a133d732a..5789bb971371 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplatePlacement.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplatePlacement.java
@@ -33,9 +33,6 @@ private WorkflowTemplatePlacement(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private WorkflowTemplatePlacement(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.dataproc.v1beta2.ManagedCluster.Builder subBuilder = null;
             if (placementCase_ == 1) {
@@ -75,13 +79,6 @@ private WorkflowTemplatePlacement(
             placementCase_ = 2;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -99,7 +96,6 @@ private WorkflowTemplatePlacement(
     return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_WorkflowTemplatePlacement_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_WorkflowTemplatePlacement_fieldAccessorTable
@@ -228,7 +224,6 @@ public com.google.cloud.dataproc.v1beta2.ClusterSelectorOrBuilder getClusterSele
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -238,7 +233,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (placementCase_ == 1) {
@@ -250,7 +244,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -393,7 +386,6 @@ public static com.google.cloud.dataproc.v1beta2.WorkflowTemplatePlacement parseF
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -401,7 +393,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.WorkflowTemplatePlacement prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -430,7 +421,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_WorkflowTemplatePlacement_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_WorkflowTemplatePlacement_fieldAccessorTable
@@ -453,7 +443,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       placementCase_ = 0;
@@ -461,18 +450,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatesProto.internal_static_google_cloud_dataproc_v1beta2_WorkflowTemplatePlacement_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.WorkflowTemplatePlacement getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.WorkflowTemplatePlacement.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.WorkflowTemplatePlacement build() {
       com.google.cloud.dataproc.v1beta2.WorkflowTemplatePlacement result = buildPartial();
       if (!result.isInitialized()) {
@@ -481,7 +467,6 @@ public com.google.cloud.dataproc.v1beta2.WorkflowTemplatePlacement build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.WorkflowTemplatePlacement buildPartial() {
       com.google.cloud.dataproc.v1beta2.WorkflowTemplatePlacement result = new com.google.cloud.dataproc.v1beta2.WorkflowTemplatePlacement(this);
       if (placementCase_ == 1) {
@@ -503,39 +488,32 @@ public com.google.cloud.dataproc.v1beta2.WorkflowTemplatePlacement buildPartial(
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.WorkflowTemplatePlacement) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.WorkflowTemplatePlacement)other);
@@ -565,12 +543,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.WorkflowTemplatePlace
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -965,13 +941,11 @@ public com.google.cloud.dataproc.v1beta2.ClusterSelectorOrBuilder getClusterSele
       onChanged();;
       return clusterSelectorBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -993,12 +967,11 @@ public static com.google.cloud.dataproc.v1beta2.WorkflowTemplatePlacement getDef
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public WorkflowTemplatePlacement parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WorkflowTemplatePlacement(input, extensionRegistry);
+        return new WorkflowTemplatePlacement(input, extensionRegistry);
     }
   };
 
@@ -1011,7 +984,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.WorkflowTemplatePlacement getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplatesProto.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplatesProto.java
index ffe4b96b2118..556fd045571f 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplatesProto.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/WorkflowTemplatesProto.java
@@ -142,7 +142,7 @@ public static void registerAllExtensions(
       "to\032\033google/protobuf/empty.proto\032\037google/" +
       "protobuf/timestamp.proto\"\241\003\n\020WorkflowTem" +
       "plate\022\n\n\002id\030\002 \001(\t\022\014\n\004name\030\001 \001(\t\022\017\n\007versi" +
-      "on\030\003 \001(\005\022/\n\013create_time\030\004 \001(\0132\032.google.p" +
+      "on\030\003 \001(\005\022/\n\013create_time\030\004 \001(\0132\032.google.p",
       "rotobuf.Timestamp\022/\n\013update_time\030\005 \001(\0132\032" +
       ".google.protobuf.Timestamp\022K\n\006labels\030\006 \003" +
       "(\0132;.google.cloud.dataproc.v1beta2.Workf" +
@@ -152,7 +152,7 @@ public static void registerAllExtensions(
       "gle.cloud.dataproc.v1beta2.OrderedJob\032-\n" +
       "\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t" +
       ":\0028\001\"\276\001\n\031WorkflowTemplatePlacement\022H\n\017ma" +
-      "naged_cluster\030\001 \001(\0132-.google.cloud.datap" +
+      "naged_cluster\030\001 \001(\0132-.google.cloud.datap",
       "roc.v1beta2.ManagedClusterH\000\022J\n\020cluster_" +
       "selector\030\002 \001(\0132..google.cloud.dataproc.v" +
       "1beta2.ClusterSelectorH\000B\013\n\tplacement\"\336\001" +
@@ -162,7 +162,7 @@ public static void registerAllExtensions(
       "oogle.cloud.dataproc.v1beta2.ManagedClus" +
       "ter.LabelsEntry\032-\n\013LabelsEntry\022\013\n\003key\030\001 " +
       "\001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\260\001\n\017ClusterSelect" +
-      "or\022\014\n\004zone\030\001 \001(\t\022Y\n\016cluster_labels\030\002 \003(\013" +
+      "or\022\014\n\004zone\030\001 \001(\t\022Y\n\016cluster_labels\030\002 \003(\013",
       "2A.google.cloud.dataproc.v1beta2.Cluster" +
       "Selector.ClusterLabelsEntry\0324\n\022ClusterLa" +
       "belsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028" +
@@ -172,7 +172,7 @@ public static void registerAllExtensions(
       "oogle.cloud.dataproc.v1beta2.SparkJobH\000\022" +
       "@\n\013pyspark_job\030\004 \001(\0132).google.cloud.data" +
       "proc.v1beta2.PySparkJobH\000\022:\n\010hive_job\030\005 " +
-      "\001(\0132&.google.cloud.dataproc.v1beta2.Hive" +
+      "\001(\0132&.google.cloud.dataproc.v1beta2.Hive",
       "JobH\000\0228\n\007pig_job\030\006 \001(\0132%.google.cloud.da" +
       "taproc.v1beta2.PigJobH\000\022C\n\rspark_sql_job" +
       "\030\007 \001(\0132*.google.cloud.dataproc.v1beta2.S" +
@@ -182,7 +182,7 @@ public static void registerAllExtensions(
       "ataproc.v1beta2.JobScheduling\022\035\n\025prerequ" +
       "isite_step_ids\030\n \003(\t\032-\n\013LabelsEntry\022\013\n\003k" +
       "ey\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B\n\n\010job_type\"" +
-      "\242\004\n\020WorkflowMetadata\022\020\n\010template\030\001 \001(\t\022\017" +
+      "\242\004\n\020WorkflowMetadata\022\020\n\010template\030\001 \001(\t\022\017",
       "\n\007version\030\002 \001(\005\022G\n\016create_cluster\030\003 \001(\0132" +
       "/.google.cloud.dataproc.v1beta2.ClusterO" +
       "peration\022;\n\005graph\030\004 \001(\0132,.google.cloud.d" +
@@ -192,7 +192,7 @@ public static void registerAllExtensions(
       "google.cloud.dataproc.v1beta2.WorkflowMe" +
       "tadata.State\022\024\n\014cluster_name\030\007 \001(\t\022S\n\npa" +
       "rameters\030\010 \003(\0132?.google.cloud.dataproc.v" +
-      "1beta2.WorkflowMetadata.ParametersEntry\032" +
+      "1beta2.WorkflowMetadata.ParametersEntry\032",
       "1\n\017ParametersEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value" +
       "\030\002 \001(\t:\0028\001\"8\n\005State\022\013\n\007UNKNOWN\020\000\022\013\n\007PEND" +
       "ING\020\001\022\013\n\007RUNNING\020\002\022\010\n\004DONE\020\003\"E\n\020ClusterO" +
@@ -202,7 +202,7 @@ public static void registerAllExtensions(
       "ta2.WorkflowNode\"\220\002\n\014WorkflowNode\022\017\n\007ste" +
       "p_id\030\001 \001(\t\022\035\n\025prerequisite_step_ids\030\002 \003(" +
       "\t\022\016\n\006job_id\030\003 \001(\t\022D\n\005state\030\005 \001(\01625.googl" +
-      "e.cloud.dataproc.v1beta2.WorkflowNode.No" +
+      "e.cloud.dataproc.v1beta2.WorkflowNode.No",
       "deState\022\r\n\005error\030\006 \001(\t\"k\n\tNodeState\022\033\n\027N" +
       "ODE_STATUS_UNSPECIFIED\020\000\022\013\n\007BLOCKED\020\001\022\014\n" +
       "\010RUNNABLE\020\002\022\013\n\007RUNNING\020\003\022\r\n\tCOMPLETED\020\004\022" +
@@ -212,7 +212,7 @@ public static void registerAllExtensions(
       "emplate\";\n\032GetWorkflowTemplateRequest\022\014\n" +
       "\004name\030\001 \001(\t\022\017\n\007version\030\002 \001(\005\"X\n\"Instanti" +
       "ateWorkflowTemplateRequest\022\014\n\004name\030\001 \001(\t" +
-      "\022\017\n\007version\030\002 \001(\005\022\023\n\013instance_id\030\003 \001(\t\"\222" +
+      "\022\017\n\007version\030\002 \001(\005\022\023\n\013instance_id\030\003 \001(\t\"\222",
       "\001\n(InstantiateInlineWorkflowTemplateRequ" +
       "est\022\016\n\006parent\030\001 \001(\t\022A\n\010template\030\002 \001(\0132/." +
       "google.cloud.dataproc.v1beta2.WorkflowTe" +
@@ -222,7 +222,7 @@ public static void registerAllExtensions(
       "emplate\"U\n\034ListWorkflowTemplatesRequest\022" +
       "\016\n\006parent\030\001 \001(\t\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npa" +
       "ge_token\030\003 \001(\t\"|\n\035ListWorkflowTemplatesR" +
-      "esponse\022B\n\ttemplates\030\001 \003(\0132/.google.clou" +
+      "esponse\022B\n\ttemplates\030\001 \003(\0132/.google.clou",
       "d.dataproc.v1beta2.WorkflowTemplate\022\027\n\017n" +
       "ext_page_token\030\002 \001(\t\">\n\035DeleteWorkflowTe" +
       "mplateRequest\022\014\n\004name\030\001 \001(\t\022\017\n\007version\030\002" +
@@ -232,7 +232,7 @@ public static void registerAllExtensions(
       "t\032/.google.cloud.dataproc.v1beta2.Workfl" +
       "owTemplate\"\223\001\202\323\344\223\002\214\001\"8/v1beta2/{parent=p" +
       "rojects/*/regions/*}/workflowTemplates:\010" +
-      "templateZF\":/v1beta2/{parent=projects/*/" +
+      "templateZF\":/v1beta2/{parent=projects/*/",
       "locations/*}/workflowTemplates:\010template" +
       "\022\201\002\n\023GetWorkflowTemplate\0229.google.cloud." +
       "dataproc.v1beta2.GetWorkflowTemplateRequ" +
@@ -242,7 +242,7 @@ public static void registerAllExtensions(
       "\022:/v1beta2/{name=projects/*/locations/*/" +
       "workflowTemplates/*}\022\237\002\n\033InstantiateWork" +
       "flowTemplate\022A.google.cloud.dataproc.v1b" +
-      "eta2.InstantiateWorkflowTemplateRequest\032" +
+      "eta2.InstantiateWorkflowTemplateRequest\032",
       "\035.google.longrunning.Operation\"\235\001\202\323\344\223\002\226\001" +
       "\"D/v1beta2/{name=projects/*/regions/*/wo" +
       "rkflowTemplates/*}:instantiate:\001*ZK\"F/v1" +
@@ -252,7 +252,7 @@ public static void registerAllExtensions(
       "oud.dataproc.v1beta2.InstantiateInlineWo" +
       "rkflowTemplateRequest\032\035.google.longrunni" +
       "ng.Operation\"\267\001\202\323\344\223\002\260\001\"J/v1beta2/{parent" +
-      "=projects/*/regions/*}/workflowTemplates" +
+      "=projects/*/regions/*}/workflowTemplates",
       ":instantiateInline:\010templateZX\"L/v1beta2" +
       "/{parent=projects/*/locations/*}/workflo" +
       "wTemplates:instantiateInline:\010template\022\257" +
@@ -262,7 +262,7 @@ public static void registerAllExtensions(
       "WorkflowTemplate\"\245\001\202\323\344\223\002\236\001\032A/v1beta2/{te" +
       "mplate.name=projects/*/regions/*/workflo" +
       "wTemplates/*}:\010templateZO\032C/v1beta2/{tem" +
-      "plate.name=projects/*/locations/*/workfl" +
+      "plate.name=projects/*/locations/*/workfl",
       "owTemplates/*}:\010template\022\222\002\n\025ListWorkflo" +
       "wTemplates\022;.google.cloud.dataproc.v1bet" +
       "a2.ListWorkflowTemplatesRequest\032<.google" +
@@ -272,7 +272,7 @@ public static void registerAllExtensions(
       "<\022:/v1beta2/{parent=projects/*/locations" +
       "/*}/workflowTemplates\022\356\001\n\026DeleteWorkflow" +
       "Template\022<.google.cloud.dataproc.v1beta2" +
-      ".DeleteWorkflowTemplateRequest\032\026.google." +
+      ".DeleteWorkflowTemplateRequest\032\026.google.",
       "protobuf.Empty\"~\202\323\344\223\002x*8/v1beta2/{name=p" +
       "rojects/*/regions/*/workflowTemplates/*}" +
       "Z<*:/v1beta2/{name=projects/*/locations/" +
diff --git a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/YarnApplication.java b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/YarnApplication.java
index b9f1dd074e95..3acab65c6a70 100644
--- a/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/YarnApplication.java
+++ b/google-api-grpc/proto-google-cloud-dataproc-v1beta2/src/main/java/com/google/cloud/dataproc/v1beta2/YarnApplication.java
@@ -39,9 +39,6 @@ private YarnApplication(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private YarnApplication(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -76,13 +80,6 @@ private YarnApplication(
             trackingUrl_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -100,7 +97,6 @@ private YarnApplication(
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_YarnApplication_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_YarnApplication_fieldAccessorTable
@@ -408,7 +404,6 @@ public int getStateValue() {
    * .google.cloud.dataproc.v1beta2.YarnApplication.State state = 2;
    */
   public com.google.cloud.dataproc.v1beta2.YarnApplication.State getState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dataproc.v1beta2.YarnApplication.State result = com.google.cloud.dataproc.v1beta2.YarnApplication.State.valueOf(state_);
     return result == null ? com.google.cloud.dataproc.v1beta2.YarnApplication.State.UNRECOGNIZED : result;
   }
@@ -475,7 +470,6 @@ public java.lang.String getTrackingUrl() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -485,7 +479,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -503,7 +496,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -643,7 +635,6 @@ public static com.google.cloud.dataproc.v1beta2.YarnApplication parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -651,7 +642,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dataproc.v1beta2.YarnApplication prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -682,7 +672,6 @@ public static final class Builder extends
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_YarnApplication_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_YarnApplication_fieldAccessorTable
@@ -705,7 +694,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -719,18 +707,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dataproc.v1beta2.JobsProto.internal_static_google_cloud_dataproc_v1beta2_YarnApplication_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.YarnApplication getDefaultInstanceForType() {
       return com.google.cloud.dataproc.v1beta2.YarnApplication.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.YarnApplication build() {
       com.google.cloud.dataproc.v1beta2.YarnApplication result = buildPartial();
       if (!result.isInitialized()) {
@@ -739,7 +724,6 @@ public com.google.cloud.dataproc.v1beta2.YarnApplication build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dataproc.v1beta2.YarnApplication buildPartial() {
       com.google.cloud.dataproc.v1beta2.YarnApplication result = new com.google.cloud.dataproc.v1beta2.YarnApplication(this);
       result.name_ = name_;
@@ -750,39 +734,32 @@ public com.google.cloud.dataproc.v1beta2.YarnApplication buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dataproc.v1beta2.YarnApplication) {
         return mergeFrom((com.google.cloud.dataproc.v1beta2.YarnApplication)other);
@@ -813,12 +790,10 @@ public Builder mergeFrom(com.google.cloud.dataproc.v1beta2.YarnApplication other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -957,7 +932,6 @@ public Builder setStateValue(int value) {
      * .google.cloud.dataproc.v1beta2.YarnApplication.State state = 2;
      */
     public com.google.cloud.dataproc.v1beta2.YarnApplication.State getState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dataproc.v1beta2.YarnApplication.State result = com.google.cloud.dataproc.v1beta2.YarnApplication.State.valueOf(state_);
       return result == null ? com.google.cloud.dataproc.v1beta2.YarnApplication.State.UNRECOGNIZED : result;
     }
@@ -1132,13 +1106,11 @@ public Builder setTrackingUrlBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1160,12 +1132,11 @@ public static com.google.cloud.dataproc.v1beta2.YarnApplication getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public YarnApplication parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new YarnApplication(input, extensionRegistry);
+        return new YarnApplication(input, extensionRegistry);
     }
   };
 
@@ -1178,7 +1149,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dataproc.v1beta2.YarnApplication getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java
index 9eb469011ac9..aebc798e7c23 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsRequest.java
@@ -34,9 +34,6 @@ private AllocateIdsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private AllocateIdsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
               keys_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private AllocateIdsRequest(
             projectId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private AllocateIdsRequest(
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_fieldAccessorTable
@@ -202,7 +198,6 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -212,7 +207,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < keys_.size(); i++) {
@@ -224,7 +218,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -349,7 +342,6 @@ public static com.google.datastore.v1.AllocateIdsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -357,7 +349,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.AllocateIdsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -385,7 +376,6 @@ public static final class Builder extends
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_fieldAccessorTable
@@ -409,7 +399,6 @@ private void maybeForceBuilderInitialization() {
         getKeysFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -423,18 +412,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.AllocateIdsRequest getDefaultInstanceForType() {
       return com.google.datastore.v1.AllocateIdsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.AllocateIdsRequest build() {
       com.google.datastore.v1.AllocateIdsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -443,7 +429,6 @@ public com.google.datastore.v1.AllocateIdsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.AllocateIdsRequest buildPartial() {
       com.google.datastore.v1.AllocateIdsRequest result = new com.google.datastore.v1.AllocateIdsRequest(this);
       int from_bitField0_ = bitField0_;
@@ -463,39 +448,32 @@ public com.google.datastore.v1.AllocateIdsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.AllocateIdsRequest) {
         return mergeFrom((com.google.datastore.v1.AllocateIdsRequest)other);
@@ -542,12 +520,10 @@ public Builder mergeFrom(com.google.datastore.v1.AllocateIdsRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -985,13 +961,11 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder(
       }
       return keysBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1013,12 +987,11 @@ public static com.google.datastore.v1.AllocateIdsRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AllocateIdsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AllocateIdsRequest(input, extensionRegistry);
+        return new AllocateIdsRequest(input, extensionRegistry);
     }
   };
 
@@ -1031,7 +1004,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.AllocateIdsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java
index c6e30f9ce017..3844547c3756 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/AllocateIdsResponse.java
@@ -33,9 +33,6 @@ private AllocateIdsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private AllocateIdsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               keys_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private AllocateIdsResponse(
                 input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private AllocateIdsResponse(
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_fieldAccessorTable
@@ -152,7 +148,6 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -162,7 +157,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < keys_.size(); i++) {
@@ -171,7 +165,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -289,7 +282,6 @@ public static com.google.datastore.v1.AllocateIdsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -297,7 +289,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.AllocateIdsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -325,7 +316,6 @@ public static final class Builder extends
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_fieldAccessorTable
@@ -349,7 +339,6 @@ private void maybeForceBuilderInitialization() {
         getKeysFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (keysBuilder_ == null) {
@@ -361,18 +350,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_AllocateIdsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.AllocateIdsResponse getDefaultInstanceForType() {
       return com.google.datastore.v1.AllocateIdsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.AllocateIdsResponse build() {
       com.google.datastore.v1.AllocateIdsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -381,7 +367,6 @@ public com.google.datastore.v1.AllocateIdsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.AllocateIdsResponse buildPartial() {
       com.google.datastore.v1.AllocateIdsResponse result = new com.google.datastore.v1.AllocateIdsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -398,39 +383,32 @@ public com.google.datastore.v1.AllocateIdsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.AllocateIdsResponse) {
         return mergeFrom((com.google.datastore.v1.AllocateIdsResponse)other);
@@ -473,12 +451,10 @@ public Builder mergeFrom(com.google.datastore.v1.AllocateIdsResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -827,13 +803,11 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder(
       }
       return keysBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -855,12 +829,11 @@ public static com.google.datastore.v1.AllocateIdsResponse getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AllocateIdsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AllocateIdsResponse(input, extensionRegistry);
+        return new AllocateIdsResponse(input, extensionRegistry);
     }
   };
 
@@ -873,7 +846,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.AllocateIdsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java
index d2cdbd53a35a..ad0cb62648e6 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ArrayValue.java
@@ -33,9 +33,6 @@ private ArrayValue(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ArrayValue(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               values_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private ArrayValue(
                 input.readMessage(com.google.datastore.v1.Value.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private ArrayValue(
     return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_fieldAccessorTable
@@ -157,7 +153,6 @@ public com.google.datastore.v1.ValueOrBuilder getValuesOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -167,7 +162,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < values_.size(); i++) {
@@ -176,7 +170,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -294,7 +287,6 @@ public static com.google.datastore.v1.ArrayValue parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -302,7 +294,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.ArrayValue prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -330,7 +321,6 @@ public static final class Builder extends
       return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_fieldAccessorTable
@@ -354,7 +344,6 @@ private void maybeForceBuilderInitialization() {
         getValuesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (valuesBuilder_ == null) {
@@ -366,18 +355,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_ArrayValue_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.ArrayValue getDefaultInstanceForType() {
       return com.google.datastore.v1.ArrayValue.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.ArrayValue build() {
       com.google.datastore.v1.ArrayValue result = buildPartial();
       if (!result.isInitialized()) {
@@ -386,7 +372,6 @@ public com.google.datastore.v1.ArrayValue build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.ArrayValue buildPartial() {
       com.google.datastore.v1.ArrayValue result = new com.google.datastore.v1.ArrayValue(this);
       int from_bitField0_ = bitField0_;
@@ -403,39 +388,32 @@ public com.google.datastore.v1.ArrayValue buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.ArrayValue) {
         return mergeFrom((com.google.datastore.v1.ArrayValue)other);
@@ -478,12 +456,10 @@ public Builder mergeFrom(com.google.datastore.v1.ArrayValue other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -850,13 +826,11 @@ public com.google.datastore.v1.Value.Builder addValuesBuilder(
       }
       return valuesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -878,12 +852,11 @@ public static com.google.datastore.v1.ArrayValue getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ArrayValue parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ArrayValue(input, extensionRegistry);
+        return new ArrayValue(input, extensionRegistry);
     }
   };
 
@@ -896,7 +869,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.ArrayValue getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java
index ec9154096522..e977c4250e83 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionRequest.java
@@ -33,9 +33,6 @@ private BeginTransactionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private BeginTransactionRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 66: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private BeginTransactionRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private BeginTransactionRequest(
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_fieldAccessorTable
@@ -174,7 +170,6 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getTransactionOptions
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -184,7 +179,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -196,7 +190,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -324,7 +317,6 @@ public static com.google.datastore.v1.BeginTransactionRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -332,7 +324,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.BeginTransactionRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -360,7 +351,6 @@ public static final class Builder extends
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_fieldAccessorTable
@@ -383,7 +373,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -397,18 +386,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.BeginTransactionRequest getDefaultInstanceForType() {
       return com.google.datastore.v1.BeginTransactionRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.BeginTransactionRequest build() {
       com.google.datastore.v1.BeginTransactionRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -417,7 +403,6 @@ public com.google.datastore.v1.BeginTransactionRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.BeginTransactionRequest buildPartial() {
       com.google.datastore.v1.BeginTransactionRequest result = new com.google.datastore.v1.BeginTransactionRequest(this);
       result.projectId_ = projectId_;
@@ -430,39 +415,32 @@ public com.google.datastore.v1.BeginTransactionRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.BeginTransactionRequest) {
         return mergeFrom((com.google.datastore.v1.BeginTransactionRequest)other);
@@ -486,12 +464,10 @@ public Builder mergeFrom(com.google.datastore.v1.BeginTransactionRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -751,13 +727,11 @@ public com.google.datastore.v1.TransactionOptionsOrBuilder getTransactionOptions
       }
       return transactionOptionsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -779,12 +753,11 @@ public static com.google.datastore.v1.BeginTransactionRequest getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BeginTransactionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BeginTransactionRequest(input, extensionRegistry);
+        return new BeginTransactionRequest(input, extensionRegistry);
     }
   };
 
@@ -797,7 +770,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.BeginTransactionRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java
index 4d4c0b69ee91..a511859f4210 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/BeginTransactionResponse.java
@@ -33,9 +33,6 @@ private BeginTransactionResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,11 +44,6 @@ private BeginTransactionResponse(
           case 0:
             done = true;
             break;
-          case 10: {
-
-            transaction_ = input.readBytes();
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -59,6 +51,11 @@ private BeginTransactionResponse(
             }
             break;
           }
+          case 10: {
+
+            transaction_ = input.readBytes();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -76,7 +73,6 @@ private BeginTransactionResponse(
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_fieldAccessorTable
@@ -98,7 +94,6 @@ public com.google.protobuf.ByteString getTransaction() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -108,7 +103,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!transaction_.isEmpty()) {
@@ -117,7 +111,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -233,7 +226,6 @@ public static com.google.datastore.v1.BeginTransactionResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -241,7 +233,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.BeginTransactionResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -269,7 +260,6 @@ public static final class Builder extends
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_fieldAccessorTable
@@ -292,7 +282,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       transaction_ = com.google.protobuf.ByteString.EMPTY;
@@ -300,18 +289,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_BeginTransactionResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.BeginTransactionResponse getDefaultInstanceForType() {
       return com.google.datastore.v1.BeginTransactionResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.BeginTransactionResponse build() {
       com.google.datastore.v1.BeginTransactionResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -320,7 +306,6 @@ public com.google.datastore.v1.BeginTransactionResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.BeginTransactionResponse buildPartial() {
       com.google.datastore.v1.BeginTransactionResponse result = new com.google.datastore.v1.BeginTransactionResponse(this);
       result.transaction_ = transaction_;
@@ -328,39 +313,32 @@ public com.google.datastore.v1.BeginTransactionResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.BeginTransactionResponse) {
         return mergeFrom((com.google.datastore.v1.BeginTransactionResponse)other);
@@ -380,12 +358,10 @@ public Builder mergeFrom(com.google.datastore.v1.BeginTransactionResponse other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -444,13 +420,11 @@ public Builder clearTransaction() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -472,12 +446,11 @@ public static com.google.datastore.v1.BeginTransactionResponse getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BeginTransactionResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BeginTransactionResponse(input, extensionRegistry);
+        return new BeginTransactionResponse(input, extensionRegistry);
     }
   };
 
@@ -490,7 +463,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.BeginTransactionResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java
index 258082f5b6c9..3040ae1e25ab 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitRequest.java
@@ -35,9 +35,6 @@ private CommitRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private CommitRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             transactionSelectorCase_ = 1;
             transactionSelector_ = input.readBytes();
@@ -75,13 +79,6 @@ private CommitRequest(
             projectId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -102,7 +99,6 @@ private CommitRequest(
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_fieldAccessorTable
@@ -346,7 +342,6 @@ public int getModeValue() {
    * .google.datastore.v1.CommitRequest.Mode mode = 5;
    */
   public com.google.datastore.v1.CommitRequest.Mode getMode() {
-    @SuppressWarnings("deprecation")
     com.google.datastore.v1.CommitRequest.Mode result = com.google.datastore.v1.CommitRequest.Mode.valueOf(mode_);
     return result == null ? com.google.datastore.v1.CommitRequest.Mode.UNRECOGNIZED : result;
   }
@@ -469,7 +464,6 @@ public com.google.datastore.v1.MutationOrBuilder getMutationsOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -479,7 +473,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (transactionSelectorCase_ == 1) {
@@ -498,7 +491,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -654,7 +646,6 @@ public static com.google.datastore.v1.CommitRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -662,7 +653,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.CommitRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -690,7 +680,6 @@ public static final class Builder extends
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_fieldAccessorTable
@@ -714,7 +703,6 @@ private void maybeForceBuilderInitialization() {
         getMutationsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -732,18 +720,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.CommitRequest getDefaultInstanceForType() {
       return com.google.datastore.v1.CommitRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.CommitRequest build() {
       com.google.datastore.v1.CommitRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -752,7 +737,6 @@ public com.google.datastore.v1.CommitRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.CommitRequest buildPartial() {
       com.google.datastore.v1.CommitRequest result = new com.google.datastore.v1.CommitRequest(this);
       int from_bitField0_ = bitField0_;
@@ -777,39 +761,32 @@ public com.google.datastore.v1.CommitRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.CommitRequest) {
         return mergeFrom((com.google.datastore.v1.CommitRequest)other);
@@ -868,12 +845,10 @@ public Builder mergeFrom(com.google.datastore.v1.CommitRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1028,7 +1003,6 @@ public Builder setModeValue(int value) {
      * .google.datastore.v1.CommitRequest.Mode mode = 5;
      */
     public com.google.datastore.v1.CommitRequest.Mode getMode() {
-      @SuppressWarnings("deprecation")
       com.google.datastore.v1.CommitRequest.Mode result = com.google.datastore.v1.CommitRequest.Mode.valueOf(mode_);
       return result == null ? com.google.datastore.v1.CommitRequest.Mode.UNRECOGNIZED : result;
     }
@@ -1586,13 +1560,11 @@ public com.google.datastore.v1.Mutation.Builder addMutationsBuilder(
       }
       return mutationsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1614,12 +1586,11 @@ public static com.google.datastore.v1.CommitRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CommitRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CommitRequest(input, extensionRegistry);
+        return new CommitRequest(input, extensionRegistry);
     }
   };
 
@@ -1632,7 +1603,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.CommitRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java
index 4ddc383d87f7..ff72b2e89499 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CommitResponse.java
@@ -34,9 +34,6 @@ private CommitResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private CommitResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 26: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               mutationResults_ = new java.util.ArrayList();
@@ -62,13 +66,6 @@ private CommitResponse(
             indexUpdates_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -89,7 +86,6 @@ private CommitResponse(
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_fieldAccessorTable
@@ -173,7 +169,6 @@ public int getIndexUpdates() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -183,7 +178,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < mutationResults_.size(); i++) {
@@ -195,7 +189,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -321,7 +314,6 @@ public static com.google.datastore.v1.CommitResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -329,7 +321,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.CommitResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -357,7 +348,6 @@ public static final class Builder extends
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_fieldAccessorTable
@@ -381,7 +371,6 @@ private void maybeForceBuilderInitialization() {
         getMutationResultsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (mutationResultsBuilder_ == null) {
@@ -395,18 +384,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_CommitResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.CommitResponse getDefaultInstanceForType() {
       return com.google.datastore.v1.CommitResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.CommitResponse build() {
       com.google.datastore.v1.CommitResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -415,7 +401,6 @@ public com.google.datastore.v1.CommitResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.CommitResponse buildPartial() {
       com.google.datastore.v1.CommitResponse result = new com.google.datastore.v1.CommitResponse(this);
       int from_bitField0_ = bitField0_;
@@ -435,39 +420,32 @@ public com.google.datastore.v1.CommitResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.CommitResponse) {
         return mergeFrom((com.google.datastore.v1.CommitResponse)other);
@@ -513,12 +491,10 @@ public Builder mergeFrom(com.google.datastore.v1.CommitResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -908,13 +884,11 @@ public Builder clearIndexUpdates() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -936,12 +910,11 @@ public static com.google.datastore.v1.CommitResponse getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CommitResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CommitResponse(input, extensionRegistry);
+        return new CommitResponse(input, extensionRegistry);
     }
   };
 
@@ -954,7 +927,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.CommitResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java
index 6b1bd91e109f..20ab2f6c13fe 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/CompositeFilter.java
@@ -34,9 +34,6 @@ private CompositeFilter(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private CompositeFilter(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -63,13 +67,6 @@ private CompositeFilter(
                 input.readMessage(com.google.datastore.v1.Filter.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private CompositeFilter(
     return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_fieldAccessorTable
@@ -237,7 +233,6 @@ public int getOpValue() {
    * .google.datastore.v1.CompositeFilter.Operator op = 1;
    */
   public com.google.datastore.v1.CompositeFilter.Operator getOp() {
-    @SuppressWarnings("deprecation")
     com.google.datastore.v1.CompositeFilter.Operator result = com.google.datastore.v1.CompositeFilter.Operator.valueOf(op_);
     return result == null ? com.google.datastore.v1.CompositeFilter.Operator.UNRECOGNIZED : result;
   }
@@ -303,7 +298,6 @@ public com.google.datastore.v1.FilterOrBuilder getFiltersOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -313,7 +307,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (op_ != com.google.datastore.v1.CompositeFilter.Operator.OPERATOR_UNSPECIFIED.getNumber()) {
@@ -325,7 +318,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -450,7 +442,6 @@ public static com.google.datastore.v1.CompositeFilter parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -458,7 +449,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.CompositeFilter prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -486,7 +476,6 @@ public static final class Builder extends
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_fieldAccessorTable
@@ -510,7 +499,6 @@ private void maybeForceBuilderInitialization() {
         getFiltersFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       op_ = 0;
@@ -524,18 +512,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_CompositeFilter_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.CompositeFilter getDefaultInstanceForType() {
       return com.google.datastore.v1.CompositeFilter.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.CompositeFilter build() {
       com.google.datastore.v1.CompositeFilter result = buildPartial();
       if (!result.isInitialized()) {
@@ -544,7 +529,6 @@ public com.google.datastore.v1.CompositeFilter build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.CompositeFilter buildPartial() {
       com.google.datastore.v1.CompositeFilter result = new com.google.datastore.v1.CompositeFilter(this);
       int from_bitField0_ = bitField0_;
@@ -564,39 +548,32 @@ public com.google.datastore.v1.CompositeFilter buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.CompositeFilter) {
         return mergeFrom((com.google.datastore.v1.CompositeFilter)other);
@@ -642,12 +619,10 @@ public Builder mergeFrom(com.google.datastore.v1.CompositeFilter other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -698,7 +673,6 @@ public Builder setOpValue(int value) {
      * .google.datastore.v1.CompositeFilter.Operator op = 1;
      */
     public com.google.datastore.v1.CompositeFilter.Operator getOp() {
-      @SuppressWarnings("deprecation")
       com.google.datastore.v1.CompositeFilter.Operator result = com.google.datastore.v1.CompositeFilter.Operator.valueOf(op_);
       return result == null ? com.google.datastore.v1.CompositeFilter.Operator.UNRECOGNIZED : result;
     }
@@ -1061,13 +1035,11 @@ public com.google.datastore.v1.Filter.Builder addFiltersBuilder(
       }
       return filtersBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1089,12 +1061,11 @@ public static com.google.datastore.v1.CompositeFilter getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CompositeFilter parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CompositeFilter(input, extensionRegistry);
+        return new CompositeFilter(input, extensionRegistry);
     }
   };
 
@@ -1107,7 +1078,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.CompositeFilter getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java
index 0ef9ef973d45..c4079ab19db1 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/DatastoreProto.java
@@ -132,7 +132,7 @@ public static void registerAllExtensions(
       "adOptions\022&\n\004keys\030\003 \003(\0132\030.google.datasto" +
       "re.v1.Key\"\242\001\n\016LookupResponse\0220\n\005found\030\001 " +
       "\003(\0132!.google.datastore.v1.EntityResult\0222" +
-      "\n\007missing\030\002 \003(\0132!.google.datastore.v1.En" +
+      "\n\007missing\030\002 \003(\0132!.google.datastore.v1.En",
       "tityResult\022*\n\010deferred\030\003 \003(\0132\030.google.da" +
       "tastore.v1.Key\"\204\002\n\017RunQueryRequest\022\022\n\npr" +
       "oject_id\030\010 \001(\t\0226\n\014partition_id\030\002 \001(\0132 .g" +
@@ -142,7 +142,7 @@ public static void registerAllExtensions(
       ".v1.QueryH\000\0222\n\tgql_query\030\007 \001(\0132\035.google." +
       "datastore.v1.GqlQueryH\000B\014\n\nquery_type\"s\n" +
       "\020RunQueryResponse\0224\n\005batch\030\001 \001(\0132%.googl" +
-      "e.datastore.v1.QueryResultBatch\022)\n\005query" +
+      "e.datastore.v1.QueryResultBatch\022)\n\005query",
       "\030\002 \001(\0132\032.google.datastore.v1.Query\"s\n\027Be" +
       "ginTransactionRequest\022\022\n\nproject_id\030\010 \001(" +
       "\t\022D\n\023transaction_options\030\n \001(\0132\'.google." +
@@ -152,7 +152,7 @@ public static void registerAllExtensions(
       "\023\n\013transaction\030\001 \001(\014\"\022\n\020RollbackResponse" +
       "\"\203\002\n\rCommitRequest\022\022\n\nproject_id\030\010 \001(\t\0225" +
       "\n\004mode\030\005 \001(\0162\'.google.datastore.v1.Commi" +
-      "tRequest.Mode\022\025\n\013transaction\030\001 \001(\014H\000\0220\n\t" +
+      "tRequest.Mode\022\025\n\013transaction\030\001 \001(\014H\000\0220\n\t",
       "mutations\030\006 \003(\0132\035.google.datastore.v1.Mu" +
       "tation\"F\n\004Mode\022\024\n\020MODE_UNSPECIFIED\020\000\022\021\n\r" +
       "TRANSACTIONAL\020\001\022\025\n\021NON_TRANSACTIONAL\020\002B\026" +
@@ -162,7 +162,7 @@ public static void registerAllExtensions(
       "\030\004 \001(\005\"P\n\022AllocateIdsRequest\022\022\n\nproject_" +
       "id\030\010 \001(\t\022&\n\004keys\030\001 \003(\0132\030.google.datastor" +
       "e.v1.Key\"=\n\023AllocateIdsResponse\022&\n\004keys\030" +
-      "\001 \003(\0132\030.google.datastore.v1.Key\"d\n\021Reser" +
+      "\001 \003(\0132\030.google.datastore.v1.Key\"d\n\021Reser",
       "veIdsRequest\022\022\n\nproject_id\030\010 \001(\t\022\023\n\013data" +
       "base_id\030\t \001(\t\022&\n\004keys\030\001 \003(\0132\030.google.dat" +
       "astore.v1.Key\"\024\n\022ReserveIdsResponse\"\207\002\n\010" +
@@ -172,7 +172,7 @@ public static void registerAllExtensions(
       ".google.datastore.v1.EntityH\000\022*\n\006delete\030" +
       "\007 \001(\0132\030.google.datastore.v1.KeyH\000\022\026\n\014bas" +
       "e_version\030\010 \001(\003H\001B\013\n\toperationB\035\n\033confli" +
-      "ct_detection_strategy\"c\n\016MutationResult\022" +
+      "ct_detection_strategy\"c\n\016MutationResult\022",
       "%\n\003key\030\003 \001(\0132\030.google.datastore.v1.Key\022\017" +
       "\n\007version\030\004 \001(\003\022\031\n\021conflict_detected\030\005 \001" +
       "(\010\"\325\001\n\013ReadOptions\022L\n\020read_consistency\030\001" +
@@ -182,7 +182,7 @@ public static void registerAllExtensions(
       "NSPECIFIED\020\000\022\n\n\006STRONG\020\001\022\014\n\010EVENTUAL\020\002B\022" +
       "\n\020consistency_type\"\343\001\n\022TransactionOption" +
       "s\022G\n\nread_write\030\001 \001(\01321.google.datastore" +
-      ".v1.TransactionOptions.ReadWriteH\000\022E\n\tre" +
+      ".v1.TransactionOptions.ReadWriteH\000\022E\n\tre",
       "ad_only\030\002 \001(\01320.google.datastore.v1.Tran" +
       "sactionOptions.ReadOnlyH\000\032)\n\tReadWrite\022\034" +
       "\n\024previous_transaction\030\001 \001(\014\032\n\n\010ReadOnly" +
@@ -192,7 +192,7 @@ public static void registerAllExtensions(
       "rojects/{project_id}:lookup:\001*\022\206\001\n\010RunQu" +
       "ery\022$.google.datastore.v1.RunQueryReques" +
       "t\032%.google.datastore.v1.RunQueryResponse" +
-      "\"-\202\323\344\223\002\'\"\"/v1/projects/{project_id}:runQ" +
+      "\"-\202\323\344\223\002\'\"\"/v1/projects/{project_id}:runQ",
       "uery:\001*\022\246\001\n\020BeginTransaction\022,.google.da" +
       "tastore.v1.BeginTransactionRequest\032-.goo" +
       "gle.datastore.v1.BeginTransactionRespons" +
@@ -202,7 +202,7 @@ public static void registerAllExtensions(
       "e.v1.CommitResponse\"+\202\323\344\223\002%\" /v1/project" +
       "s/{project_id}:commit:\001*\022\206\001\n\010Rollback\022$." +
       "google.datastore.v1.RollbackRequest\032%.go" +
-      "ogle.datastore.v1.RollbackResponse\"-\202\323\344\223" +
+      "ogle.datastore.v1.RollbackResponse\"-\202\323\344\223",
       "\002\'\"\"/v1/projects/{project_id}:rollback:\001" +
       "*\022\222\001\n\013AllocateIds\022\'.google.datastore.v1." +
       "AllocateIdsRequest\032(.google.datastore.v1" +
@@ -212,7 +212,7 @@ public static void registerAllExtensions(
       "quest\032\'.google.datastore.v1.ReserveIdsRe" +
       "sponse\"/\202\323\344\223\002)\"$/v1/projects/{project_id" +
       "}:reserveIds:\001*B\241\001\n\027com.google.datastore" +
-      ".v1B\016DatastoreProtoP\001Z
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Entity parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Entity(input, extensionRegistry);
+        return new Entity(input, extensionRegistry);
     }
   };
 
@@ -1073,7 +1045,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.Entity getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
index 880839ab0087..69c4968146e0 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/EntityProto.java
@@ -67,7 +67,7 @@ public static void registerAllExtensions(
       "6\n\014partition_id\030\001 \001(\0132 .google.datastore" +
       ".v1.PartitionId\0222\n\004path\030\002 \003(\0132$.google.d" +
       "atastore.v1.Key.PathElement\032D\n\013PathEleme" +
-      "nt\022\014\n\004kind\030\001 \001(\t\022\014\n\002id\030\002 \001(\003H\000\022\016\n\004name\030\003" +
+      "nt\022\014\n\004kind\030\001 \001(\t\022\014\n\002id\030\002 \001(\003H\000\022\016\n\004name\030\003",
       " \001(\tH\000B\t\n\007id_type\"8\n\nArrayValue\022*\n\006value" +
       "s\030\001 \003(\0132\032.google.datastore.v1.Value\"\361\003\n\005" +
       "Value\0220\n\nnull_value\030\013 \001(\0162\032.google.proto" +
@@ -77,7 +77,7 @@ public static void registerAllExtensions(
       "gle.protobuf.TimestampH\000\022-\n\tkey_value\030\005 " +
       "\001(\0132\030.google.datastore.v1.KeyH\000\022\026\n\014strin" +
       "g_value\030\021 \001(\tH\000\022\024\n\nblob_value\030\022 \001(\014H\000\022.\n" +
-      "\017geo_point_value\030\010 \001(\0132\023.google.type.Lat" +
+      "\017geo_point_value\030\010 \001(\0132\023.google.type.Lat",
       "LngH\000\0223\n\014entity_value\030\006 \001(\0132\033.google.dat" +
       "astore.v1.EntityH\000\0226\n\013array_value\030\t \001(\0132" +
       "\037.google.datastore.v1.ArrayValueH\000\022\017\n\007me" +
@@ -87,7 +87,7 @@ public static void registerAllExtensions(
       "\003 \003(\0132+.google.datastore.v1.Entity.Prope" +
       "rtiesEntry\032M\n\017PropertiesEntry\022\013\n\003key\030\001 \001" +
       "(\t\022)\n\005value\030\002 \001(\0132\032.google.datastore.v1." +
-      "Value:\0028\001B\236\001\n\027com.google.datastore.v1B\013E" +
+      "Value:\0028\001B\236\001\n\027com.google.datastore.v1B\013E",
       "ntityProtoP\001Z
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public EntityResult parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new EntityResult(input, extensionRegistry);
+        return new EntityResult(input, extensionRegistry);
     }
   };
 
@@ -978,7 +951,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.EntityResult getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java
index f6524f2efc3f..2316e9675b4b 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Filter.java
@@ -32,9 +32,6 @@ private Filter(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private Filter(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.datastore.v1.CompositeFilter.Builder subBuilder = null;
             if (filterTypeCase_ == 1) {
@@ -74,13 +78,6 @@ private Filter(
             filterTypeCase_ = 2;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -98,7 +95,6 @@ private Filter(
     return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_fieldAccessorTable
@@ -221,7 +217,6 @@ public com.google.datastore.v1.PropertyFilterOrBuilder getPropertyFilterOrBuilde
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -231,7 +226,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (filterTypeCase_ == 1) {
@@ -243,7 +237,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -386,7 +379,6 @@ public static com.google.datastore.v1.Filter parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -394,7 +386,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.Filter prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -422,7 +413,6 @@ public static final class Builder extends
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_fieldAccessorTable
@@ -445,7 +435,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       filterTypeCase_ = 0;
@@ -453,18 +442,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Filter_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.Filter getDefaultInstanceForType() {
       return com.google.datastore.v1.Filter.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.Filter build() {
       com.google.datastore.v1.Filter result = buildPartial();
       if (!result.isInitialized()) {
@@ -473,7 +459,6 @@ public com.google.datastore.v1.Filter build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.Filter buildPartial() {
       com.google.datastore.v1.Filter result = new com.google.datastore.v1.Filter(this);
       if (filterTypeCase_ == 1) {
@@ -495,39 +480,32 @@ public com.google.datastore.v1.Filter buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.Filter) {
         return mergeFrom((com.google.datastore.v1.Filter)other);
@@ -557,12 +535,10 @@ public Builder mergeFrom(com.google.datastore.v1.Filter other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -939,13 +915,11 @@ public com.google.datastore.v1.PropertyFilterOrBuilder getPropertyFilterOrBuilde
       onChanged();;
       return propertyFilterBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -967,12 +941,11 @@ public static com.google.datastore.v1.Filter getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Filter parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Filter(input, extensionRegistry);
+        return new Filter(input, extensionRegistry);
     }
   };
 
@@ -985,7 +958,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.Filter getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java
index aa0971431bb0..4d475588075d 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQuery.java
@@ -35,9 +35,6 @@ private GqlQuery(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private GqlQuery(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -82,13 +86,6 @@ private GqlQuery(
                 namedBindings__.getKey(), namedBindings__.getValue());
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -110,7 +107,6 @@ private GqlQuery(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -121,7 +117,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQuery_fieldAccessorTable
@@ -365,7 +360,6 @@ public com.google.datastore.v1.GqlQueryParameterOrBuilder getPositionalBindingsO
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -375,7 +369,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getQueryStringBytes().isEmpty()) {
@@ -396,7 +389,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -546,7 +538,6 @@ public static com.google.datastore.v1.GqlQuery parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -554,7 +545,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.GqlQuery prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -604,7 +594,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQuery_fieldAccessorTable
@@ -628,7 +617,6 @@ private void maybeForceBuilderInitialization() {
         getPositionalBindingsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       queryString_ = "";
@@ -645,18 +633,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQuery_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.GqlQuery getDefaultInstanceForType() {
       return com.google.datastore.v1.GqlQuery.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.GqlQuery build() {
       com.google.datastore.v1.GqlQuery result = buildPartial();
       if (!result.isInitialized()) {
@@ -665,7 +650,6 @@ public com.google.datastore.v1.GqlQuery build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.GqlQuery buildPartial() {
       com.google.datastore.v1.GqlQuery result = new com.google.datastore.v1.GqlQuery(this);
       int from_bitField0_ = bitField0_;
@@ -688,39 +672,32 @@ public com.google.datastore.v1.GqlQuery buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.GqlQuery) {
         return mergeFrom((com.google.datastore.v1.GqlQuery)other);
@@ -772,12 +749,10 @@ public Builder mergeFrom(com.google.datastore.v1.GqlQuery other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1475,13 +1450,11 @@ public com.google.datastore.v1.GqlQueryParameter.Builder addPositionalBindingsBu
       }
       return positionalBindingsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1503,12 +1476,11 @@ public static com.google.datastore.v1.GqlQuery getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GqlQuery parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GqlQuery(input, extensionRegistry);
+        return new GqlQuery(input, extensionRegistry);
     }
   };
 
@@ -1521,7 +1493,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.GqlQuery getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java
index 89d6e7f8728d..a5b13168e4ef 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/GqlQueryParameter.java
@@ -32,9 +32,6 @@ private GqlQueryParameter(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private GqlQueryParameter(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             com.google.datastore.v1.Value.Builder subBuilder = null;
             if (parameterTypeCase_ == 2) {
@@ -65,13 +69,6 @@ private GqlQueryParameter(
             parameterType_ = input.readBytes();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -89,7 +86,6 @@ private GqlQueryParameter(
     return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_fieldAccessorTable
@@ -190,7 +186,6 @@ public com.google.protobuf.ByteString getCursor() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -200,7 +195,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (parameterTypeCase_ == 2) {
@@ -213,7 +207,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -357,7 +350,6 @@ public static com.google.datastore.v1.GqlQueryParameter parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -365,7 +357,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.GqlQueryParameter prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -393,7 +384,6 @@ public static final class Builder extends
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_fieldAccessorTable
@@ -416,7 +406,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parameterTypeCase_ = 0;
@@ -424,18 +413,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_GqlQueryParameter_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.GqlQueryParameter getDefaultInstanceForType() {
       return com.google.datastore.v1.GqlQueryParameter.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.GqlQueryParameter build() {
       com.google.datastore.v1.GqlQueryParameter result = buildPartial();
       if (!result.isInitialized()) {
@@ -444,7 +430,6 @@ public com.google.datastore.v1.GqlQueryParameter build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.GqlQueryParameter buildPartial() {
       com.google.datastore.v1.GqlQueryParameter result = new com.google.datastore.v1.GqlQueryParameter(this);
       if (parameterTypeCase_ == 2) {
@@ -462,39 +447,32 @@ public com.google.datastore.v1.GqlQueryParameter buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.GqlQueryParameter) {
         return mergeFrom((com.google.datastore.v1.GqlQueryParameter)other);
@@ -524,12 +502,10 @@ public Builder mergeFrom(com.google.datastore.v1.GqlQueryParameter other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -782,13 +758,11 @@ public Builder clearCursor() {
       }
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -810,12 +784,11 @@ public static com.google.datastore.v1.GqlQueryParameter getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GqlQueryParameter parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GqlQueryParameter(input, extensionRegistry);
+        return new GqlQueryParameter(input, extensionRegistry);
     }
   };
 
@@ -828,7 +801,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.GqlQueryParameter getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java
index 4aa66ebd8577..23b1a3050f14 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Key.java
@@ -36,9 +36,6 @@ private Key(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private Key(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.datastore.v1.PartitionId.Builder subBuilder = null;
             if (partitionId_ != null) {
@@ -72,13 +76,6 @@ private Key(
                 input.readMessage(com.google.datastore.v1.Key.PathElement.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -99,7 +96,6 @@ private Key(
     return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_fieldAccessorTable
@@ -204,9 +200,6 @@ private PathElement(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -218,6 +211,13 @@ private PathElement(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -235,13 +235,6 @@ private PathElement(
               idType_ = s;
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -259,7 +252,6 @@ private PathElement(
       return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_fieldAccessorTable
@@ -428,7 +420,6 @@ public java.lang.String getName() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -438,7 +429,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getKindBytes().isEmpty()) {
@@ -454,7 +444,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -605,7 +594,6 @@ public static com.google.datastore.v1.Key.PathElement parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -613,7 +601,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.datastore.v1.Key.PathElement prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -643,7 +630,6 @@ public static final class Builder extends
         return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_fieldAccessorTable
@@ -666,7 +652,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         kind_ = "";
@@ -676,18 +661,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_PathElement_descriptor;
       }
 
-      @java.lang.Override
       public com.google.datastore.v1.Key.PathElement getDefaultInstanceForType() {
         return com.google.datastore.v1.Key.PathElement.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.datastore.v1.Key.PathElement build() {
         com.google.datastore.v1.Key.PathElement result = buildPartial();
         if (!result.isInitialized()) {
@@ -696,7 +678,6 @@ public com.google.datastore.v1.Key.PathElement build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.datastore.v1.Key.PathElement buildPartial() {
         com.google.datastore.v1.Key.PathElement result = new com.google.datastore.v1.Key.PathElement(this);
         result.kind_ = kind_;
@@ -711,39 +692,32 @@ public com.google.datastore.v1.Key.PathElement buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.datastore.v1.Key.PathElement) {
           return mergeFrom((com.google.datastore.v1.Key.PathElement)other);
@@ -779,12 +753,10 @@ public Builder mergeFrom(com.google.datastore.v1.Key.PathElement other) {
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1084,13 +1056,11 @@ public Builder setNameBytes(
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1112,12 +1082,11 @@ public static com.google.datastore.v1.Key.PathElement getDefaultInstance() {
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public PathElement parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new PathElement(input, extensionRegistry);
+          return new PathElement(input, extensionRegistry);
       }
     };
 
@@ -1130,7 +1099,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.Key.PathElement getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1298,7 +1266,6 @@ public com.google.datastore.v1.Key.PathElementOrBuilder getPathOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1308,7 +1275,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (partitionId_ != null) {
@@ -1320,7 +1286,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1451,7 +1416,6 @@ public static com.google.datastore.v1.Key parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1459,7 +1423,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.Key prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1490,7 +1453,6 @@ public static final class Builder extends
       return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_fieldAccessorTable
@@ -1514,7 +1476,6 @@ private void maybeForceBuilderInitialization() {
         getPathFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (partitionIdBuilder_ == null) {
@@ -1532,18 +1493,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Key_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.Key getDefaultInstanceForType() {
       return com.google.datastore.v1.Key.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.Key build() {
       com.google.datastore.v1.Key result = buildPartial();
       if (!result.isInitialized()) {
@@ -1552,7 +1510,6 @@ public com.google.datastore.v1.Key build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.Key buildPartial() {
       com.google.datastore.v1.Key result = new com.google.datastore.v1.Key(this);
       int from_bitField0_ = bitField0_;
@@ -1576,39 +1533,32 @@ public com.google.datastore.v1.Key buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.Key) {
         return mergeFrom((com.google.datastore.v1.Key)other);
@@ -1654,12 +1604,10 @@ public Builder mergeFrom(com.google.datastore.v1.Key other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2395,13 +2343,11 @@ public com.google.datastore.v1.Key.PathElement.Builder addPathBuilder(
       }
       return pathBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2423,12 +2369,11 @@ public static com.google.datastore.v1.Key getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Key parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Key(input, extensionRegistry);
+        return new Key(input, extensionRegistry);
     }
   };
 
@@ -2441,7 +2386,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.Key getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java
index 1b209dd97bce..aa24aa42c9fb 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/KindExpression.java
@@ -33,9 +33,6 @@ private KindExpression(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private KindExpression(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private KindExpression(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private KindExpression(
     return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_fieldAccessorTable
@@ -128,7 +124,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -138,7 +133,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -147,7 +141,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -262,7 +255,6 @@ public static com.google.datastore.v1.KindExpression parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -270,7 +262,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.KindExpression prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -298,7 +289,6 @@ public static final class Builder extends
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_fieldAccessorTable
@@ -321,7 +311,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -329,18 +318,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_KindExpression_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.KindExpression getDefaultInstanceForType() {
       return com.google.datastore.v1.KindExpression.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.KindExpression build() {
       com.google.datastore.v1.KindExpression result = buildPartial();
       if (!result.isInitialized()) {
@@ -349,7 +335,6 @@ public com.google.datastore.v1.KindExpression build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.KindExpression buildPartial() {
       com.google.datastore.v1.KindExpression result = new com.google.datastore.v1.KindExpression(this);
       result.name_ = name_;
@@ -357,39 +342,32 @@ public com.google.datastore.v1.KindExpression buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.KindExpression) {
         return mergeFrom((com.google.datastore.v1.KindExpression)other);
@@ -410,12 +388,10 @@ public Builder mergeFrom(com.google.datastore.v1.KindExpression other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -522,13 +498,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -550,12 +524,11 @@ public static com.google.datastore.v1.KindExpression getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public KindExpression parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new KindExpression(input, extensionRegistry);
+        return new KindExpression(input, extensionRegistry);
     }
   };
 
@@ -568,7 +541,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.KindExpression getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java
index 28bbc80dfa15..47cfa042237c 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupRequest.java
@@ -34,9 +34,6 @@ private LookupRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private LookupRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.datastore.v1.ReadOptions.Builder subBuilder = null;
             if (readOptions_ != null) {
@@ -76,13 +80,6 @@ private LookupRequest(
             projectId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private LookupRequest(
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_fieldAccessorTable
@@ -243,7 +239,6 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -253,7 +248,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (readOptions_ != null) {
@@ -268,7 +262,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -406,7 +399,6 @@ public static com.google.datastore.v1.LookupRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -414,7 +406,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.LookupRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -442,7 +433,6 @@ public static final class Builder extends
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_fieldAccessorTable
@@ -466,7 +456,6 @@ private void maybeForceBuilderInitialization() {
         getKeysFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -486,18 +475,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.LookupRequest getDefaultInstanceForType() {
       return com.google.datastore.v1.LookupRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.LookupRequest build() {
       com.google.datastore.v1.LookupRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -506,7 +492,6 @@ public com.google.datastore.v1.LookupRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.LookupRequest buildPartial() {
       com.google.datastore.v1.LookupRequest result = new com.google.datastore.v1.LookupRequest(this);
       int from_bitField0_ = bitField0_;
@@ -531,39 +516,32 @@ public com.google.datastore.v1.LookupRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.LookupRequest) {
         return mergeFrom((com.google.datastore.v1.LookupRequest)other);
@@ -613,12 +591,10 @@ public Builder mergeFrom(com.google.datastore.v1.LookupRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1191,13 +1167,11 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder(
       }
       return keysBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1219,12 +1193,11 @@ public static com.google.datastore.v1.LookupRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LookupRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LookupRequest(input, extensionRegistry);
+        return new LookupRequest(input, extensionRegistry);
     }
   };
 
@@ -1237,7 +1210,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.LookupRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java
index 9e60ec806650..404d34c0fe31 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/LookupResponse.java
@@ -35,9 +35,6 @@ private LookupResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private LookupResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               found_ = new java.util.ArrayList();
@@ -76,13 +80,6 @@ private LookupResponse(
                 input.readMessage(com.google.datastore.v1.Key.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -109,7 +106,6 @@ private LookupResponse(
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_fieldAccessorTable
@@ -313,7 +309,6 @@ public com.google.datastore.v1.KeyOrBuilder getDeferredOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -323,7 +318,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < found_.size(); i++) {
@@ -338,7 +332,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -476,7 +469,6 @@ public static com.google.datastore.v1.LookupResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -484,7 +476,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.LookupResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -512,7 +503,6 @@ public static final class Builder extends
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_fieldAccessorTable
@@ -538,7 +528,6 @@ private void maybeForceBuilderInitialization() {
         getDeferredFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (foundBuilder_ == null) {
@@ -562,18 +551,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_LookupResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.LookupResponse getDefaultInstanceForType() {
       return com.google.datastore.v1.LookupResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.LookupResponse build() {
       com.google.datastore.v1.LookupResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -582,7 +568,6 @@ public com.google.datastore.v1.LookupResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.LookupResponse buildPartial() {
       com.google.datastore.v1.LookupResponse result = new com.google.datastore.v1.LookupResponse(this);
       int from_bitField0_ = bitField0_;
@@ -617,39 +602,32 @@ public com.google.datastore.v1.LookupResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.LookupResponse) {
         return mergeFrom((com.google.datastore.v1.LookupResponse)other);
@@ -744,12 +722,10 @@ public Builder mergeFrom(com.google.datastore.v1.LookupResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1812,13 +1788,11 @@ public com.google.datastore.v1.Key.Builder addDeferredBuilder(
       }
       return deferredBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1840,12 +1814,11 @@ public static com.google.datastore.v1.LookupResponse getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LookupResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LookupResponse(input, extensionRegistry);
+        return new LookupResponse(input, extensionRegistry);
     }
   };
 
@@ -1858,7 +1831,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.LookupResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java
index 964394faf80c..2d2c086ffd4a 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Mutation.java
@@ -32,9 +32,6 @@ private Mutation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private Mutation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 34: {
             com.google.datastore.v1.Entity.Builder subBuilder = null;
             if (operationCase_ == 4) {
@@ -107,13 +111,6 @@ private Mutation(
             conflictDetectionStrategy_ = input.readInt64();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -131,7 +128,6 @@ private Mutation(
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_fieldAccessorTable
@@ -398,7 +394,6 @@ public long getBaseVersion() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -408,7 +403,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (operationCase_ == 4) {
@@ -430,7 +424,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -622,7 +615,6 @@ public static com.google.datastore.v1.Mutation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -630,7 +622,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.Mutation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -658,7 +649,6 @@ public static final class Builder extends
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_fieldAccessorTable
@@ -681,7 +671,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       operationCase_ = 0;
@@ -691,18 +680,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_Mutation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.Mutation getDefaultInstanceForType() {
       return com.google.datastore.v1.Mutation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.Mutation build() {
       com.google.datastore.v1.Mutation result = buildPartial();
       if (!result.isInitialized()) {
@@ -711,7 +697,6 @@ public com.google.datastore.v1.Mutation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.Mutation buildPartial() {
       com.google.datastore.v1.Mutation result = new com.google.datastore.v1.Mutation(this);
       if (operationCase_ == 4) {
@@ -751,39 +736,32 @@ public com.google.datastore.v1.Mutation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.Mutation) {
         return mergeFrom((com.google.datastore.v1.Mutation)other);
@@ -830,12 +808,10 @@ public Builder mergeFrom(com.google.datastore.v1.Mutation other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1652,13 +1628,11 @@ public Builder clearBaseVersion() {
       }
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1680,12 +1654,11 @@ public static com.google.datastore.v1.Mutation getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Mutation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Mutation(input, extensionRegistry);
+        return new Mutation(input, extensionRegistry);
     }
   };
 
@@ -1698,7 +1671,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.Mutation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java
index 3a2fcf2cf9ab..dceeb36d61de 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/MutationResult.java
@@ -34,9 +34,6 @@ private MutationResult(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private MutationResult(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 26: {
             com.google.datastore.v1.Key.Builder subBuilder = null;
             if (key_ != null) {
@@ -71,13 +75,6 @@ private MutationResult(
             conflictDetected_ = input.readBool();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -95,7 +92,6 @@ private MutationResult(
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_fieldAccessorTable
@@ -171,7 +167,6 @@ public boolean getConflictDetected() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -181,7 +176,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (key_ != null) {
@@ -196,7 +190,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -335,7 +328,6 @@ public static com.google.datastore.v1.MutationResult parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -343,7 +335,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.MutationResult prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -371,7 +362,6 @@ public static final class Builder extends
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_fieldAccessorTable
@@ -394,7 +384,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (keyBuilder_ == null) {
@@ -410,18 +399,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_MutationResult_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.MutationResult getDefaultInstanceForType() {
       return com.google.datastore.v1.MutationResult.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.MutationResult build() {
       com.google.datastore.v1.MutationResult result = buildPartial();
       if (!result.isInitialized()) {
@@ -430,7 +416,6 @@ public com.google.datastore.v1.MutationResult build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.MutationResult buildPartial() {
       com.google.datastore.v1.MutationResult result = new com.google.datastore.v1.MutationResult(this);
       if (keyBuilder_ == null) {
@@ -444,39 +429,32 @@ public com.google.datastore.v1.MutationResult buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.MutationResult) {
         return mergeFrom((com.google.datastore.v1.MutationResult)other);
@@ -502,12 +480,10 @@ public Builder mergeFrom(com.google.datastore.v1.MutationResult other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -778,13 +754,11 @@ public Builder clearConflictDetected() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -806,12 +780,11 @@ public static com.google.datastore.v1.MutationResult getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public MutationResult parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new MutationResult(input, extensionRegistry);
+        return new MutationResult(input, extensionRegistry);
     }
   };
 
@@ -824,7 +797,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.MutationResult getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java
index d2865ea2798a..e9846c8dacb3 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PartitionId.java
@@ -48,9 +48,6 @@ private PartitionId(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -62,6 +59,13 @@ private PartitionId(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -74,13 +78,6 @@ private PartitionId(
             namespaceId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -98,7 +95,6 @@ private PartitionId(
     return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_fieldAccessorTable
@@ -191,7 +187,6 @@ public java.lang.String getNamespaceId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -201,7 +196,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -213,7 +207,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -335,7 +328,6 @@ public static com.google.datastore.v1.PartitionId parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -343,7 +335,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.PartitionId prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -385,7 +376,6 @@ public static final class Builder extends
       return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_fieldAccessorTable
@@ -408,7 +398,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -418,18 +407,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_PartitionId_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.PartitionId getDefaultInstanceForType() {
       return com.google.datastore.v1.PartitionId.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.PartitionId build() {
       com.google.datastore.v1.PartitionId result = buildPartial();
       if (!result.isInitialized()) {
@@ -438,7 +424,6 @@ public com.google.datastore.v1.PartitionId build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.PartitionId buildPartial() {
       com.google.datastore.v1.PartitionId result = new com.google.datastore.v1.PartitionId(this);
       result.projectId_ = projectId_;
@@ -447,39 +432,32 @@ public com.google.datastore.v1.PartitionId buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.PartitionId) {
         return mergeFrom((com.google.datastore.v1.PartitionId)other);
@@ -504,12 +482,10 @@ public Builder mergeFrom(com.google.datastore.v1.PartitionId other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -705,13 +681,11 @@ public Builder setNamespaceIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -733,12 +707,11 @@ public static com.google.datastore.v1.PartitionId getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PartitionId parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PartitionId(input, extensionRegistry);
+        return new PartitionId(input, extensionRegistry);
     }
   };
 
@@ -751,7 +724,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.PartitionId getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java
index e606620c8650..b6c3bc4324d7 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Projection.java
@@ -32,9 +32,6 @@ private Projection(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private Projection(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.datastore.v1.PropertyReference.Builder subBuilder = null;
             if (property_ != null) {
@@ -59,13 +63,6 @@ private Projection(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private Projection(
     return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_fieldAccessorTable
@@ -125,7 +121,6 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -135,7 +130,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (property_ != null) {
@@ -144,7 +138,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static com.google.datastore.v1.Projection parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.Projection prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (propertyBuilder_ == null) {
@@ -336,18 +325,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Projection_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.Projection getDefaultInstanceForType() {
       return com.google.datastore.v1.Projection.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.Projection build() {
       com.google.datastore.v1.Projection result = buildPartial();
       if (!result.isInitialized()) {
@@ -356,7 +342,6 @@ public com.google.datastore.v1.Projection build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.Projection buildPartial() {
       com.google.datastore.v1.Projection result = new com.google.datastore.v1.Projection(this);
       if (propertyBuilder_ == null) {
@@ -368,39 +353,32 @@ public com.google.datastore.v1.Projection buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.Projection) {
         return mergeFrom((com.google.datastore.v1.Projection)other);
@@ -420,12 +398,10 @@ public Builder mergeFrom(com.google.datastore.v1.Projection other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -596,13 +572,11 @@ public com.google.datastore.v1.PropertyReferenceOrBuilder getPropertyOrBuilder()
       }
       return propertyBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -624,12 +598,11 @@ public static com.google.datastore.v1.Projection getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Projection parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Projection(input, extensionRegistry);
+        return new Projection(input, extensionRegistry);
     }
   };
 
@@ -642,7 +615,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.Projection getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java
index 9651ee87e9d1..0e541e9272a3 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyFilter.java
@@ -33,9 +33,6 @@ private PropertyFilter(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private PropertyFilter(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.datastore.v1.PropertyReference.Builder subBuilder = null;
             if (property_ != null) {
@@ -79,13 +83,6 @@ private PropertyFilter(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private PropertyFilter(
     return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_fieldAccessorTable
@@ -367,7 +363,6 @@ public int getOpValue() {
    * .google.datastore.v1.PropertyFilter.Operator op = 2;
    */
   public com.google.datastore.v1.PropertyFilter.Operator getOp() {
-    @SuppressWarnings("deprecation")
     com.google.datastore.v1.PropertyFilter.Operator result = com.google.datastore.v1.PropertyFilter.Operator.valueOf(op_);
     return result == null ? com.google.datastore.v1.PropertyFilter.Operator.UNRECOGNIZED : result;
   }
@@ -406,7 +401,6 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -416,7 +410,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (property_ != null) {
@@ -431,7 +424,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -572,7 +564,6 @@ public static com.google.datastore.v1.PropertyFilter parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -580,7 +571,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.PropertyFilter prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -608,7 +598,6 @@ public static final class Builder extends
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_fieldAccessorTable
@@ -631,7 +620,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (propertyBuilder_ == null) {
@@ -651,18 +639,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyFilter_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.PropertyFilter getDefaultInstanceForType() {
       return com.google.datastore.v1.PropertyFilter.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.PropertyFilter build() {
       com.google.datastore.v1.PropertyFilter result = buildPartial();
       if (!result.isInitialized()) {
@@ -671,7 +656,6 @@ public com.google.datastore.v1.PropertyFilter build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.PropertyFilter buildPartial() {
       com.google.datastore.v1.PropertyFilter result = new com.google.datastore.v1.PropertyFilter(this);
       if (propertyBuilder_ == null) {
@@ -689,39 +673,32 @@ public com.google.datastore.v1.PropertyFilter buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.PropertyFilter) {
         return mergeFrom((com.google.datastore.v1.PropertyFilter)other);
@@ -747,12 +724,10 @@ public Builder mergeFrom(com.google.datastore.v1.PropertyFilter other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -955,7 +930,6 @@ public Builder setOpValue(int value) {
      * .google.datastore.v1.PropertyFilter.Operator op = 2;
      */
     public com.google.datastore.v1.PropertyFilter.Operator getOp() {
-      @SuppressWarnings("deprecation")
       com.google.datastore.v1.PropertyFilter.Operator result = com.google.datastore.v1.PropertyFilter.Operator.valueOf(op_);
       return result == null ? com.google.datastore.v1.PropertyFilter.Operator.UNRECOGNIZED : result;
     }
@@ -1141,13 +1115,11 @@ public com.google.datastore.v1.ValueOrBuilder getValueOrBuilder() {
       }
       return valueBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1169,12 +1141,11 @@ public static com.google.datastore.v1.PropertyFilter getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PropertyFilter parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PropertyFilter(input, extensionRegistry);
+        return new PropertyFilter(input, extensionRegistry);
     }
   };
 
@@ -1187,7 +1158,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.PropertyFilter getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java
index f13b15baedbe..8f54ee070f50 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyOrder.java
@@ -33,9 +33,6 @@ private PropertyOrder(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private PropertyOrder(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.datastore.v1.PropertyReference.Builder subBuilder = null;
             if (property_ != null) {
@@ -66,13 +70,6 @@ private PropertyOrder(
             direction_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private PropertyOrder(
     return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_fieldAccessorTable
@@ -286,13 +282,11 @@ public int getDirectionValue() {
    * .google.datastore.v1.PropertyOrder.Direction direction = 2;
    */
   public com.google.datastore.v1.PropertyOrder.Direction getDirection() {
-    @SuppressWarnings("deprecation")
     com.google.datastore.v1.PropertyOrder.Direction result = com.google.datastore.v1.PropertyOrder.Direction.valueOf(direction_);
     return result == null ? com.google.datastore.v1.PropertyOrder.Direction.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -302,7 +296,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (property_ != null) {
@@ -314,7 +307,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -442,7 +434,6 @@ public static com.google.datastore.v1.PropertyOrder parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -450,7 +441,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.PropertyOrder prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -478,7 +468,6 @@ public static final class Builder extends
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_fieldAccessorTable
@@ -501,7 +490,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (propertyBuilder_ == null) {
@@ -515,18 +503,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyOrder_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.PropertyOrder getDefaultInstanceForType() {
       return com.google.datastore.v1.PropertyOrder.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.PropertyOrder build() {
       com.google.datastore.v1.PropertyOrder result = buildPartial();
       if (!result.isInitialized()) {
@@ -535,7 +520,6 @@ public com.google.datastore.v1.PropertyOrder build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.PropertyOrder buildPartial() {
       com.google.datastore.v1.PropertyOrder result = new com.google.datastore.v1.PropertyOrder(this);
       if (propertyBuilder_ == null) {
@@ -548,39 +532,32 @@ public com.google.datastore.v1.PropertyOrder buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.PropertyOrder) {
         return mergeFrom((com.google.datastore.v1.PropertyOrder)other);
@@ -603,12 +580,10 @@ public Builder mergeFrom(com.google.datastore.v1.PropertyOrder other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -811,7 +786,6 @@ public Builder setDirectionValue(int value) {
      * .google.datastore.v1.PropertyOrder.Direction direction = 2;
      */
     public com.google.datastore.v1.PropertyOrder.Direction getDirection() {
-      @SuppressWarnings("deprecation")
       com.google.datastore.v1.PropertyOrder.Direction result = com.google.datastore.v1.PropertyOrder.Direction.valueOf(direction_);
       return result == null ? com.google.datastore.v1.PropertyOrder.Direction.UNRECOGNIZED : result;
     }
@@ -844,13 +818,11 @@ public Builder clearDirection() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -872,12 +844,11 @@ public static com.google.datastore.v1.PropertyOrder getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PropertyOrder parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PropertyOrder(input, extensionRegistry);
+        return new PropertyOrder(input, extensionRegistry);
     }
   };
 
@@ -890,7 +861,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.PropertyOrder getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java
index ae6196b33b1e..42c029296258 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/PropertyReference.java
@@ -33,9 +33,6 @@ private PropertyReference(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private PropertyReference(
           case 0:
             done = true;
             break;
-          case 18: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private PropertyReference(
             }
             break;
           }
+          case 18: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private PropertyReference(
     return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.datastore.v1.PropertyReference parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.PropertyReference prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_PropertyReference_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.PropertyReference getDefaultInstanceForType() {
       return com.google.datastore.v1.PropertyReference.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.PropertyReference build() {
       com.google.datastore.v1.PropertyReference result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.datastore.v1.PropertyReference build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.PropertyReference buildPartial() {
       com.google.datastore.v1.PropertyReference result = new com.google.datastore.v1.PropertyReference(this);
       result.name_ = name_;
@@ -359,39 +344,32 @@ public com.google.datastore.v1.PropertyReference buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.PropertyReference) {
         return mergeFrom((com.google.datastore.v1.PropertyReference)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.datastore.v1.PropertyReference other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.datastore.v1.PropertyReference getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PropertyReference parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PropertyReference(input, extensionRegistry);
+        return new PropertyReference(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.PropertyReference getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java
index 3e5e2298562a..e111dce94ef0 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Query.java
@@ -39,9 +39,6 @@ private Query(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private Query(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               projection_ = new java.util.ArrayList();
@@ -130,13 +134,6 @@ private Query(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -166,7 +163,6 @@ private Query(
     return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_fieldAccessorTable
@@ -530,7 +526,6 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -540,7 +535,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < projection_.size(); i++) {
@@ -573,7 +567,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -771,7 +764,6 @@ public static com.google.datastore.v1.Query parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -779,7 +771,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.Query prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -807,7 +798,6 @@ public static final class Builder extends
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_fieldAccessorTable
@@ -834,7 +824,6 @@ private void maybeForceBuilderInitialization() {
         getDistinctOnFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (projectionBuilder_ == null) {
@@ -882,18 +871,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_Query_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.Query getDefaultInstanceForType() {
       return com.google.datastore.v1.Query.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.Query build() {
       com.google.datastore.v1.Query result = buildPartial();
       if (!result.isInitialized()) {
@@ -902,7 +888,6 @@ public com.google.datastore.v1.Query build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.Query buildPartial() {
       com.google.datastore.v1.Query result = new com.google.datastore.v1.Query(this);
       int from_bitField0_ = bitField0_;
@@ -961,39 +946,32 @@ public com.google.datastore.v1.Query buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.Query) {
         return mergeFrom((com.google.datastore.v1.Query)other);
@@ -1129,12 +1107,10 @@ public Builder mergeFrom(com.google.datastore.v1.Query other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2923,13 +2899,11 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() {
       }
       return limitBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2951,12 +2925,11 @@ public static com.google.datastore.v1.Query getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Query parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Query(input, extensionRegistry);
+        return new Query(input, extensionRegistry);
     }
   };
 
@@ -2969,7 +2942,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.Query getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java
index 6a2c87081b1d..e44c96e8e637 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryProto.java
@@ -97,7 +97,7 @@ public static void registerAllExtensions(
       "\n\007version\030\004 \001(\003\022\016\n\006cursor\030\003 \001(\014\"Q\n\nResul" +
       "tType\022\033\n\027RESULT_TYPE_UNSPECIFIED\020\000\022\010\n\004FU" +
       "LL\020\001\022\016\n\nPROJECTION\020\002\022\014\n\010KEY_ONLY\020\003\"\362\002\n\005Q" +
-      "uery\0223\n\nprojection\030\002 \003(\0132\037.google.datast" +
+      "uery\0223\n\nprojection\030\002 \003(\0132\037.google.datast",
       "ore.v1.Projection\0221\n\004kind\030\003 \003(\0132#.google" +
       ".datastore.v1.KindExpression\022+\n\006filter\030\004" +
       " \001(\0132\033.google.datastore.v1.Filter\0221\n\005ord" +
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "r\030\007 \001(\014\022\022\n\nend_cursor\030\010 \001(\014\022\016\n\006offset\030\n " +
       "\001(\005\022*\n\005limit\030\014 \001(\0132\033.google.protobuf.Int" +
       "32Value\"\036\n\016KindExpression\022\014\n\004name\030\001 \001(\t\"" +
-      "!\n\021PropertyReference\022\014\n\004name\030\002 \001(\t\"F\n\nPr" +
+      "!\n\021PropertyReference\022\014\n\004name\030\002 \001(\t\"F\n\nPr",
       "ojection\0228\n\010property\030\001 \001(\0132&.google.data" +
       "store.v1.PropertyReference\"\321\001\n\rPropertyO" +
       "rder\0228\n\010property\030\001 \001(\0132&.google.datastor" +
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       "IFIED\020\000\022\r\n\tASCENDING\020\001\022\016\n\nDESCENDING\020\002\"\231" +
       "\001\n\006Filter\022@\n\020composite_filter\030\001 \001(\0132$.go" +
       "ogle.datastore.v1.CompositeFilterH\000\022>\n\017p" +
-      "roperty_filter\030\002 \001(\0132#.google.datastore." +
+      "roperty_filter\030\002 \001(\0132#.google.datastore.",
       "v1.PropertyFilterH\000B\r\n\013filter_type\"\251\001\n\017C" +
       "ompositeFilter\0229\n\002op\030\001 \001(\0162-.google.data" +
       "store.v1.CompositeFilter.Operator\022,\n\007fil" +
@@ -127,7 +127,7 @@ public static void registerAllExtensions(
       "\001(\0132&.google.datastore.v1.PropertyRefere" +
       "nce\0228\n\002op\030\002 \001(\0162,.google.datastore.v1.Pr" +
       "opertyFilter.Operator\022)\n\005value\030\003 \001(\0132\032.g" +
-      "oogle.datastore.v1.Value\"\225\001\n\010Operator\022\030\n" +
+      "oogle.datastore.v1.Value\"\225\001\n\010Operator\022\030\n",
       "\024OPERATOR_UNSPECIFIED\020\000\022\r\n\tLESS_THAN\020\001\022\026" +
       "\n\022LESS_THAN_OR_EQUAL\020\002\022\020\n\014GREATER_THAN\020\003" +
       "\022\031\n\025GREATER_THAN_OR_EQUAL\020\004\022\t\n\005EQUAL\020\005\022\020" +
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       "1.GqlQuery.NamedBindingsEntry\022C\n\023positio" +
       "nal_bindings\030\004 \003(\0132&.google.datastore.v1" +
       ".GqlQueryParameter\032\\\n\022NamedBindingsEntry" +
-      "\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001(\0132&.google.da" +
+      "\022\013\n\003key\030\001 \001(\t\0225\n\005value\030\002 \001(\0132&.google.da",
       "tastore.v1.GqlQueryParameter:\0028\001\"d\n\021GqlQ" +
       "ueryParameter\022+\n\005value\030\002 \001(\0132\032.google.da" +
       "tastore.v1.ValueH\000\022\020\n\006cursor\030\003 \001(\014H\000B\020\n\016" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "e.datastore.v1.EntityResult.ResultType\0229" +
       "\n\016entity_results\030\002 \003(\0132!.google.datastor" +
       "e.v1.EntityResult\022\022\n\nend_cursor\030\004 \001(\014\022K\n" +
-      "\014more_results\030\005 \001(\01625.google.datastore.v" +
+      "\014more_results\030\005 \001(\01625.google.datastore.v",
       "1.QueryResultBatch.MoreResultsType\022\030\n\020sn" +
       "apshot_version\030\007 \001(\003\"\230\001\n\017MoreResultsType" +
       "\022!\n\035MORE_RESULTS_TYPE_UNSPECIFIED\020\000\022\020\n\014N" +
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
index ce62b3d62495..b1b10aa07ef9 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/QueryResultBatch.java
@@ -39,9 +39,6 @@ private QueryResultBatch(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private QueryResultBatch(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -94,13 +98,6 @@ private QueryResultBatch(
             snapshotVersion_ = input.readInt64();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -121,7 +118,6 @@ private QueryResultBatch(
     return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_fieldAccessorTable
@@ -348,7 +344,6 @@ public int getEntityResultTypeValue() {
    * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1;
    */
   public com.google.datastore.v1.EntityResult.ResultType getEntityResultType() {
-    @SuppressWarnings("deprecation")
     com.google.datastore.v1.EntityResult.ResultType result = com.google.datastore.v1.EntityResult.ResultType.valueOf(entityResultType_);
     return result == null ? com.google.datastore.v1.EntityResult.ResultType.UNRECOGNIZED : result;
   }
@@ -441,7 +436,6 @@ public int getMoreResultsValue() {
    * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5;
    */
   public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults() {
-    @SuppressWarnings("deprecation")
     com.google.datastore.v1.QueryResultBatch.MoreResultsType result = com.google.datastore.v1.QueryResultBatch.MoreResultsType.valueOf(moreResults_);
     return result == null ? com.google.datastore.v1.QueryResultBatch.MoreResultsType.UNRECOGNIZED : result;
   }
@@ -467,7 +461,6 @@ public long getSnapshotVersion() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -477,7 +470,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (entityResultType_ != com.google.datastore.v1.EntityResult.ResultType.RESULT_TYPE_UNSPECIFIED.getNumber()) {
@@ -504,7 +496,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -669,7 +660,6 @@ public static com.google.datastore.v1.QueryResultBatch parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -677,7 +667,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.QueryResultBatch prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -705,7 +694,6 @@ public static final class Builder extends
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_fieldAccessorTable
@@ -729,7 +717,6 @@ private void maybeForceBuilderInitialization() {
         getEntityResultsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       skippedResults_ = 0;
@@ -753,18 +740,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.QueryProto.internal_static_google_datastore_v1_QueryResultBatch_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.QueryResultBatch getDefaultInstanceForType() {
       return com.google.datastore.v1.QueryResultBatch.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.QueryResultBatch build() {
       com.google.datastore.v1.QueryResultBatch result = buildPartial();
       if (!result.isInitialized()) {
@@ -773,7 +757,6 @@ public com.google.datastore.v1.QueryResultBatch build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.QueryResultBatch buildPartial() {
       com.google.datastore.v1.QueryResultBatch result = new com.google.datastore.v1.QueryResultBatch(this);
       int from_bitField0_ = bitField0_;
@@ -798,39 +781,32 @@ public com.google.datastore.v1.QueryResultBatch buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.QueryResultBatch) {
         return mergeFrom((com.google.datastore.v1.QueryResultBatch)other);
@@ -891,12 +867,10 @@ public Builder mergeFrom(com.google.datastore.v1.QueryResultBatch other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1029,7 +1003,6 @@ public Builder setEntityResultTypeValue(int value) {
      * .google.datastore.v1.EntityResult.ResultType entity_result_type = 1;
      */
     public com.google.datastore.v1.EntityResult.ResultType getEntityResultType() {
-      @SuppressWarnings("deprecation")
       com.google.datastore.v1.EntityResult.ResultType result = com.google.datastore.v1.EntityResult.ResultType.valueOf(entityResultType_);
       return result == null ? com.google.datastore.v1.EntityResult.ResultType.UNRECOGNIZED : result;
     }
@@ -1447,7 +1420,6 @@ public Builder setMoreResultsValue(int value) {
      * .google.datastore.v1.QueryResultBatch.MoreResultsType more_results = 5;
      */
     public com.google.datastore.v1.QueryResultBatch.MoreResultsType getMoreResults() {
-      @SuppressWarnings("deprecation")
       com.google.datastore.v1.QueryResultBatch.MoreResultsType result = com.google.datastore.v1.QueryResultBatch.MoreResultsType.valueOf(moreResults_);
       return result == null ? com.google.datastore.v1.QueryResultBatch.MoreResultsType.UNRECOGNIZED : result;
     }
@@ -1539,13 +1511,11 @@ public Builder clearSnapshotVersion() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1567,12 +1537,11 @@ public static com.google.datastore.v1.QueryResultBatch getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public QueryResultBatch parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new QueryResultBatch(input, extensionRegistry);
+        return new QueryResultBatch(input, extensionRegistry);
     }
   };
 
@@ -1585,7 +1554,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.QueryResultBatch getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
index 636a6d7aa754..b2bcfaa948fc 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReadOptions.java
@@ -32,9 +32,6 @@ private ReadOptions(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private ReadOptions(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
             consistencyTypeCase_ = 1;
@@ -57,13 +61,6 @@ private ReadOptions(
             consistencyType_ = input.readBytes();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -81,7 +78,6 @@ private ReadOptions(
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_fieldAccessorTable
@@ -287,7 +283,6 @@ public int getReadConsistencyValue() {
    */
   public com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency() {
     if (consistencyTypeCase_ == 1) {
-      @SuppressWarnings("deprecation")
       com.google.datastore.v1.ReadOptions.ReadConsistency result = com.google.datastore.v1.ReadOptions.ReadConsistency.valueOf(
           (java.lang.Integer) consistencyType_);
       return result == null ? com.google.datastore.v1.ReadOptions.ReadConsistency.UNRECOGNIZED : result;
@@ -313,7 +308,6 @@ public com.google.protobuf.ByteString getTransaction() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -323,7 +317,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (consistencyTypeCase_ == 1) {
@@ -336,7 +329,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -480,7 +472,6 @@ public static com.google.datastore.v1.ReadOptions parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -488,7 +479,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.ReadOptions prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -516,7 +506,6 @@ public static final class Builder extends
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_fieldAccessorTable
@@ -539,7 +528,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       consistencyTypeCase_ = 0;
@@ -547,18 +535,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReadOptions_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.ReadOptions getDefaultInstanceForType() {
       return com.google.datastore.v1.ReadOptions.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.ReadOptions build() {
       com.google.datastore.v1.ReadOptions result = buildPartial();
       if (!result.isInitialized()) {
@@ -567,7 +552,6 @@ public com.google.datastore.v1.ReadOptions build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.ReadOptions buildPartial() {
       com.google.datastore.v1.ReadOptions result = new com.google.datastore.v1.ReadOptions(this);
       if (consistencyTypeCase_ == 1) {
@@ -581,39 +565,32 @@ public com.google.datastore.v1.ReadOptions buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.ReadOptions) {
         return mergeFrom((com.google.datastore.v1.ReadOptions)other);
@@ -643,12 +620,10 @@ public Builder mergeFrom(com.google.datastore.v1.ReadOptions other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -720,7 +695,6 @@ public Builder setReadConsistencyValue(int value) {
      */
     public com.google.datastore.v1.ReadOptions.ReadConsistency getReadConsistency() {
       if (consistencyTypeCase_ == 1) {
-        @SuppressWarnings("deprecation")
         com.google.datastore.v1.ReadOptions.ReadConsistency result = com.google.datastore.v1.ReadOptions.ReadConsistency.valueOf(
             (java.lang.Integer) consistencyType_);
         return result == null ? com.google.datastore.v1.ReadOptions.ReadConsistency.UNRECOGNIZED : result;
@@ -811,13 +785,11 @@ public Builder clearTransaction() {
       }
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -839,12 +811,11 @@ public static com.google.datastore.v1.ReadOptions getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ReadOptions parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReadOptions(input, extensionRegistry);
+        return new ReadOptions(input, extensionRegistry);
     }
   };
 
@@ -857,7 +828,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.ReadOptions getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java
index 2ca48d034b44..d5c5f26c5142 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsRequest.java
@@ -35,9 +35,6 @@ private ReserveIdsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ReserveIdsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
               keys_ = new java.util.ArrayList();
@@ -70,13 +74,6 @@ private ReserveIdsRequest(
             databaseId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private ReserveIdsRequest(
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_fieldAccessorTable
@@ -251,7 +247,6 @@ public com.google.datastore.v1.KeyOrBuilder getKeysOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -261,7 +256,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < keys_.size(); i++) {
@@ -276,7 +270,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -408,7 +401,6 @@ public static com.google.datastore.v1.ReserveIdsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -416,7 +408,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.ReserveIdsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -444,7 +435,6 @@ public static final class Builder extends
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_fieldAccessorTable
@@ -468,7 +458,6 @@ private void maybeForceBuilderInitialization() {
         getKeysFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -484,18 +473,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.ReserveIdsRequest getDefaultInstanceForType() {
       return com.google.datastore.v1.ReserveIdsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.ReserveIdsRequest build() {
       com.google.datastore.v1.ReserveIdsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -504,7 +490,6 @@ public com.google.datastore.v1.ReserveIdsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.ReserveIdsRequest buildPartial() {
       com.google.datastore.v1.ReserveIdsRequest result = new com.google.datastore.v1.ReserveIdsRequest(this);
       int from_bitField0_ = bitField0_;
@@ -525,39 +510,32 @@ public com.google.datastore.v1.ReserveIdsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.ReserveIdsRequest) {
         return mergeFrom((com.google.datastore.v1.ReserveIdsRequest)other);
@@ -608,12 +586,10 @@ public Builder mergeFrom(com.google.datastore.v1.ReserveIdsRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1140,13 +1116,11 @@ public com.google.datastore.v1.Key.Builder addKeysBuilder(
       }
       return keysBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1168,12 +1142,11 @@ public static com.google.datastore.v1.ReserveIdsRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ReserveIdsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReserveIdsRequest(input, extensionRegistry);
+        return new ReserveIdsRequest(input, extensionRegistry);
     }
   };
 
@@ -1186,7 +1159,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.ReserveIdsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java
index 7294241714ea..d5d38f6b6f60 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/ReserveIdsResponse.java
@@ -32,9 +32,6 @@ private ReserveIdsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -69,7 +66,6 @@ private ReserveIdsResponse(
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_fieldAccessorTable
@@ -78,7 +74,6 @@ private ReserveIdsResponse(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -88,13 +83,11 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -202,7 +195,6 @@ public static com.google.datastore.v1.ReserveIdsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -210,7 +202,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.ReserveIdsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -238,7 +229,6 @@ public static final class Builder extends
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_fieldAccessorTable
@@ -261,24 +251,20 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_ReserveIdsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.ReserveIdsResponse getDefaultInstanceForType() {
       return com.google.datastore.v1.ReserveIdsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.ReserveIdsResponse build() {
       com.google.datastore.v1.ReserveIdsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -287,46 +273,38 @@ public com.google.datastore.v1.ReserveIdsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.ReserveIdsResponse buildPartial() {
       com.google.datastore.v1.ReserveIdsResponse result = new com.google.datastore.v1.ReserveIdsResponse(this);
       onBuilt();
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.ReserveIdsResponse) {
         return mergeFrom((com.google.datastore.v1.ReserveIdsResponse)other);
@@ -343,12 +321,10 @@ public Builder mergeFrom(com.google.datastore.v1.ReserveIdsResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -366,13 +342,11 @@ public Builder mergeFrom(
       }
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -394,12 +368,11 @@ public static com.google.datastore.v1.ReserveIdsResponse getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ReserveIdsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReserveIdsResponse(input, extensionRegistry);
+        return new ReserveIdsResponse(input, extensionRegistry);
     }
   };
 
@@ -412,7 +385,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.ReserveIdsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java
index 8d51f0be2032..0aa141f0cea0 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackRequest.java
@@ -34,9 +34,6 @@ private RollbackRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private RollbackRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
 
             transaction_ = input.readBytes();
@@ -59,13 +63,6 @@ private RollbackRequest(
             projectId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private RollbackRequest(
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_fieldAccessorTable
@@ -148,7 +144,6 @@ public com.google.protobuf.ByteString getTransaction() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -158,7 +153,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!transaction_.isEmpty()) {
@@ -170,7 +164,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -293,7 +286,6 @@ public static com.google.datastore.v1.RollbackRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -301,7 +293,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.RollbackRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -329,7 +320,6 @@ public static final class Builder extends
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_fieldAccessorTable
@@ -352,7 +342,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -362,18 +351,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.RollbackRequest getDefaultInstanceForType() {
       return com.google.datastore.v1.RollbackRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.RollbackRequest build() {
       com.google.datastore.v1.RollbackRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -382,7 +368,6 @@ public com.google.datastore.v1.RollbackRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.RollbackRequest buildPartial() {
       com.google.datastore.v1.RollbackRequest result = new com.google.datastore.v1.RollbackRequest(this);
       result.projectId_ = projectId_;
@@ -391,39 +376,32 @@ public com.google.datastore.v1.RollbackRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.RollbackRequest) {
         return mergeFrom((com.google.datastore.v1.RollbackRequest)other);
@@ -447,12 +425,10 @@ public Builder mergeFrom(com.google.datastore.v1.RollbackRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -603,13 +579,11 @@ public Builder clearTransaction() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -631,12 +605,11 @@ public static com.google.datastore.v1.RollbackRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RollbackRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RollbackRequest(input, extensionRegistry);
+        return new RollbackRequest(input, extensionRegistry);
     }
   };
 
@@ -649,7 +622,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.RollbackRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java
index 0690ba911eb3..f309bbc17cf5 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RollbackResponse.java
@@ -33,9 +33,6 @@ private RollbackResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -70,7 +67,6 @@ private RollbackResponse(
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_fieldAccessorTable
@@ -79,7 +75,6 @@ private RollbackResponse(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -89,13 +84,11 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -203,7 +196,6 @@ public static com.google.datastore.v1.RollbackResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -211,7 +203,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.RollbackResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -240,7 +231,6 @@ public static final class Builder extends
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_fieldAccessorTable
@@ -263,24 +253,20 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RollbackResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.RollbackResponse getDefaultInstanceForType() {
       return com.google.datastore.v1.RollbackResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.RollbackResponse build() {
       com.google.datastore.v1.RollbackResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -289,46 +275,38 @@ public com.google.datastore.v1.RollbackResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.RollbackResponse buildPartial() {
       com.google.datastore.v1.RollbackResponse result = new com.google.datastore.v1.RollbackResponse(this);
       onBuilt();
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.RollbackResponse) {
         return mergeFrom((com.google.datastore.v1.RollbackResponse)other);
@@ -345,12 +323,10 @@ public Builder mergeFrom(com.google.datastore.v1.RollbackResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -368,13 +344,11 @@ public Builder mergeFrom(
       }
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -396,12 +370,11 @@ public static com.google.datastore.v1.RollbackResponse getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RollbackResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RollbackResponse(input, extensionRegistry);
+        return new RollbackResponse(input, extensionRegistry);
     }
   };
 
@@ -414,7 +387,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.RollbackResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java
index ba7e2974b60d..25ec2ddfa31d 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryRequest.java
@@ -33,9 +33,6 @@ private RunQueryRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private RunQueryRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.datastore.v1.ReadOptions.Builder subBuilder = null;
             if (readOptions_ != null) {
@@ -107,13 +111,6 @@ private RunQueryRequest(
             projectId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -131,7 +128,6 @@ private RunQueryRequest(
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_fieldAccessorTable
@@ -371,7 +367,6 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -381,7 +376,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (readOptions_ != null) {
@@ -402,7 +396,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -578,7 +571,6 @@ public static com.google.datastore.v1.RunQueryRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -586,7 +578,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.RunQueryRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -614,7 +605,6 @@ public static final class Builder extends
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_fieldAccessorTable
@@ -637,7 +627,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -659,18 +648,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.RunQueryRequest getDefaultInstanceForType() {
       return com.google.datastore.v1.RunQueryRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.RunQueryRequest build() {
       com.google.datastore.v1.RunQueryRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -679,7 +665,6 @@ public com.google.datastore.v1.RunQueryRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.RunQueryRequest buildPartial() {
       com.google.datastore.v1.RunQueryRequest result = new com.google.datastore.v1.RunQueryRequest(this);
       result.projectId_ = projectId_;
@@ -712,39 +697,32 @@ public com.google.datastore.v1.RunQueryRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.RunQueryRequest) {
         return mergeFrom((com.google.datastore.v1.RunQueryRequest)other);
@@ -784,12 +762,10 @@ public Builder mergeFrom(com.google.datastore.v1.RunQueryRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1588,13 +1564,11 @@ public com.google.datastore.v1.GqlQueryOrBuilder getGqlQueryOrBuilder() {
       onChanged();;
       return gqlQueryBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1616,12 +1590,11 @@ public static com.google.datastore.v1.RunQueryRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RunQueryRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RunQueryRequest(input, extensionRegistry);
+        return new RunQueryRequest(input, extensionRegistry);
     }
   };
 
@@ -1634,7 +1607,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.RunQueryRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java
index e61be763e322..cf6f8aa66101 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/RunQueryResponse.java
@@ -32,9 +32,6 @@ private RunQueryResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private RunQueryResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.datastore.v1.QueryResultBatch.Builder subBuilder = null;
             if (batch_ != null) {
@@ -72,13 +76,6 @@ private RunQueryResponse(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private RunQueryResponse(
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_fieldAccessorTable
@@ -171,7 +167,6 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -181,7 +176,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (batch_ != null) {
@@ -193,7 +187,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -327,7 +320,6 @@ public static com.google.datastore.v1.RunQueryResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -335,7 +327,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.RunQueryResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -363,7 +354,6 @@ public static final class Builder extends
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_fieldAccessorTable
@@ -386,7 +376,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (batchBuilder_ == null) {
@@ -404,18 +393,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_RunQueryResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.RunQueryResponse getDefaultInstanceForType() {
       return com.google.datastore.v1.RunQueryResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.RunQueryResponse build() {
       com.google.datastore.v1.RunQueryResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -424,7 +410,6 @@ public com.google.datastore.v1.RunQueryResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.RunQueryResponse buildPartial() {
       com.google.datastore.v1.RunQueryResponse result = new com.google.datastore.v1.RunQueryResponse(this);
       if (batchBuilder_ == null) {
@@ -441,39 +426,32 @@ public com.google.datastore.v1.RunQueryResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.RunQueryResponse) {
         return mergeFrom((com.google.datastore.v1.RunQueryResponse)other);
@@ -496,12 +474,10 @@ public Builder mergeFrom(com.google.datastore.v1.RunQueryResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -825,13 +801,11 @@ public com.google.datastore.v1.QueryOrBuilder getQueryOrBuilder() {
       }
       return queryBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -853,12 +827,11 @@ public static com.google.datastore.v1.RunQueryResponse getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RunQueryResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RunQueryResponse(input, extensionRegistry);
+        return new RunQueryResponse(input, extensionRegistry);
     }
   };
 
@@ -871,7 +844,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.RunQueryResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java
index 2bef782cd392..4c832a372d80 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/TransactionOptions.java
@@ -35,9 +35,6 @@ private TransactionOptions(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private TransactionOptions(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.datastore.v1.TransactionOptions.ReadWrite.Builder subBuilder = null;
             if (modeCase_ == 1) {
@@ -77,13 +81,6 @@ private TransactionOptions(
             modeCase_ = 2;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -101,7 +98,6 @@ private TransactionOptions(
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_fieldAccessorTable
@@ -152,9 +148,6 @@ private ReadWrite(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -166,11 +159,6 @@ private ReadWrite(
             case 0:
               done = true;
               break;
-            case 10: {
-
-              previousTransaction_ = input.readBytes();
-              break;
-            }
             default: {
               if (!parseUnknownFieldProto3(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -178,6 +166,11 @@ private ReadWrite(
               }
               break;
             }
+            case 10: {
+
+              previousTransaction_ = input.readBytes();
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -195,7 +188,6 @@ private ReadWrite(
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_fieldAccessorTable
@@ -217,7 +209,6 @@ public com.google.protobuf.ByteString getPreviousTransaction() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -227,7 +218,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!previousTransaction_.isEmpty()) {
@@ -236,7 +226,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -352,7 +341,6 @@ public static com.google.datastore.v1.TransactionOptions.ReadWrite parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -360,7 +348,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.datastore.v1.TransactionOptions.ReadWrite prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -388,7 +375,6 @@ public static final class Builder extends
         return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_fieldAccessorTable
@@ -411,7 +397,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         previousTransaction_ = com.google.protobuf.ByteString.EMPTY;
@@ -419,18 +404,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadWrite_descriptor;
       }
 
-      @java.lang.Override
       public com.google.datastore.v1.TransactionOptions.ReadWrite getDefaultInstanceForType() {
         return com.google.datastore.v1.TransactionOptions.ReadWrite.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.datastore.v1.TransactionOptions.ReadWrite build() {
         com.google.datastore.v1.TransactionOptions.ReadWrite result = buildPartial();
         if (!result.isInitialized()) {
@@ -439,7 +421,6 @@ public com.google.datastore.v1.TransactionOptions.ReadWrite build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.datastore.v1.TransactionOptions.ReadWrite buildPartial() {
         com.google.datastore.v1.TransactionOptions.ReadWrite result = new com.google.datastore.v1.TransactionOptions.ReadWrite(this);
         result.previousTransaction_ = previousTransaction_;
@@ -447,39 +428,32 @@ public com.google.datastore.v1.TransactionOptions.ReadWrite buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.datastore.v1.TransactionOptions.ReadWrite) {
           return mergeFrom((com.google.datastore.v1.TransactionOptions.ReadWrite)other);
@@ -499,12 +473,10 @@ public Builder mergeFrom(com.google.datastore.v1.TransactionOptions.ReadWrite ot
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -563,13 +535,11 @@ public Builder clearPreviousTransaction() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -591,12 +561,11 @@ public static com.google.datastore.v1.TransactionOptions.ReadWrite getDefaultIns
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public ReadWrite parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ReadWrite(input, extensionRegistry);
+          return new ReadWrite(input, extensionRegistry);
       }
     };
 
@@ -609,7 +578,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.TransactionOptions.ReadWrite getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -649,9 +617,6 @@ private ReadOnly(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -686,7 +651,6 @@ private ReadOnly(
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_fieldAccessorTable
@@ -695,7 +659,6 @@ private ReadOnly(
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -705,13 +668,11 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -819,7 +780,6 @@ public static com.google.datastore.v1.TransactionOptions.ReadOnly parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -827,7 +787,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.datastore.v1.TransactionOptions.ReadOnly prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -855,7 +814,6 @@ public static final class Builder extends
         return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_fieldAccessorTable
@@ -878,24 +836,20 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_ReadOnly_descriptor;
       }
 
-      @java.lang.Override
       public com.google.datastore.v1.TransactionOptions.ReadOnly getDefaultInstanceForType() {
         return com.google.datastore.v1.TransactionOptions.ReadOnly.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.datastore.v1.TransactionOptions.ReadOnly build() {
         com.google.datastore.v1.TransactionOptions.ReadOnly result = buildPartial();
         if (!result.isInitialized()) {
@@ -904,46 +858,38 @@ public com.google.datastore.v1.TransactionOptions.ReadOnly build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.datastore.v1.TransactionOptions.ReadOnly buildPartial() {
         com.google.datastore.v1.TransactionOptions.ReadOnly result = new com.google.datastore.v1.TransactionOptions.ReadOnly(this);
         onBuilt();
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.datastore.v1.TransactionOptions.ReadOnly) {
           return mergeFrom((com.google.datastore.v1.TransactionOptions.ReadOnly)other);
@@ -960,12 +906,10 @@ public Builder mergeFrom(com.google.datastore.v1.TransactionOptions.ReadOnly oth
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -983,13 +927,11 @@ public Builder mergeFrom(
         }
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1011,12 +953,11 @@ public static com.google.datastore.v1.TransactionOptions.ReadOnly getDefaultInst
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public ReadOnly parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ReadOnly(input, extensionRegistry);
+          return new ReadOnly(input, extensionRegistry);
       }
     };
 
@@ -1029,7 +970,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.TransactionOptions.ReadOnly getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1151,7 +1091,6 @@ public com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyO
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1161,7 +1100,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (modeCase_ == 1) {
@@ -1173,7 +1111,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1316,7 +1253,6 @@ public static com.google.datastore.v1.TransactionOptions parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1324,7 +1260,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.TransactionOptions prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1355,7 +1290,6 @@ public static final class Builder extends
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_fieldAccessorTable
@@ -1378,7 +1312,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       modeCase_ = 0;
@@ -1386,18 +1319,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.DatastoreProto.internal_static_google_datastore_v1_TransactionOptions_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.TransactionOptions getDefaultInstanceForType() {
       return com.google.datastore.v1.TransactionOptions.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.TransactionOptions build() {
       com.google.datastore.v1.TransactionOptions result = buildPartial();
       if (!result.isInitialized()) {
@@ -1406,7 +1336,6 @@ public com.google.datastore.v1.TransactionOptions build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.TransactionOptions buildPartial() {
       com.google.datastore.v1.TransactionOptions result = new com.google.datastore.v1.TransactionOptions(this);
       if (modeCase_ == 1) {
@@ -1428,39 +1357,32 @@ public com.google.datastore.v1.TransactionOptions buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.TransactionOptions) {
         return mergeFrom((com.google.datastore.v1.TransactionOptions)other);
@@ -1490,12 +1412,10 @@ public Builder mergeFrom(com.google.datastore.v1.TransactionOptions other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1872,13 +1792,11 @@ public com.google.datastore.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyO
       onChanged();;
       return readOnlyBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1900,12 +1818,11 @@ public static com.google.datastore.v1.TransactionOptions getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TransactionOptions parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TransactionOptions(input, extensionRegistry);
+        return new TransactionOptions(input, extensionRegistry);
     }
   };
 
@@ -1918,7 +1835,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.TransactionOptions getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java
index 545094844729..24a7ce3b5f03 100644
--- a/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java
+++ b/google-api-grpc/proto-google-cloud-datastore-v1/src/main/java/com/google/datastore/v1/Value.java
@@ -35,9 +35,6 @@ private Value(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private Value(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             valueTypeCase_ = 1;
             valueType_ = input.readBool();
@@ -161,13 +165,6 @@ private Value(
             excludeFromIndexes_ = input.readBool();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -185,7 +182,6 @@ private Value(
     return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_fieldAccessorTable
@@ -272,7 +268,6 @@ public int getNullValueValue() {
    */
   public com.google.protobuf.NullValue getNullValue() {
     if (valueTypeCase_ == 11) {
-      @SuppressWarnings("deprecation")
       com.google.protobuf.NullValue result = com.google.protobuf.NullValue.valueOf(
           (java.lang.Integer) valueType_);
       return result == null ? com.google.protobuf.NullValue.UNRECOGNIZED : result;
@@ -640,7 +635,6 @@ public boolean getExcludeFromIndexes() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -650,7 +644,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (valueTypeCase_ == 1) {
@@ -699,7 +692,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -975,7 +967,6 @@ public static com.google.datastore.v1.Value parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -983,7 +974,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.datastore.v1.Value prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1012,7 +1002,6 @@ public static final class Builder extends
       return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_fieldAccessorTable
@@ -1035,7 +1024,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       meaning_ = 0;
@@ -1047,18 +1035,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.datastore.v1.EntityProto.internal_static_google_datastore_v1_Value_descriptor;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.Value getDefaultInstanceForType() {
       return com.google.datastore.v1.Value.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.Value build() {
       com.google.datastore.v1.Value result = buildPartial();
       if (!result.isInitialized()) {
@@ -1067,7 +1052,6 @@ public com.google.datastore.v1.Value build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.datastore.v1.Value buildPartial() {
       com.google.datastore.v1.Value result = new com.google.datastore.v1.Value(this);
       if (valueTypeCase_ == 11) {
@@ -1130,39 +1114,32 @@ public com.google.datastore.v1.Value buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.datastore.v1.Value) {
         return mergeFrom((com.google.datastore.v1.Value)other);
@@ -1236,12 +1213,10 @@ public Builder mergeFrom(com.google.datastore.v1.Value other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1310,7 +1285,6 @@ public Builder setNullValueValue(int value) {
      */
     public com.google.protobuf.NullValue getNullValue() {
       if (valueTypeCase_ == 11) {
-        @SuppressWarnings("deprecation")
         com.google.protobuf.NullValue result = com.google.protobuf.NullValue.valueOf(
             (java.lang.Integer) valueType_);
         return result == null ? com.google.protobuf.NullValue.UNRECOGNIZED : result;
@@ -2649,13 +2623,11 @@ public Builder clearExcludeFromIndexes() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2677,12 +2649,11 @@ public static com.google.datastore.v1.Value getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Value parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Value(input, extensionRegistry);
+        return new Value(input, extensionRegistry);
     }
   };
 
@@ -2695,7 +2666,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.datastore.v1.Value getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Agent.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Agent.java
index ba5647cbabdb..7357870f9f83 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Agent.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Agent.java
@@ -42,9 +42,6 @@ private Agent(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -56,6 +53,13 @@ private Agent(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -117,13 +121,6 @@ private Agent(
             classificationThreshold_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -144,7 +141,6 @@ private Agent(
     return com.google.cloud.dialogflow.v2.AgentProto.internal_static_google_cloud_dialogflow_v2_Agent_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.AgentProto.internal_static_google_cloud_dialogflow_v2_Agent_fieldAccessorTable
@@ -644,7 +640,6 @@ public int getMatchModeValue() {
    * .google.cloud.dialogflow.v2.Agent.MatchMode match_mode = 9;
    */
   public com.google.cloud.dialogflow.v2.Agent.MatchMode getMatchMode() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.Agent.MatchMode result = com.google.cloud.dialogflow.v2.Agent.MatchMode.valueOf(matchMode_);
     return result == null ? com.google.cloud.dialogflow.v2.Agent.MatchMode.UNRECOGNIZED : result;
   }
@@ -669,7 +664,6 @@ public float getClassificationThreshold() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -679,7 +673,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -715,7 +708,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -906,7 +898,6 @@ public static com.google.cloud.dialogflow.v2.Agent parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -914,7 +905,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.Agent prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -942,7 +932,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.AgentProto.internal_static_google_cloud_dialogflow_v2_Agent_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.AgentProto.internal_static_google_cloud_dialogflow_v2_Agent_fieldAccessorTable
@@ -965,7 +954,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -991,18 +979,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.AgentProto.internal_static_google_cloud_dialogflow_v2_Agent_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.Agent getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.Agent.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.Agent build() {
       com.google.cloud.dialogflow.v2.Agent result = buildPartial();
       if (!result.isInitialized()) {
@@ -1011,7 +996,6 @@ public com.google.cloud.dialogflow.v2.Agent build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.Agent buildPartial() {
       com.google.cloud.dialogflow.v2.Agent result = new com.google.cloud.dialogflow.v2.Agent(this);
       int from_bitField0_ = bitField0_;
@@ -1035,39 +1019,32 @@ public com.google.cloud.dialogflow.v2.Agent buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.Agent) {
         return mergeFrom((com.google.cloud.dialogflow.v2.Agent)other);
@@ -1127,12 +1104,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Agent other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1939,7 +1914,6 @@ public Builder setMatchModeValue(int value) {
      * .google.cloud.dialogflow.v2.Agent.MatchMode match_mode = 9;
      */
     public com.google.cloud.dialogflow.v2.Agent.MatchMode getMatchMode() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.Agent.MatchMode result = com.google.cloud.dialogflow.v2.Agent.MatchMode.valueOf(matchMode_);
       return result == null ? com.google.cloud.dialogflow.v2.Agent.MatchMode.UNRECOGNIZED : result;
     }
@@ -2028,13 +2002,11 @@ public Builder clearClassificationThreshold() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2056,12 +2028,11 @@ public static com.google.cloud.dialogflow.v2.Agent getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Agent parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Agent(input, extensionRegistry);
+        return new Agent(input, extensionRegistry);
     }
   };
 
@@ -2074,7 +2045,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.Agent getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentProto.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentProto.java
index 223b016df8ec..8b6d80e57bd3 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentProto.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/AgentProto.java
@@ -77,7 +77,7 @@ public static void registerAllExtensions(
       "\n\006parent\030\001 \001(\t\022\024\n\014display_name\030\002 \001(\t\022\035\n\025" +
       "default_language_code\030\003 \001(\t\022 \n\030supported" +
       "_language_codes\030\004 \003(\t\022\021\n\ttime_zone\030\005 \001(\t" +
-      "\022\023\n\013description\030\006 \001(\t\022\022\n\navatar_uri\030\007 \001(" +
+      "\022\023\n\013description\030\006 \001(\t\022\022\n\navatar_uri\030\007 \001(",
       "\t\022\026\n\016enable_logging\030\010 \001(\010\022?\n\nmatch_mode\030" +
       "\t \001(\0162+.google.cloud.dialogflow.v2.Agent" +
       ".MatchMode\022 \n\030classification_threshold\030\n" +
@@ -87,7 +87,7 @@ public static void registerAllExtensions(
       "t\030\001 \001(\t\"L\n\023SearchAgentsRequest\022\016\n\006parent" +
       "\030\001 \001(\t\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_token\030" +
       "\003 \001(\t\"b\n\024SearchAgentsResponse\0221\n\006agents\030" +
-      "\001 \003(\0132!.google.cloud.dialogflow.v2.Agent" +
+      "\001 \003(\0132!.google.cloud.dialogflow.v2.Agent",
       "\022\027\n\017next_page_token\030\002 \001(\t\"#\n\021TrainAgentR" +
       "equest\022\016\n\006parent\030\001 \001(\t\"7\n\022ExportAgentReq" +
       "uest\022\016\n\006parent\030\001 \001(\t\022\021\n\tagent_uri\030\002 \001(\t\"" +
@@ -97,7 +97,7 @@ public static void registerAllExtensions(
       "gent_uri\030\002 \001(\tH\000\022\027\n\ragent_content\030\003 \001(\014H" +
       "\000B\007\n\005agent\"\\\n\023RestoreAgentRequest\022\016\n\006par" +
       "ent\030\001 \001(\t\022\023\n\tagent_uri\030\002 \001(\tH\000\022\027\n\ragent_" +
-      "content\030\003 \001(\014H\000B\007\n\005agent2\356\006\n\006Agents\022\201\001\n\010" +
+      "content\030\003 \001(\014H\000B\007\n\005agent2\356\006\n\006Agents\022\201\001\n\010",
       "GetAgent\022+.google.cloud.dialogflow.v2.Ge" +
       "tAgentRequest\032!.google.cloud.dialogflow." +
       "v2.Agent\"%\202\323\344\223\002\037\022\035/v2/{parent=projects/*" +
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "nse\",\202\323\344\223\002&\022$/v2/{parent=projects/*}/age" +
       "nt:search\022\212\001\n\nTrainAgent\022-.google.cloud." +
       "dialogflow.v2.TrainAgentRequest\032\035.google" +
-      ".longrunning.Operation\".\202\323\344\223\002(\"#/v2/{par" +
+      ".longrunning.Operation\".\202\323\344\223\002(\"#/v2/{par",
       "ent=projects/*}/agent:train:\001*\022\215\001\n\013Expor" +
       "tAgent\022..google.cloud.dialogflow.v2.Expo" +
       "rtAgentRequest\032\035.google.longrunning.Oper" +
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       ".google.longrunning.Operation\"/\202\323\344\223\002)\"$/" +
       "v2/{parent=projects/*}/agent:import:\001*\022\220" +
       "\001\n\014RestoreAgent\022/.google.cloud.dialogflo" +
-      "w.v2.RestoreAgentRequest\032\035.google.longru" +
+      "w.v2.RestoreAgentRequest\032\035.google.longru",
       "nning.Operation\"0\202\323\344\223\002*\"%/v2/{parent=pro" +
       "jects/*}/agent:restore:\001*B\231\001\n\036com.google" +
       ".cloud.dialogflow.v2B\nAgentProtoP\001ZDgoog" +
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchCreateEntitiesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchCreateEntitiesRequest.java
index 096982692e98..959f7413eea8 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchCreateEntitiesRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchCreateEntitiesRequest.java
@@ -35,9 +35,6 @@ private BatchCreateEntitiesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private BatchCreateEntitiesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -70,13 +74,6 @@ private BatchCreateEntitiesRequest(
             languageCode_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private BatchCreateEntitiesRequest(
     return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_BatchCreateEntitiesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_BatchCreateEntitiesRequest_fieldAccessorTable
@@ -256,7 +252,6 @@ public java.lang.String getLanguageCode() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -266,7 +261,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -281,7 +275,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -413,7 +406,6 @@ public static com.google.cloud.dialogflow.v2.BatchCreateEntitiesRequest parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -421,7 +413,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.BatchCreateEntitiesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -449,7 +440,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_BatchCreateEntitiesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_BatchCreateEntitiesRequest_fieldAccessorTable
@@ -473,7 +463,6 @@ private void maybeForceBuilderInitialization() {
         getEntitiesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -489,18 +478,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_BatchCreateEntitiesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.BatchCreateEntitiesRequest getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.BatchCreateEntitiesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.BatchCreateEntitiesRequest build() {
       com.google.cloud.dialogflow.v2.BatchCreateEntitiesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -509,7 +495,6 @@ public com.google.cloud.dialogflow.v2.BatchCreateEntitiesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.BatchCreateEntitiesRequest buildPartial() {
       com.google.cloud.dialogflow.v2.BatchCreateEntitiesRequest result = new com.google.cloud.dialogflow.v2.BatchCreateEntitiesRequest(this);
       int from_bitField0_ = bitField0_;
@@ -530,39 +515,32 @@ public com.google.cloud.dialogflow.v2.BatchCreateEntitiesRequest buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.BatchCreateEntitiesRequest) {
         return mergeFrom((com.google.cloud.dialogflow.v2.BatchCreateEntitiesRequest)other);
@@ -613,12 +591,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.BatchCreateEntitiesReque
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1152,13 +1128,11 @@ public Builder setLanguageCodeBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1180,12 +1154,11 @@ public static com.google.cloud.dialogflow.v2.BatchCreateEntitiesRequest getDefau
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BatchCreateEntitiesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchCreateEntitiesRequest(input, extensionRegistry);
+        return new BatchCreateEntitiesRequest(input, extensionRegistry);
     }
   };
 
@@ -1198,7 +1171,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.BatchCreateEntitiesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntitiesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntitiesRequest.java
index 51523ede311b..dcfe65a762da 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntitiesRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntitiesRequest.java
@@ -35,9 +35,6 @@ private BatchDeleteEntitiesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private BatchDeleteEntitiesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -70,13 +74,6 @@ private BatchDeleteEntitiesRequest(
             languageCode_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private BatchDeleteEntitiesRequest(
     return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_BatchDeleteEntitiesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_BatchDeleteEntitiesRequest_fieldAccessorTable
@@ -254,7 +250,6 @@ public java.lang.String getLanguageCode() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -264,7 +259,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -279,7 +273,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -415,7 +408,6 @@ public static com.google.cloud.dialogflow.v2.BatchDeleteEntitiesRequest parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -423,7 +415,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.BatchDeleteEntitiesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -451,7 +442,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_BatchDeleteEntitiesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_BatchDeleteEntitiesRequest_fieldAccessorTable
@@ -474,7 +464,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -486,18 +475,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_BatchDeleteEntitiesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.BatchDeleteEntitiesRequest getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.BatchDeleteEntitiesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.BatchDeleteEntitiesRequest build() {
       com.google.cloud.dialogflow.v2.BatchDeleteEntitiesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -506,7 +492,6 @@ public com.google.cloud.dialogflow.v2.BatchDeleteEntitiesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.BatchDeleteEntitiesRequest buildPartial() {
       com.google.cloud.dialogflow.v2.BatchDeleteEntitiesRequest result = new com.google.cloud.dialogflow.v2.BatchDeleteEntitiesRequest(this);
       int from_bitField0_ = bitField0_;
@@ -523,39 +508,32 @@ public com.google.cloud.dialogflow.v2.BatchDeleteEntitiesRequest buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.BatchDeleteEntitiesRequest) {
         return mergeFrom((com.google.cloud.dialogflow.v2.BatchDeleteEntitiesRequest)other);
@@ -590,12 +568,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.BatchDeleteEntitiesReque
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -965,13 +941,11 @@ public Builder setLanguageCodeBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -993,12 +967,11 @@ public static com.google.cloud.dialogflow.v2.BatchDeleteEntitiesRequest getDefau
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BatchDeleteEntitiesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchDeleteEntitiesRequest(input, extensionRegistry);
+        return new BatchDeleteEntitiesRequest(input, extensionRegistry);
     }
   };
 
@@ -1011,7 +984,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.BatchDeleteEntitiesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntityTypesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntityTypesRequest.java
index 3c816f320e8f..4f9fe0e95057 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntityTypesRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteEntityTypesRequest.java
@@ -34,9 +34,6 @@ private BatchDeleteEntityTypesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private BatchDeleteEntityTypesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -63,13 +67,6 @@ private BatchDeleteEntityTypesRequest(
             entityTypeNames_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private BatchDeleteEntityTypesRequest(
     return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_BatchDeleteEntityTypesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_BatchDeleteEntityTypesRequest_fieldAccessorTable
@@ -193,7 +189,6 @@ public java.lang.String getEntityTypeNames(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -203,7 +198,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -215,7 +209,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -344,7 +337,6 @@ public static com.google.cloud.dialogflow.v2.BatchDeleteEntityTypesRequest parse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -352,7 +344,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.BatchDeleteEntityTypesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -380,7 +371,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_BatchDeleteEntityTypesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_BatchDeleteEntityTypesRequest_fieldAccessorTable
@@ -403,7 +393,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -413,18 +402,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_BatchDeleteEntityTypesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.BatchDeleteEntityTypesRequest getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.BatchDeleteEntityTypesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.BatchDeleteEntityTypesRequest build() {
       com.google.cloud.dialogflow.v2.BatchDeleteEntityTypesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -433,7 +419,6 @@ public com.google.cloud.dialogflow.v2.BatchDeleteEntityTypesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.BatchDeleteEntityTypesRequest buildPartial() {
       com.google.cloud.dialogflow.v2.BatchDeleteEntityTypesRequest result = new com.google.cloud.dialogflow.v2.BatchDeleteEntityTypesRequest(this);
       int from_bitField0_ = bitField0_;
@@ -449,39 +434,32 @@ public com.google.cloud.dialogflow.v2.BatchDeleteEntityTypesRequest buildPartial
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.BatchDeleteEntityTypesRequest) {
         return mergeFrom((com.google.cloud.dialogflow.v2.BatchDeleteEntityTypesRequest)other);
@@ -512,12 +490,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.BatchDeleteEntityTypesRe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -769,13 +745,11 @@ public Builder addEntityTypeNamesBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -797,12 +771,11 @@ public static com.google.cloud.dialogflow.v2.BatchDeleteEntityTypesRequest getDe
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BatchDeleteEntityTypesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchDeleteEntityTypesRequest(input, extensionRegistry);
+        return new BatchDeleteEntityTypesRequest(input, extensionRegistry);
     }
   };
 
@@ -815,7 +788,6 @@ public com.google.protobuf.Parser getParserForTyp
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.BatchDeleteEntityTypesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteIntentsRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteIntentsRequest.java
index 73da2a2093aa..9d7d203f80f3 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteIntentsRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchDeleteIntentsRequest.java
@@ -34,9 +34,6 @@ private BatchDeleteIntentsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private BatchDeleteIntentsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -63,13 +67,6 @@ private BatchDeleteIntentsRequest(
                 input.readMessage(com.google.cloud.dialogflow.v2.Intent.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private BatchDeleteIntentsRequest(
     return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_BatchDeleteIntentsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_BatchDeleteIntentsRequest_fieldAccessorTable
@@ -204,7 +200,6 @@ public com.google.cloud.dialogflow.v2.IntentOrBuilder getIntentsOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -214,7 +209,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -226,7 +220,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -351,7 +344,6 @@ public static com.google.cloud.dialogflow.v2.BatchDeleteIntentsRequest parseFrom
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -359,7 +351,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.BatchDeleteIntentsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -387,7 +378,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_BatchDeleteIntentsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_BatchDeleteIntentsRequest_fieldAccessorTable
@@ -411,7 +401,6 @@ private void maybeForceBuilderInitialization() {
         getIntentsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -425,18 +414,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_BatchDeleteIntentsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.BatchDeleteIntentsRequest getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.BatchDeleteIntentsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.BatchDeleteIntentsRequest build() {
       com.google.cloud.dialogflow.v2.BatchDeleteIntentsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -445,7 +431,6 @@ public com.google.cloud.dialogflow.v2.BatchDeleteIntentsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.BatchDeleteIntentsRequest buildPartial() {
       com.google.cloud.dialogflow.v2.BatchDeleteIntentsRequest result = new com.google.cloud.dialogflow.v2.BatchDeleteIntentsRequest(this);
       int from_bitField0_ = bitField0_;
@@ -465,39 +450,32 @@ public com.google.cloud.dialogflow.v2.BatchDeleteIntentsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.BatchDeleteIntentsRequest) {
         return mergeFrom((com.google.cloud.dialogflow.v2.BatchDeleteIntentsRequest)other);
@@ -544,12 +522,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.BatchDeleteIntentsReques
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -992,13 +968,11 @@ public com.google.cloud.dialogflow.v2.Intent.Builder addIntentsBuilder(
       }
       return intentsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1020,12 +994,11 @@ public static com.google.cloud.dialogflow.v2.BatchDeleteIntentsRequest getDefaul
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BatchDeleteIntentsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchDeleteIntentsRequest(input, extensionRegistry);
+        return new BatchDeleteIntentsRequest(input, extensionRegistry);
     }
   };
 
@@ -1038,7 +1011,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.BatchDeleteIntentsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntitiesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntitiesRequest.java
index 41c9a4b674ea..c306e43e863e 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntitiesRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntitiesRequest.java
@@ -35,9 +35,6 @@ private BatchUpdateEntitiesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private BatchUpdateEntitiesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -83,13 +87,6 @@ private BatchUpdateEntitiesRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -110,7 +107,6 @@ private BatchUpdateEntitiesRequest(
     return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_BatchUpdateEntitiesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_BatchUpdateEntitiesRequest_fieldAccessorTable
@@ -302,7 +298,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -312,7 +307,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -330,7 +324,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -475,7 +468,6 @@ public static com.google.cloud.dialogflow.v2.BatchUpdateEntitiesRequest parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -483,7 +475,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.BatchUpdateEntitiesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -511,7 +502,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_BatchUpdateEntitiesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_BatchUpdateEntitiesRequest_fieldAccessorTable
@@ -535,7 +525,6 @@ private void maybeForceBuilderInitialization() {
         getEntitiesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -557,18 +546,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_BatchUpdateEntitiesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.BatchUpdateEntitiesRequest getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.BatchUpdateEntitiesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.BatchUpdateEntitiesRequest build() {
       com.google.cloud.dialogflow.v2.BatchUpdateEntitiesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -577,7 +563,6 @@ public com.google.cloud.dialogflow.v2.BatchUpdateEntitiesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.BatchUpdateEntitiesRequest buildPartial() {
       com.google.cloud.dialogflow.v2.BatchUpdateEntitiesRequest result = new com.google.cloud.dialogflow.v2.BatchUpdateEntitiesRequest(this);
       int from_bitField0_ = bitField0_;
@@ -603,39 +588,32 @@ public com.google.cloud.dialogflow.v2.BatchUpdateEntitiesRequest buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.BatchUpdateEntitiesRequest) {
         return mergeFrom((com.google.cloud.dialogflow.v2.BatchUpdateEntitiesRequest)other);
@@ -689,12 +667,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.BatchUpdateEntitiesReque
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1381,13 +1357,11 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
       }
       return updateMaskBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1409,12 +1383,11 @@ public static com.google.cloud.dialogflow.v2.BatchUpdateEntitiesRequest getDefau
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BatchUpdateEntitiesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchUpdateEntitiesRequest(input, extensionRegistry);
+        return new BatchUpdateEntitiesRequest(input, extensionRegistry);
     }
   };
 
@@ -1427,7 +1400,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.BatchUpdateEntitiesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesRequest.java
index 0cca97db535e..3f51033d517e 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesRequest.java
@@ -34,9 +34,6 @@ private BatchUpdateEntityTypesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private BatchUpdateEntityTypesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -93,13 +97,6 @@ private BatchUpdateEntityTypesRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -117,7 +114,6 @@ private BatchUpdateEntityTypesRequest(
     return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_BatchUpdateEntityTypesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_BatchUpdateEntityTypesRequest_fieldAccessorTable
@@ -386,7 +382,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -396,7 +391,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -417,7 +411,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -586,7 +579,6 @@ public static com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesRequest parse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -594,7 +586,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -622,7 +613,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_BatchUpdateEntityTypesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_BatchUpdateEntityTypesRequest_fieldAccessorTable
@@ -645,7 +635,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -663,18 +652,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_BatchUpdateEntityTypesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesRequest getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesRequest build() {
       com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -683,7 +669,6 @@ public com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesRequest buildPartial() {
       com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesRequest result = new com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesRequest(this);
       result.parent_ = parent_;
@@ -708,39 +693,32 @@ public com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesRequest buildPartial
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesRequest) {
         return mergeFrom((com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesRequest)other);
@@ -783,12 +761,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesRe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1464,13 +1440,11 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
       }
       return updateMaskBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1492,12 +1466,11 @@ public static com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesRequest getDe
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BatchUpdateEntityTypesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchUpdateEntityTypesRequest(input, extensionRegistry);
+        return new BatchUpdateEntityTypesRequest(input, extensionRegistry);
     }
   };
 
@@ -1510,7 +1483,6 @@ public com.google.protobuf.Parser getParserForTyp
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesResponse.java
index a2d73fe430a0..dcefb3f93cab 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesResponse.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateEntityTypesResponse.java
@@ -33,9 +33,6 @@ private BatchUpdateEntityTypesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private BatchUpdateEntityTypesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               entityTypes_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private BatchUpdateEntityTypesResponse(
                 input.readMessage(com.google.cloud.dialogflow.v2.EntityType.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private BatchUpdateEntityTypesResponse(
     return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_BatchUpdateEntityTypesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_BatchUpdateEntityTypesResponse_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.cloud.dialogflow.v2.EntityTypeOrBuilder getEntityTypesOrBuilde
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < entityTypes_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse pars
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_BatchUpdateEntityTypesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_BatchUpdateEntityTypesResponse_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getEntityTypesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (entityTypesBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_BatchUpdateEntityTypesResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse build() {
       com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse buildPartial() {
       com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse result = new com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse buildPartia
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse) {
         return mergeFrom((com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesRe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.cloud.dialogflow.v2.EntityType.Builder addEntityTypesBuilder(
       }
       return entityTypesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse getD
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BatchUpdateEntityTypesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchUpdateEntityTypesResponse(input, extensionRegistry);
+        return new BatchUpdateEntityTypesResponse(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForTy
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.BatchUpdateEntityTypesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsRequest.java
index ac5ec55652f7..ddf6df76cd2d 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsRequest.java
@@ -35,9 +35,6 @@ private BatchUpdateIntentsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private BatchUpdateIntentsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -100,13 +104,6 @@ private BatchUpdateIntentsRequest(
             intentView_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -124,7 +121,6 @@ private BatchUpdateIntentsRequest(
     return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_BatchUpdateIntentsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_BatchUpdateIntentsRequest_fieldAccessorTable
@@ -410,13 +406,11 @@ public int getIntentViewValue() {
    * .google.cloud.dialogflow.v2.IntentView intent_view = 6;
    */
   public com.google.cloud.dialogflow.v2.IntentView getIntentView() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.IntentView result = com.google.cloud.dialogflow.v2.IntentView.valueOf(intentView_);
     return result == null ? com.google.cloud.dialogflow.v2.IntentView.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -426,7 +420,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -450,7 +443,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -626,7 +618,6 @@ public static com.google.cloud.dialogflow.v2.BatchUpdateIntentsRequest parseFrom
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -634,7 +625,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.BatchUpdateIntentsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -662,7 +652,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_BatchUpdateIntentsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_BatchUpdateIntentsRequest_fieldAccessorTable
@@ -685,7 +674,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -705,18 +693,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_BatchUpdateIntentsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.BatchUpdateIntentsRequest getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.BatchUpdateIntentsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.BatchUpdateIntentsRequest build() {
       com.google.cloud.dialogflow.v2.BatchUpdateIntentsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -725,7 +710,6 @@ public com.google.cloud.dialogflow.v2.BatchUpdateIntentsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.BatchUpdateIntentsRequest buildPartial() {
       com.google.cloud.dialogflow.v2.BatchUpdateIntentsRequest result = new com.google.cloud.dialogflow.v2.BatchUpdateIntentsRequest(this);
       result.parent_ = parent_;
@@ -751,39 +735,32 @@ public com.google.cloud.dialogflow.v2.BatchUpdateIntentsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.BatchUpdateIntentsRequest) {
         return mergeFrom((com.google.cloud.dialogflow.v2.BatchUpdateIntentsRequest)other);
@@ -829,12 +806,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.BatchUpdateIntentsReques
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1537,7 +1512,6 @@ public Builder setIntentViewValue(int value) {
      * .google.cloud.dialogflow.v2.IntentView intent_view = 6;
      */
     public com.google.cloud.dialogflow.v2.IntentView getIntentView() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.IntentView result = com.google.cloud.dialogflow.v2.IntentView.valueOf(intentView_);
       return result == null ? com.google.cloud.dialogflow.v2.IntentView.UNRECOGNIZED : result;
     }
@@ -1570,13 +1544,11 @@ public Builder clearIntentView() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1598,12 +1570,11 @@ public static com.google.cloud.dialogflow.v2.BatchUpdateIntentsRequest getDefaul
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BatchUpdateIntentsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchUpdateIntentsRequest(input, extensionRegistry);
+        return new BatchUpdateIntentsRequest(input, extensionRegistry);
     }
   };
 
@@ -1616,7 +1587,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.BatchUpdateIntentsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsResponse.java
index 33256829ec58..40504b429a51 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsResponse.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/BatchUpdateIntentsResponse.java
@@ -33,9 +33,6 @@ private BatchUpdateIntentsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private BatchUpdateIntentsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               intents_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private BatchUpdateIntentsResponse(
                 input.readMessage(com.google.cloud.dialogflow.v2.Intent.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private BatchUpdateIntentsResponse(
     return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_BatchUpdateIntentsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_BatchUpdateIntentsResponse_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.cloud.dialogflow.v2.IntentOrBuilder getIntentsOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < intents_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.dialogflow.v2.BatchUpdateIntentsResponse parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.BatchUpdateIntentsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_BatchUpdateIntentsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_BatchUpdateIntentsResponse_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getIntentsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (intentsBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_BatchUpdateIntentsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.BatchUpdateIntentsResponse getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.BatchUpdateIntentsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.BatchUpdateIntentsResponse build() {
       com.google.cloud.dialogflow.v2.BatchUpdateIntentsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.cloud.dialogflow.v2.BatchUpdateIntentsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.BatchUpdateIntentsResponse buildPartial() {
       com.google.cloud.dialogflow.v2.BatchUpdateIntentsResponse result = new com.google.cloud.dialogflow.v2.BatchUpdateIntentsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.cloud.dialogflow.v2.BatchUpdateIntentsResponse buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.BatchUpdateIntentsResponse) {
         return mergeFrom((com.google.cloud.dialogflow.v2.BatchUpdateIntentsResponse)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.BatchUpdateIntentsRespon
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.cloud.dialogflow.v2.Intent.Builder addIntentsBuilder(
       }
       return intentsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.cloud.dialogflow.v2.BatchUpdateIntentsResponse getDefau
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BatchUpdateIntentsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchUpdateIntentsResponse(input, extensionRegistry);
+        return new BatchUpdateIntentsResponse(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.BatchUpdateIntentsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Context.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Context.java
index ac1d260078d3..4b7a2d870d8b 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Context.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Context.java
@@ -34,9 +34,6 @@ private Context(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private Context(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -72,13 +76,6 @@ private Context(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private Context(
     return com.google.cloud.dialogflow.v2.ContextProto.internal_static_google_cloud_dialogflow_v2_Context_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.ContextProto.internal_static_google_cloud_dialogflow_v2_Context_fieldAccessorTable
@@ -204,7 +200,6 @@ public com.google.protobuf.StructOrBuilder getParametersOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -214,7 +209,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -229,7 +223,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -365,7 +358,6 @@ public static com.google.cloud.dialogflow.v2.Context parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -373,7 +365,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.Context prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -401,7 +392,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.ContextProto.internal_static_google_cloud_dialogflow_v2_Context_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.ContextProto.internal_static_google_cloud_dialogflow_v2_Context_fieldAccessorTable
@@ -424,7 +414,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -440,18 +429,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.ContextProto.internal_static_google_cloud_dialogflow_v2_Context_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.Context getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.Context.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.Context build() {
       com.google.cloud.dialogflow.v2.Context result = buildPartial();
       if (!result.isInitialized()) {
@@ -460,7 +446,6 @@ public com.google.cloud.dialogflow.v2.Context build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.Context buildPartial() {
       com.google.cloud.dialogflow.v2.Context result = new com.google.cloud.dialogflow.v2.Context(this);
       result.name_ = name_;
@@ -474,39 +459,32 @@ public com.google.cloud.dialogflow.v2.Context buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.Context) {
         return mergeFrom((com.google.cloud.dialogflow.v2.Context)other);
@@ -533,12 +511,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Context other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -868,13 +844,11 @@ public com.google.protobuf.StructOrBuilder getParametersOrBuilder() {
       }
       return parametersBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -896,12 +870,11 @@ public static com.google.cloud.dialogflow.v2.Context getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Context parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Context(input, extensionRegistry);
+        return new Context(input, extensionRegistry);
     }
   };
 
@@ -914,7 +887,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.Context getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ContextProto.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ContextProto.java
index ec82bf27bb89..f6d3b8fbed0e 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ContextProto.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ContextProto.java
@@ -72,7 +72,7 @@ public static void registerAllExtensions(
       "(\005\022+\n\nparameters\030\003 \001(\0132\027.google.protobuf" +
       ".Struct\"L\n\023ListContextsRequest\022\016\n\006parent" +
       "\030\001 \001(\t\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_token\030" +
-      "\003 \001(\t\"f\n\024ListContextsResponse\0225\n\010context" +
+      "\003 \001(\t\"f\n\024ListContextsResponse\0225\n\010context",
       "s\030\001 \003(\0132#.google.cloud.dialogflow.v2.Con" +
       "text\022\027\n\017next_page_token\030\002 \001(\t\"!\n\021GetCont" +
       "extRequest\022\014\n\004name\030\001 \001(\t\"\\\n\024CreateContex" +
@@ -82,7 +82,7 @@ public static void registerAllExtensions(
       "#.google.cloud.dialogflow.v2.Context\022/\n\013" +
       "update_mask\030\002 \001(\0132\032.google.protobuf.Fiel" +
       "dMask\"$\n\024DeleteContextRequest\022\014\n\004name\030\001 " +
-      "\001(\t\"*\n\030DeleteAllContextsRequest\022\016\n\006paren" +
+      "\001(\t\"*\n\030DeleteAllContextsRequest\022\016\n\006paren",
       "t\030\001 \001(\t2\357\007\n\010Contexts\022\254\001\n\014ListContexts\022/." +
       "google.cloud.dialogflow.v2.ListContextsR" +
       "equest\0320.google.cloud.dialogflow.v2.List" +
@@ -92,7 +92,7 @@ public static void registerAllExtensions(
       "GetContextRequest\032#.google.cloud.dialogf" +
       "low.v2.Context\"9\202\323\344\223\0023\0221/v2/{name=projec" +
       "ts/*/agent/sessions/*/contexts/*}\022\252\001\n\rCr" +
-      "eateContext\0220.google.cloud.dialogflow.v2" +
+      "eateContext\0220.google.cloud.dialogflow.v2",
       ".CreateContextRequest\032#.google.cloud.dia" +
       "logflow.v2.Context\"B\202\323\344\223\002<\"1/v2/{parent=" +
       "projects/*/agent/sessions/*}/contexts:\007c" +
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "9/v2/{context.name=projects/*/agent/sess" +
       "ions/*/contexts/*}:\007context\022\224\001\n\rDeleteCo" +
       "ntext\0220.google.cloud.dialogflow.v2.Delet" +
-      "eContextRequest\032\026.google.protobuf.Empty\"" +
+      "eContextRequest\032\026.google.protobuf.Empty\"",
       "9\202\323\344\223\0023*1/v2/{name=projects/*/agent/sess" +
       "ions/*/contexts/*}\022\234\001\n\021DeleteAllContexts" +
       "\0224.google.cloud.dialogflow.v2.DeleteAllC" +
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateContextRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateContextRequest.java
index 6a5f7c7721ce..534049b8d558 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateContextRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateContextRequest.java
@@ -33,9 +33,6 @@ private CreateContextRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private CreateContextRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private CreateContextRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private CreateContextRequest(
     return com.google.cloud.dialogflow.v2.ContextProto.internal_static_google_cloud_dialogflow_v2_CreateContextRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.ContextProto.internal_static_google_cloud_dialogflow_v2_CreateContextRequest_fieldAccessorTable
@@ -176,7 +172,6 @@ public com.google.cloud.dialogflow.v2.ContextOrBuilder getContextOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -186,7 +181,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -198,7 +192,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -326,7 +319,6 @@ public static com.google.cloud.dialogflow.v2.CreateContextRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -334,7 +326,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.CreateContextRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -362,7 +353,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.ContextProto.internal_static_google_cloud_dialogflow_v2_CreateContextRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.ContextProto.internal_static_google_cloud_dialogflow_v2_CreateContextRequest_fieldAccessorTable
@@ -385,7 +375,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -399,18 +388,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.ContextProto.internal_static_google_cloud_dialogflow_v2_CreateContextRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.CreateContextRequest getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.CreateContextRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.CreateContextRequest build() {
       com.google.cloud.dialogflow.v2.CreateContextRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -419,7 +405,6 @@ public com.google.cloud.dialogflow.v2.CreateContextRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.CreateContextRequest buildPartial() {
       com.google.cloud.dialogflow.v2.CreateContextRequest result = new com.google.cloud.dialogflow.v2.CreateContextRequest(this);
       result.parent_ = parent_;
@@ -432,39 +417,32 @@ public com.google.cloud.dialogflow.v2.CreateContextRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.CreateContextRequest) {
         return mergeFrom((com.google.cloud.dialogflow.v2.CreateContextRequest)other);
@@ -488,12 +466,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.CreateContextRequest oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -758,13 +734,11 @@ public com.google.cloud.dialogflow.v2.ContextOrBuilder getContextOrBuilder() {
       }
       return contextBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -786,12 +760,11 @@ public static com.google.cloud.dialogflow.v2.CreateContextRequest getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateContextRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateContextRequest(input, extensionRegistry);
+        return new CreateContextRequest(input, extensionRegistry);
     }
   };
 
@@ -804,7 +777,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.CreateContextRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateEntityTypeRequest.java
index ae04d640ed81..c320a80c4931 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateEntityTypeRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateEntityTypeRequest.java
@@ -34,9 +34,6 @@ private CreateEntityTypeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private CreateEntityTypeRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private CreateEntityTypeRequest(
             languageCode_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private CreateEntityTypeRequest(
     return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_CreateEntityTypeRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_CreateEntityTypeRequest_fieldAccessorTable
@@ -233,7 +229,6 @@ public java.lang.String getLanguageCode() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -243,7 +238,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -258,7 +252,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -393,7 +386,6 @@ public static com.google.cloud.dialogflow.v2.CreateEntityTypeRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -401,7 +393,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.CreateEntityTypeRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -429,7 +420,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_CreateEntityTypeRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_CreateEntityTypeRequest_fieldAccessorTable
@@ -452,7 +442,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -468,18 +457,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_CreateEntityTypeRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.CreateEntityTypeRequest getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.CreateEntityTypeRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.CreateEntityTypeRequest build() {
       com.google.cloud.dialogflow.v2.CreateEntityTypeRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -488,7 +474,6 @@ public com.google.cloud.dialogflow.v2.CreateEntityTypeRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.CreateEntityTypeRequest buildPartial() {
       com.google.cloud.dialogflow.v2.CreateEntityTypeRequest result = new com.google.cloud.dialogflow.v2.CreateEntityTypeRequest(this);
       result.parent_ = parent_;
@@ -502,39 +487,32 @@ public com.google.cloud.dialogflow.v2.CreateEntityTypeRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.CreateEntityTypeRequest) {
         return mergeFrom((com.google.cloud.dialogflow.v2.CreateEntityTypeRequest)other);
@@ -562,12 +540,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.CreateEntityTypeRequest
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -941,13 +917,11 @@ public Builder setLanguageCodeBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -969,12 +943,11 @@ public static com.google.cloud.dialogflow.v2.CreateEntityTypeRequest getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateEntityTypeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateEntityTypeRequest(input, extensionRegistry);
+        return new CreateEntityTypeRequest(input, extensionRegistry);
     }
   };
 
@@ -987,7 +960,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.CreateEntityTypeRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateIntentRequest.java
index 6db92a65f24d..47eda4e174da 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateIntentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateIntentRequest.java
@@ -35,9 +35,6 @@ private CreateIntentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private CreateIntentRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -80,13 +84,6 @@ private CreateIntentRequest(
             intentView_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private CreateIntentRequest(
     return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_CreateIntentRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_CreateIntentRequest_fieldAccessorTable
@@ -259,13 +255,11 @@ public int getIntentViewValue() {
    * .google.cloud.dialogflow.v2.IntentView intent_view = 4;
    */
   public com.google.cloud.dialogflow.v2.IntentView getIntentView() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.IntentView result = com.google.cloud.dialogflow.v2.IntentView.valueOf(intentView_);
     return result == null ? com.google.cloud.dialogflow.v2.IntentView.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -275,7 +269,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -293,7 +286,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -435,7 +427,6 @@ public static com.google.cloud.dialogflow.v2.CreateIntentRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -443,7 +434,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.CreateIntentRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -471,7 +461,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_CreateIntentRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_CreateIntentRequest_fieldAccessorTable
@@ -494,7 +483,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -512,18 +500,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_CreateIntentRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.CreateIntentRequest getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.CreateIntentRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.CreateIntentRequest build() {
       com.google.cloud.dialogflow.v2.CreateIntentRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -532,7 +517,6 @@ public com.google.cloud.dialogflow.v2.CreateIntentRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.CreateIntentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.CreateIntentRequest result = new com.google.cloud.dialogflow.v2.CreateIntentRequest(this);
       result.parent_ = parent_;
@@ -547,39 +531,32 @@ public com.google.cloud.dialogflow.v2.CreateIntentRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.CreateIntentRequest) {
         return mergeFrom((com.google.cloud.dialogflow.v2.CreateIntentRequest)other);
@@ -610,12 +587,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.CreateIntentRequest othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1021,7 +996,6 @@ public Builder setIntentViewValue(int value) {
      * .google.cloud.dialogflow.v2.IntentView intent_view = 4;
      */
     public com.google.cloud.dialogflow.v2.IntentView getIntentView() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.IntentView result = com.google.cloud.dialogflow.v2.IntentView.valueOf(intentView_);
       return result == null ? com.google.cloud.dialogflow.v2.IntentView.UNRECOGNIZED : result;
     }
@@ -1054,13 +1028,11 @@ public Builder clearIntentView() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1082,12 +1054,11 @@ public static com.google.cloud.dialogflow.v2.CreateIntentRequest getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateIntentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateIntentRequest(input, extensionRegistry);
+        return new CreateIntentRequest(input, extensionRegistry);
     }
   };
 
@@ -1100,7 +1071,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.CreateIntentRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateSessionEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateSessionEntityTypeRequest.java
index 47314aabdc68..37a647932e5f 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateSessionEntityTypeRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/CreateSessionEntityTypeRequest.java
@@ -33,9 +33,6 @@ private CreateSessionEntityTypeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private CreateSessionEntityTypeRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private CreateSessionEntityTypeRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private CreateSessionEntityTypeRequest(
     return com.google.cloud.dialogflow.v2.SessionEntityTypeProto.internal_static_google_cloud_dialogflow_v2_CreateSessionEntityTypeRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.SessionEntityTypeProto.internal_static_google_cloud_dialogflow_v2_CreateSessionEntityTypeRequest_fieldAccessorTable
@@ -176,7 +172,6 @@ public com.google.cloud.dialogflow.v2.SessionEntityTypeOrBuilder getSessionEntit
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -186,7 +181,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -198,7 +192,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -326,7 +319,6 @@ public static com.google.cloud.dialogflow.v2.CreateSessionEntityTypeRequest pars
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -334,7 +326,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.CreateSessionEntityTypeRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -362,7 +353,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.SessionEntityTypeProto.internal_static_google_cloud_dialogflow_v2_CreateSessionEntityTypeRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.SessionEntityTypeProto.internal_static_google_cloud_dialogflow_v2_CreateSessionEntityTypeRequest_fieldAccessorTable
@@ -385,7 +375,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -399,18 +388,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.SessionEntityTypeProto.internal_static_google_cloud_dialogflow_v2_CreateSessionEntityTypeRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.CreateSessionEntityTypeRequest getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.CreateSessionEntityTypeRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.CreateSessionEntityTypeRequest build() {
       com.google.cloud.dialogflow.v2.CreateSessionEntityTypeRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -419,7 +405,6 @@ public com.google.cloud.dialogflow.v2.CreateSessionEntityTypeRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.CreateSessionEntityTypeRequest buildPartial() {
       com.google.cloud.dialogflow.v2.CreateSessionEntityTypeRequest result = new com.google.cloud.dialogflow.v2.CreateSessionEntityTypeRequest(this);
       result.parent_ = parent_;
@@ -432,39 +417,32 @@ public com.google.cloud.dialogflow.v2.CreateSessionEntityTypeRequest buildPartia
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.CreateSessionEntityTypeRequest) {
         return mergeFrom((com.google.cloud.dialogflow.v2.CreateSessionEntityTypeRequest)other);
@@ -488,12 +466,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.CreateSessionEntityTypeR
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -758,13 +734,11 @@ public com.google.cloud.dialogflow.v2.SessionEntityTypeOrBuilder getSessionEntit
       }
       return sessionEntityTypeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -786,12 +760,11 @@ public static com.google.cloud.dialogflow.v2.CreateSessionEntityTypeRequest getD
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateSessionEntityTypeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateSessionEntityTypeRequest(input, extensionRegistry);
+        return new CreateSessionEntityTypeRequest(input, extensionRegistry);
     }
   };
 
@@ -804,7 +777,6 @@ public com.google.protobuf.Parser getParserForTy
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.CreateSessionEntityTypeRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteAllContextsRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteAllContextsRequest.java
index d8ca268a646d..2a8b1b9aac1d 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteAllContextsRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteAllContextsRequest.java
@@ -33,9 +33,6 @@ private DeleteAllContextsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteAllContextsRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            parent_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteAllContextsRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            parent_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteAllContextsRequest(
     return com.google.cloud.dialogflow.v2.ContextProto.internal_static_google_cloud_dialogflow_v2_DeleteAllContextsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.ContextProto.internal_static_google_cloud_dialogflow_v2_DeleteAllContextsRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getParent() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.cloud.dialogflow.v2.DeleteAllContextsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.DeleteAllContextsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.ContextProto.internal_static_google_cloud_dialogflow_v2_DeleteAllContextsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.ContextProto.internal_static_google_cloud_dialogflow_v2_DeleteAllContextsRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.ContextProto.internal_static_google_cloud_dialogflow_v2_DeleteAllContextsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.DeleteAllContextsRequest getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.DeleteAllContextsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.DeleteAllContextsRequest build() {
       com.google.cloud.dialogflow.v2.DeleteAllContextsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.cloud.dialogflow.v2.DeleteAllContextsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.DeleteAllContextsRequest buildPartial() {
       com.google.cloud.dialogflow.v2.DeleteAllContextsRequest result = new com.google.cloud.dialogflow.v2.DeleteAllContextsRequest(this);
       result.parent_ = parent_;
@@ -359,39 +344,32 @@ public com.google.cloud.dialogflow.v2.DeleteAllContextsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.DeleteAllContextsRequest) {
         return mergeFrom((com.google.cloud.dialogflow.v2.DeleteAllContextsRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.DeleteAllContextsRequest
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setParentBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.cloud.dialogflow.v2.DeleteAllContextsRequest getDefault
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteAllContextsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteAllContextsRequest(input, extensionRegistry);
+        return new DeleteAllContextsRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.DeleteAllContextsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteContextRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteContextRequest.java
index ccbda22bb15c..533dbea8ae0c 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteContextRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteContextRequest.java
@@ -33,9 +33,6 @@ private DeleteContextRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteContextRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteContextRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteContextRequest(
     return com.google.cloud.dialogflow.v2.ContextProto.internal_static_google_cloud_dialogflow_v2_DeleteContextRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.ContextProto.internal_static_google_cloud_dialogflow_v2_DeleteContextRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.cloud.dialogflow.v2.DeleteContextRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.DeleteContextRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.ContextProto.internal_static_google_cloud_dialogflow_v2_DeleteContextRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.ContextProto.internal_static_google_cloud_dialogflow_v2_DeleteContextRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.ContextProto.internal_static_google_cloud_dialogflow_v2_DeleteContextRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.DeleteContextRequest getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.DeleteContextRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.DeleteContextRequest build() {
       com.google.cloud.dialogflow.v2.DeleteContextRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.cloud.dialogflow.v2.DeleteContextRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.DeleteContextRequest buildPartial() {
       com.google.cloud.dialogflow.v2.DeleteContextRequest result = new com.google.cloud.dialogflow.v2.DeleteContextRequest(this);
       result.name_ = name_;
@@ -359,39 +344,32 @@ public com.google.cloud.dialogflow.v2.DeleteContextRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.DeleteContextRequest) {
         return mergeFrom((com.google.cloud.dialogflow.v2.DeleteContextRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.DeleteContextRequest oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.cloud.dialogflow.v2.DeleteContextRequest getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteContextRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteContextRequest(input, extensionRegistry);
+        return new DeleteContextRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.DeleteContextRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteEntityTypeRequest.java
index e35961fbe1f5..15038e13c25c 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteEntityTypeRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteEntityTypeRequest.java
@@ -33,9 +33,6 @@ private DeleteEntityTypeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteEntityTypeRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteEntityTypeRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteEntityTypeRequest(
     return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_DeleteEntityTypeRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_DeleteEntityTypeRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.cloud.dialogflow.v2.DeleteEntityTypeRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.DeleteEntityTypeRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_DeleteEntityTypeRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_DeleteEntityTypeRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_DeleteEntityTypeRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.DeleteEntityTypeRequest getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.DeleteEntityTypeRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.DeleteEntityTypeRequest build() {
       com.google.cloud.dialogflow.v2.DeleteEntityTypeRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.cloud.dialogflow.v2.DeleteEntityTypeRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.DeleteEntityTypeRequest buildPartial() {
       com.google.cloud.dialogflow.v2.DeleteEntityTypeRequest result = new com.google.cloud.dialogflow.v2.DeleteEntityTypeRequest(this);
       result.name_ = name_;
@@ -359,39 +344,32 @@ public com.google.cloud.dialogflow.v2.DeleteEntityTypeRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.DeleteEntityTypeRequest) {
         return mergeFrom((com.google.cloud.dialogflow.v2.DeleteEntityTypeRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.DeleteEntityTypeRequest
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.cloud.dialogflow.v2.DeleteEntityTypeRequest getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteEntityTypeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteEntityTypeRequest(input, extensionRegistry);
+        return new DeleteEntityTypeRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.DeleteEntityTypeRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteIntentRequest.java
index 8d08ef91ad7c..2fd223bc6a49 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteIntentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteIntentRequest.java
@@ -33,9 +33,6 @@ private DeleteIntentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteIntentRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteIntentRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteIntentRequest(
     return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_DeleteIntentRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_DeleteIntentRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.cloud.dialogflow.v2.DeleteIntentRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.DeleteIntentRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_DeleteIntentRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_DeleteIntentRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_DeleteIntentRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.DeleteIntentRequest getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.DeleteIntentRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.DeleteIntentRequest build() {
       com.google.cloud.dialogflow.v2.DeleteIntentRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.cloud.dialogflow.v2.DeleteIntentRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.DeleteIntentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.DeleteIntentRequest result = new com.google.cloud.dialogflow.v2.DeleteIntentRequest(this);
       result.name_ = name_;
@@ -359,39 +344,32 @@ public com.google.cloud.dialogflow.v2.DeleteIntentRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.DeleteIntentRequest) {
         return mergeFrom((com.google.cloud.dialogflow.v2.DeleteIntentRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.DeleteIntentRequest othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.cloud.dialogflow.v2.DeleteIntentRequest getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteIntentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteIntentRequest(input, extensionRegistry);
+        return new DeleteIntentRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.DeleteIntentRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteSessionEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteSessionEntityTypeRequest.java
index 74839144018d..ab3fb5a8c3ec 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteSessionEntityTypeRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DeleteSessionEntityTypeRequest.java
@@ -33,9 +33,6 @@ private DeleteSessionEntityTypeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteSessionEntityTypeRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteSessionEntityTypeRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteSessionEntityTypeRequest(
     return com.google.cloud.dialogflow.v2.SessionEntityTypeProto.internal_static_google_cloud_dialogflow_v2_DeleteSessionEntityTypeRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.SessionEntityTypeProto.internal_static_google_cloud_dialogflow_v2_DeleteSessionEntityTypeRequest_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.dialogflow.v2.DeleteSessionEntityTypeRequest pars
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.DeleteSessionEntityTypeRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.SessionEntityTypeProto.internal_static_google_cloud_dialogflow_v2_DeleteSessionEntityTypeRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.SessionEntityTypeProto.internal_static_google_cloud_dialogflow_v2_DeleteSessionEntityTypeRequest_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.SessionEntityTypeProto.internal_static_google_cloud_dialogflow_v2_DeleteSessionEntityTypeRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.DeleteSessionEntityTypeRequest getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.DeleteSessionEntityTypeRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.DeleteSessionEntityTypeRequest build() {
       com.google.cloud.dialogflow.v2.DeleteSessionEntityTypeRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.dialogflow.v2.DeleteSessionEntityTypeRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.DeleteSessionEntityTypeRequest buildPartial() {
       com.google.cloud.dialogflow.v2.DeleteSessionEntityTypeRequest result = new com.google.cloud.dialogflow.v2.DeleteSessionEntityTypeRequest(this);
       result.name_ = name_;
@@ -361,39 +346,32 @@ public com.google.cloud.dialogflow.v2.DeleteSessionEntityTypeRequest buildPartia
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.DeleteSessionEntityTypeRequest) {
         return mergeFrom((com.google.cloud.dialogflow.v2.DeleteSessionEntityTypeRequest)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.DeleteSessionEntityTypeR
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.dialogflow.v2.DeleteSessionEntityTypeRequest getD
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteSessionEntityTypeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteSessionEntityTypeRequest(input, extensionRegistry);
+        return new DeleteSessionEntityTypeRequest(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForTy
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.DeleteSessionEntityTypeRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequest.java
index 6f3936f76249..4c39c760859a 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequest.java
@@ -34,9 +34,6 @@ private DetectIntentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private DetectIntentRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -85,13 +89,6 @@ private DetectIntentRequest(
             inputAudio_ = input.readBytes();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -109,7 +106,6 @@ private DetectIntentRequest(
     return com.google.cloud.dialogflow.v2.SessionProto.internal_static_google_cloud_dialogflow_v2_DetectIntentRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.SessionProto.internal_static_google_cloud_dialogflow_v2_DetectIntentRequest_fieldAccessorTable
@@ -261,7 +257,6 @@ public com.google.protobuf.ByteString getInputAudio() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -271,7 +266,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getSessionBytes().isEmpty()) {
@@ -289,7 +283,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -438,7 +431,6 @@ public static com.google.cloud.dialogflow.v2.DetectIntentRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -446,7 +438,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.DetectIntentRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -474,7 +465,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.SessionProto.internal_static_google_cloud_dialogflow_v2_DetectIntentRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.SessionProto.internal_static_google_cloud_dialogflow_v2_DetectIntentRequest_fieldAccessorTable
@@ -497,7 +487,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       session_ = "";
@@ -519,18 +508,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.SessionProto.internal_static_google_cloud_dialogflow_v2_DetectIntentRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.DetectIntentRequest getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.DetectIntentRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.DetectIntentRequest build() {
       com.google.cloud.dialogflow.v2.DetectIntentRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -539,7 +525,6 @@ public com.google.cloud.dialogflow.v2.DetectIntentRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.DetectIntentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.DetectIntentRequest result = new com.google.cloud.dialogflow.v2.DetectIntentRequest(this);
       result.session_ = session_;
@@ -558,39 +543,32 @@ public com.google.cloud.dialogflow.v2.DetectIntentRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.DetectIntentRequest) {
         return mergeFrom((com.google.cloud.dialogflow.v2.DetectIntentRequest)other);
@@ -620,12 +598,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.DetectIntentRequest othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1141,13 +1117,11 @@ public Builder clearInputAudio() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1169,12 +1143,11 @@ public static com.google.cloud.dialogflow.v2.DetectIntentRequest getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DetectIntentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DetectIntentRequest(input, extensionRegistry);
+        return new DetectIntentRequest(input, extensionRegistry);
     }
   };
 
@@ -1187,7 +1160,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.DetectIntentRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentResponse.java
index 9e6d7729911e..b2fcd3f0444d 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentResponse.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentResponse.java
@@ -33,9 +33,6 @@ private DetectIntentResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private DetectIntentResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -79,13 +83,6 @@ private DetectIntentResponse(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private DetectIntentResponse(
     return com.google.cloud.dialogflow.v2.SessionProto.internal_static_google_cloud_dialogflow_v2_DetectIntentResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.SessionProto.internal_static_google_cloud_dialogflow_v2_DetectIntentResponse_fieldAccessorTable
@@ -225,7 +221,6 @@ public com.google.rpc.StatusOrBuilder getWebhookStatusOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -235,7 +230,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getResponseIdBytes().isEmpty()) {
@@ -250,7 +244,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -391,7 +384,6 @@ public static com.google.cloud.dialogflow.v2.DetectIntentResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -399,7 +391,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.DetectIntentResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -427,7 +418,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.SessionProto.internal_static_google_cloud_dialogflow_v2_DetectIntentResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.SessionProto.internal_static_google_cloud_dialogflow_v2_DetectIntentResponse_fieldAccessorTable
@@ -450,7 +440,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       responseId_ = "";
@@ -470,18 +459,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.SessionProto.internal_static_google_cloud_dialogflow_v2_DetectIntentResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.DetectIntentResponse getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.DetectIntentResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.DetectIntentResponse build() {
       com.google.cloud.dialogflow.v2.DetectIntentResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -490,7 +476,6 @@ public com.google.cloud.dialogflow.v2.DetectIntentResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.DetectIntentResponse buildPartial() {
       com.google.cloud.dialogflow.v2.DetectIntentResponse result = new com.google.cloud.dialogflow.v2.DetectIntentResponse(this);
       result.responseId_ = responseId_;
@@ -508,39 +493,32 @@ public com.google.cloud.dialogflow.v2.DetectIntentResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.DetectIntentResponse) {
         return mergeFrom((com.google.cloud.dialogflow.v2.DetectIntentResponse)other);
@@ -567,12 +545,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.DetectIntentResponse oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -999,13 +975,11 @@ public com.google.rpc.StatusOrBuilder getWebhookStatusOrBuilder() {
       }
       return webhookStatusBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1027,12 +1001,11 @@ public static com.google.cloud.dialogflow.v2.DetectIntentResponse getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DetectIntentResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DetectIntentResponse(input, extensionRegistry);
+        return new DetectIntentResponse(input, extensionRegistry);
     }
   };
 
@@ -1045,7 +1018,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.DetectIntentResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityType.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityType.java
index 18658bd7ed4a..8e036c48bc63 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityType.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityType.java
@@ -39,9 +39,6 @@ private EntityType(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private EntityType(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -86,13 +90,6 @@ private EntityType(
                 input.readMessage(com.google.cloud.dialogflow.v2.EntityType.Entity.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -113,7 +110,6 @@ private EntityType(
     return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_EntityType_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_EntityType_fieldAccessorTable
@@ -486,9 +482,6 @@ private Entity(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -500,6 +493,13 @@ private Entity(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -515,13 +515,6 @@ private Entity(
               synonyms_.add(s);
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -542,7 +535,6 @@ private Entity(
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_EntityType_Entity_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_EntityType_Entity_fieldAccessorTable
@@ -653,7 +645,6 @@ public java.lang.String getSynonyms(int index) {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -663,7 +654,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getValueBytes().isEmpty()) {
@@ -675,7 +665,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -804,7 +793,6 @@ public static com.google.cloud.dialogflow.v2.EntityType.Entity parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -812,7 +800,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.dialogflow.v2.EntityType.Entity prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -840,7 +827,6 @@ public static final class Builder extends
         return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_EntityType_Entity_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_EntityType_Entity_fieldAccessorTable
@@ -863,7 +849,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         value_ = "";
@@ -873,18 +858,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_EntityType_Entity_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.dialogflow.v2.EntityType.Entity getDefaultInstanceForType() {
         return com.google.cloud.dialogflow.v2.EntityType.Entity.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.dialogflow.v2.EntityType.Entity build() {
         com.google.cloud.dialogflow.v2.EntityType.Entity result = buildPartial();
         if (!result.isInitialized()) {
@@ -893,7 +875,6 @@ public com.google.cloud.dialogflow.v2.EntityType.Entity build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.dialogflow.v2.EntityType.Entity buildPartial() {
         com.google.cloud.dialogflow.v2.EntityType.Entity result = new com.google.cloud.dialogflow.v2.EntityType.Entity(this);
         int from_bitField0_ = bitField0_;
@@ -909,39 +890,32 @@ public com.google.cloud.dialogflow.v2.EntityType.Entity buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.dialogflow.v2.EntityType.Entity) {
           return mergeFrom((com.google.cloud.dialogflow.v2.EntityType.Entity)other);
@@ -972,12 +946,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.EntityType.Entity other)
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1249,13 +1221,11 @@ public Builder addSynonymsBytes(
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1277,12 +1247,11 @@ public static com.google.cloud.dialogflow.v2.EntityType.Entity getDefaultInstanc
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Entity parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Entity(input, extensionRegistry);
+          return new Entity(input, extensionRegistry);
       }
     };
 
@@ -1295,7 +1264,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.EntityType.Entity getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1413,7 +1381,6 @@ public int getKindValue() {
    * .google.cloud.dialogflow.v2.EntityType.Kind kind = 3;
    */
   public com.google.cloud.dialogflow.v2.EntityType.Kind getKind() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.EntityType.Kind result = com.google.cloud.dialogflow.v2.EntityType.Kind.valueOf(kind_);
     return result == null ? com.google.cloud.dialogflow.v2.EntityType.Kind.UNRECOGNIZED : result;
   }
@@ -1440,7 +1407,6 @@ public int getAutoExpansionModeValue() {
    * .google.cloud.dialogflow.v2.EntityType.AutoExpansionMode auto_expansion_mode = 4;
    */
   public com.google.cloud.dialogflow.v2.EntityType.AutoExpansionMode getAutoExpansionMode() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.EntityType.AutoExpansionMode result = com.google.cloud.dialogflow.v2.EntityType.AutoExpansionMode.valueOf(autoExpansionMode_);
     return result == null ? com.google.cloud.dialogflow.v2.EntityType.AutoExpansionMode.UNRECOGNIZED : result;
   }
@@ -1501,7 +1467,6 @@ public com.google.cloud.dialogflow.v2.EntityType.EntityOrBuilder getEntitiesOrBu
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1511,7 +1476,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -1532,7 +1496,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1678,7 +1641,6 @@ public static com.google.cloud.dialogflow.v2.EntityType parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1686,7 +1648,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.EntityType prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1716,7 +1677,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_EntityType_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_EntityType_fieldAccessorTable
@@ -1740,7 +1700,6 @@ private void maybeForceBuilderInitialization() {
         getEntitiesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -1760,18 +1719,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_EntityType_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.EntityType getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.EntityType.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.EntityType build() {
       com.google.cloud.dialogflow.v2.EntityType result = buildPartial();
       if (!result.isInitialized()) {
@@ -1780,7 +1736,6 @@ public com.google.cloud.dialogflow.v2.EntityType build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.EntityType buildPartial() {
       com.google.cloud.dialogflow.v2.EntityType result = new com.google.cloud.dialogflow.v2.EntityType(this);
       int from_bitField0_ = bitField0_;
@@ -1803,39 +1758,32 @@ public com.google.cloud.dialogflow.v2.EntityType buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.EntityType) {
         return mergeFrom((com.google.cloud.dialogflow.v2.EntityType)other);
@@ -1892,12 +1840,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.EntityType other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2141,7 +2087,6 @@ public Builder setKindValue(int value) {
      * .google.cloud.dialogflow.v2.EntityType.Kind kind = 3;
      */
     public com.google.cloud.dialogflow.v2.EntityType.Kind getKind() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.EntityType.Kind result = com.google.cloud.dialogflow.v2.EntityType.Kind.valueOf(kind_);
       return result == null ? com.google.cloud.dialogflow.v2.EntityType.Kind.UNRECOGNIZED : result;
     }
@@ -2209,7 +2154,6 @@ public Builder setAutoExpansionModeValue(int value) {
      * .google.cloud.dialogflow.v2.EntityType.AutoExpansionMode auto_expansion_mode = 4;
      */
     public com.google.cloud.dialogflow.v2.EntityType.AutoExpansionMode getAutoExpansionMode() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.EntityType.AutoExpansionMode result = com.google.cloud.dialogflow.v2.EntityType.AutoExpansionMode.valueOf(autoExpansionMode_);
       return result == null ? com.google.cloud.dialogflow.v2.EntityType.AutoExpansionMode.UNRECOGNIZED : result;
     }
@@ -2556,13 +2500,11 @@ public com.google.cloud.dialogflow.v2.EntityType.Entity.Builder addEntitiesBuild
       }
       return entitiesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2584,12 +2526,11 @@ public static com.google.cloud.dialogflow.v2.EntityType getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public EntityType parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new EntityType(input, extensionRegistry);
+        return new EntityType(input, extensionRegistry);
     }
   };
 
@@ -2602,7 +2543,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.EntityType getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeBatch.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeBatch.java
index 2e0527405bd3..2322567346a7 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeBatch.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeBatch.java
@@ -33,9 +33,6 @@ private EntityTypeBatch(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private EntityTypeBatch(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               entityTypes_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private EntityTypeBatch(
                 input.readMessage(com.google.cloud.dialogflow.v2.EntityType.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private EntityTypeBatch(
     return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_EntityTypeBatch_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_EntityTypeBatch_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.cloud.dialogflow.v2.EntityTypeOrBuilder getEntityTypesOrBuilde
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < entityTypes_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.dialogflow.v2.EntityTypeBatch parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.EntityTypeBatch prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_EntityTypeBatch_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_EntityTypeBatch_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getEntityTypesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (entityTypesBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_EntityTypeBatch_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.EntityTypeBatch getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.EntityTypeBatch.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.EntityTypeBatch build() {
       com.google.cloud.dialogflow.v2.EntityTypeBatch result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.cloud.dialogflow.v2.EntityTypeBatch build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.EntityTypeBatch buildPartial() {
       com.google.cloud.dialogflow.v2.EntityTypeBatch result = new com.google.cloud.dialogflow.v2.EntityTypeBatch(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.cloud.dialogflow.v2.EntityTypeBatch buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.EntityTypeBatch) {
         return mergeFrom((com.google.cloud.dialogflow.v2.EntityTypeBatch)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.EntityTypeBatch other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.cloud.dialogflow.v2.EntityType.Builder addEntityTypesBuilder(
       }
       return entityTypesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.cloud.dialogflow.v2.EntityTypeBatch getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public EntityTypeBatch parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new EntityTypeBatch(input, extensionRegistry);
+        return new EntityTypeBatch(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.EntityTypeBatch getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeProto.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeProto.java
index ef423e7ebb89..2447a418e7bb 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeProto.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypeProto.java
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "ntityType\022\014\n\004name\030\001 \001(\t\022\024\n\014display_name\030" +
       "\002 \001(\t\0229\n\004kind\030\003 \001(\0162+.google.cloud.dialo" +
       "gflow.v2.EntityType.Kind\022U\n\023auto_expansi" +
-      "on_mode\030\004 \001(\01628.google.cloud.dialogflow." +
+      "on_mode\030\004 \001(\01628.google.cloud.dialogflow.",
       "v2.EntityType.AutoExpansionMode\022?\n\010entit" +
       "ies\030\006 \003(\0132-.google.cloud.dialogflow.v2.E" +
       "ntityType.Entity\032)\n\006Entity\022\r\n\005value\030\001 \001(" +
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       "DE_UNSPECIFIED\020\000\022\037\n\033AUTO_EXPANSION_MODE_" +
       "DEFAULT\020\001\"f\n\026ListEntityTypesRequest\022\016\n\006p" +
       "arent\030\001 \001(\t\022\025\n\rlanguage_code\030\002 \001(\t\022\021\n\tpa" +
-      "ge_size\030\003 \001(\005\022\022\n\npage_token\030\004 \001(\t\"p\n\027Lis" +
+      "ge_size\030\003 \001(\005\022\022\n\npage_token\030\004 \001(\t\"p\n\027Lis",
       "tEntityTypesResponse\022<\n\014entity_types\030\001 \003" +
       "(\0132&.google.cloud.dialogflow.v2.EntityTy" +
       "pe\022\027\n\017next_page_token\030\002 \001(\t\";\n\024GetEntity" +
@@ -127,7 +127,7 @@ public static void registerAllExtensions(
       "e.cloud.dialogflow.v2.EntityType\022\025\n\rlang" +
       "uage_code\030\003 \001(\t\"\236\001\n\027UpdateEntityTypeRequ" +
       "est\022;\n\013entity_type\030\001 \001(\0132&.google.cloud." +
-      "dialogflow.v2.EntityType\022\025\n\rlanguage_cod" +
+      "dialogflow.v2.EntityType\022\025\n\rlanguage_cod",
       "e\030\002 \001(\t\022/\n\013update_mask\030\003 \001(\0132\032.google.pr" +
       "otobuf.FieldMask\"\'\n\027DeleteEntityTypeRequ" +
       "est\022\014\n\004name\030\001 \001(\t\"\376\001\n\035BatchUpdateEntityT" +
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       ".v2.EntityTypeBatchH\000\022\025\n\rlanguage_code\030\004" +
       " \001(\t\022/\n\013update_mask\030\005 \001(\0132\032.google.proto" +
       "buf.FieldMaskB\023\n\021entity_type_batch\"^\n\036Ba" +
-      "tchUpdateEntityTypesResponse\022<\n\014entity_t" +
+      "tchUpdateEntityTypesResponse\022<\n\014entity_t",
       "ypes\030\001 \003(\0132&.google.cloud.dialogflow.v2." +
       "EntityType\"J\n\035BatchDeleteEntityTypesRequ" +
       "est\022\016\n\006parent\030\001 \001(\t\022\031\n\021entity_type_names" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "\n\rlanguage_code\030\003 \001(\t\"\265\001\n\032BatchUpdateEnt" +
       "itiesRequest\022\016\n\006parent\030\001 \001(\t\022?\n\010entities" +
       "\030\002 \003(\0132-.google.cloud.dialogflow.v2.Enti" +
-      "tyType.Entity\022\025\n\rlanguage_code\030\003 \001(\t\022/\n\013" +
+      "tyType.Entity\022\025\n\rlanguage_code\030\003 \001(\t\022/\n\013",
       "update_mask\030\004 \001(\0132\032.google.protobuf.Fiel" +
       "dMask\"Z\n\032BatchDeleteEntitiesRequest\022\016\n\006p" +
       "arent\030\001 \001(\t\022\025\n\rentity_values\030\002 \003(\t\022\025\n\rla" +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       "istEntityTypes\0222.google.cloud.dialogflow" +
       ".v2.ListEntityTypesRequest\0323.google.clou" +
       "d.dialogflow.v2.ListEntityTypesResponse\"" +
-      "1\202\323\344\223\002+\022)/v2/{parent=projects/*/agent}/e" +
+      "1\202\323\344\223\002+\022)/v2/{parent=projects/*/agent}/e",
       "ntityTypes\022\234\001\n\rGetEntityType\0220.google.cl" +
       "oud.dialogflow.v2.GetEntityTypeRequest\032&" +
       ".google.cloud.dialogflow.v2.EntityType\"1" +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       "est\032&.google.cloud.dialogflow.v2.EntityT" +
       "ype\">\202\323\344\223\0028\")/v2/{parent=projects/*/agen" +
       "t}/entityTypes:\013entity_type\022\273\001\n\020UpdateEn" +
-      "tityType\0223.google.cloud.dialogflow.v2.Up" +
+      "tityType\0223.google.cloud.dialogflow.v2.Up",
       "dateEntityTypeRequest\032&.google.cloud.dia" +
       "logflow.v2.EntityType\"J\202\323\344\223\002D25/v2/{enti" +
       "ty_type.name=projects/*/agent/entityType" +
@@ -177,7 +177,7 @@ public static void registerAllExtensions(
       "\223\002+*)/v2/{name=projects/*/agent/entityTy" +
       "pes/*}\022\264\001\n\026BatchUpdateEntityTypes\0229.goog" +
       "le.cloud.dialogflow.v2.BatchUpdateEntity" +
-      "TypesRequest\032\035.google.longrunning.Operat" +
+      "TypesRequest\032\035.google.longrunning.Operat",
       "ion\"@\202\323\344\223\002:\"5/v2/{parent=projects/*/agen" +
       "t}/entityTypes:batchUpdate:\001*\022\264\001\n\026BatchD" +
       "eleteEntityTypes\0229.google.cloud.dialogfl" +
@@ -187,7 +187,7 @@ public static void registerAllExtensions(
       "tchDelete:\001*\022\271\001\n\023BatchCreateEntities\0226.g" +
       "oogle.cloud.dialogflow.v2.BatchCreateEnt" +
       "itiesRequest\032\035.google.longrunning.Operat" +
-      "ion\"K\202\323\344\223\002E\"@/v2/{parent=projects/*/agen" +
+      "ion\"K\202\323\344\223\002E\"@/v2/{parent=projects/*/agen",
       "t/entityTypes/*}/entities:batchCreate:\001*" +
       "\022\271\001\n\023BatchUpdateEntities\0226.google.cloud." +
       "dialogflow.v2.BatchUpdateEntitiesRequest" +
@@ -197,7 +197,7 @@ public static void registerAllExtensions(
       "leteEntities\0226.google.cloud.dialogflow.v" +
       "2.BatchDeleteEntitiesRequest\032\035.google.lo" +
       "ngrunning.Operation\"K\202\323\344\223\002E\"@/v2/{parent" +
-      "=projects/*/agent/entityTypes/*}/entitie" +
+      "=projects/*/agent/entityTypes/*}/entitie",
       "s:batchDelete:\001*B\236\001\n\036com.google.cloud.di" +
       "alogflow.v2B\017EntityTypeProtoP\001ZDgoogle.g" +
       "olang.org/genproto/googleapis/cloud/dial" +
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EventInput.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EventInput.java
index 7f26ee1fef9a..d7f98cfbd2a2 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EventInput.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EventInput.java
@@ -38,9 +38,6 @@ private EventInput(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private EventInput(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -77,13 +81,6 @@ private EventInput(
             languageCode_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -101,7 +98,6 @@ private EventInput(
     return com.google.cloud.dialogflow.v2.SessionProto.internal_static_google_cloud_dialogflow_v2_EventInput_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.SessionProto.internal_static_google_cloud_dialogflow_v2_EventInput_fieldAccessorTable
@@ -233,7 +229,6 @@ public java.lang.String getLanguageCode() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -243,7 +238,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -258,7 +252,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -393,7 +386,6 @@ public static com.google.cloud.dialogflow.v2.EventInput parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -401,7 +393,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.EventInput prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -433,7 +424,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.SessionProto.internal_static_google_cloud_dialogflow_v2_EventInput_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.SessionProto.internal_static_google_cloud_dialogflow_v2_EventInput_fieldAccessorTable
@@ -456,7 +446,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -472,18 +461,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.SessionProto.internal_static_google_cloud_dialogflow_v2_EventInput_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.EventInput getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.EventInput.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.EventInput build() {
       com.google.cloud.dialogflow.v2.EventInput result = buildPartial();
       if (!result.isInitialized()) {
@@ -492,7 +478,6 @@ public com.google.cloud.dialogflow.v2.EventInput build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.EventInput buildPartial() {
       com.google.cloud.dialogflow.v2.EventInput result = new com.google.cloud.dialogflow.v2.EventInput(this);
       result.name_ = name_;
@@ -506,39 +491,32 @@ public com.google.cloud.dialogflow.v2.EventInput buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.EventInput) {
         return mergeFrom((com.google.cloud.dialogflow.v2.EventInput)other);
@@ -566,12 +544,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.EventInput other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -935,13 +911,11 @@ public Builder setLanguageCodeBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -963,12 +937,11 @@ public static com.google.cloud.dialogflow.v2.EventInput getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public EventInput parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new EventInput(input, extensionRegistry);
+        return new EventInput(input, extensionRegistry);
     }
   };
 
@@ -981,7 +954,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.EventInput getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentRequest.java
index c4ed193e97ba..6bda5850db24 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentRequest.java
@@ -34,9 +34,6 @@ private ExportAgentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ExportAgentRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private ExportAgentRequest(
             agentUri_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private ExportAgentRequest(
     return com.google.cloud.dialogflow.v2.AgentProto.internal_static_google_cloud_dialogflow_v2_ExportAgentRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.AgentProto.internal_static_google_cloud_dialogflow_v2_ExportAgentRequest_fieldAccessorTable
@@ -183,7 +179,6 @@ public java.lang.String getAgentUri() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -193,7 +188,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -205,7 +199,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -327,7 +320,6 @@ public static com.google.cloud.dialogflow.v2.ExportAgentRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -335,7 +327,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.ExportAgentRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -363,7 +354,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.AgentProto.internal_static_google_cloud_dialogflow_v2_ExportAgentRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.AgentProto.internal_static_google_cloud_dialogflow_v2_ExportAgentRequest_fieldAccessorTable
@@ -386,7 +376,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -396,18 +385,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.AgentProto.internal_static_google_cloud_dialogflow_v2_ExportAgentRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.ExportAgentRequest getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.ExportAgentRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.ExportAgentRequest build() {
       com.google.cloud.dialogflow.v2.ExportAgentRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -416,7 +402,6 @@ public com.google.cloud.dialogflow.v2.ExportAgentRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.ExportAgentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.ExportAgentRequest result = new com.google.cloud.dialogflow.v2.ExportAgentRequest(this);
       result.parent_ = parent_;
@@ -425,39 +410,32 @@ public com.google.cloud.dialogflow.v2.ExportAgentRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.ExportAgentRequest) {
         return mergeFrom((com.google.cloud.dialogflow.v2.ExportAgentRequest)other);
@@ -482,12 +460,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ExportAgentRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -698,13 +674,11 @@ public Builder setAgentUriBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -726,12 +700,11 @@ public static com.google.cloud.dialogflow.v2.ExportAgentRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ExportAgentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ExportAgentRequest(input, extensionRegistry);
+        return new ExportAgentRequest(input, extensionRegistry);
     }
   };
 
@@ -744,7 +717,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.ExportAgentRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentResponse.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentResponse.java
index e16f99103ff4..0fea43564697 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentResponse.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ExportAgentResponse.java
@@ -32,9 +32,6 @@ private ExportAgentResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private ExportAgentResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             agentCase_ = 1;
@@ -57,13 +61,6 @@ private ExportAgentResponse(
             agent_ = input.readBytes();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -81,7 +78,6 @@ private ExportAgentResponse(
     return com.google.cloud.dialogflow.v2.AgentProto.internal_static_google_cloud_dialogflow_v2_ExportAgentResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.AgentProto.internal_static_google_cloud_dialogflow_v2_ExportAgentResponse_fieldAccessorTable
@@ -207,7 +203,6 @@ public com.google.protobuf.ByteString getAgentContent() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -217,7 +212,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (agentCase_ == 1) {
@@ -230,7 +224,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -373,7 +366,6 @@ public static com.google.cloud.dialogflow.v2.ExportAgentResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -381,7 +373,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.ExportAgentResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -409,7 +400,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.AgentProto.internal_static_google_cloud_dialogflow_v2_ExportAgentResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.AgentProto.internal_static_google_cloud_dialogflow_v2_ExportAgentResponse_fieldAccessorTable
@@ -432,7 +422,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       agentCase_ = 0;
@@ -440,18 +429,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.AgentProto.internal_static_google_cloud_dialogflow_v2_ExportAgentResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.ExportAgentResponse getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.ExportAgentResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.ExportAgentResponse build() {
       com.google.cloud.dialogflow.v2.ExportAgentResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -460,7 +446,6 @@ public com.google.cloud.dialogflow.v2.ExportAgentResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.ExportAgentResponse buildPartial() {
       com.google.cloud.dialogflow.v2.ExportAgentResponse result = new com.google.cloud.dialogflow.v2.ExportAgentResponse(this);
       if (agentCase_ == 1) {
@@ -474,39 +459,32 @@ public com.google.cloud.dialogflow.v2.ExportAgentResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.ExportAgentResponse) {
         return mergeFrom((com.google.cloud.dialogflow.v2.ExportAgentResponse)other);
@@ -538,12 +516,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ExportAgentResponse othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -759,13 +735,11 @@ public Builder clearAgentContent() {
       }
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -787,12 +761,11 @@ public static com.google.cloud.dialogflow.v2.ExportAgentResponse getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ExportAgentResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ExportAgentResponse(input, extensionRegistry);
+        return new ExportAgentResponse(input, extensionRegistry);
     }
   };
 
@@ -805,7 +778,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.ExportAgentResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetAgentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetAgentRequest.java
index c12167c297e9..4efae16eb112 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetAgentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetAgentRequest.java
@@ -33,9 +33,6 @@ private GetAgentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetAgentRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            parent_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetAgentRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            parent_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetAgentRequest(
     return com.google.cloud.dialogflow.v2.AgentProto.internal_static_google_cloud_dialogflow_v2_GetAgentRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.AgentProto.internal_static_google_cloud_dialogflow_v2_GetAgentRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getParent() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.cloud.dialogflow.v2.GetAgentRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.GetAgentRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.AgentProto.internal_static_google_cloud_dialogflow_v2_GetAgentRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.AgentProto.internal_static_google_cloud_dialogflow_v2_GetAgentRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.AgentProto.internal_static_google_cloud_dialogflow_v2_GetAgentRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.GetAgentRequest getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.GetAgentRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.GetAgentRequest build() {
       com.google.cloud.dialogflow.v2.GetAgentRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.cloud.dialogflow.v2.GetAgentRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.GetAgentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.GetAgentRequest result = new com.google.cloud.dialogflow.v2.GetAgentRequest(this);
       result.parent_ = parent_;
@@ -359,39 +344,32 @@ public com.google.cloud.dialogflow.v2.GetAgentRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.GetAgentRequest) {
         return mergeFrom((com.google.cloud.dialogflow.v2.GetAgentRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.GetAgentRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setParentBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.cloud.dialogflow.v2.GetAgentRequest getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetAgentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetAgentRequest(input, extensionRegistry);
+        return new GetAgentRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.GetAgentRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetContextRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetContextRequest.java
index 39b76434faea..afa5e1c7b5c0 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetContextRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetContextRequest.java
@@ -33,9 +33,6 @@ private GetContextRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetContextRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetContextRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetContextRequest(
     return com.google.cloud.dialogflow.v2.ContextProto.internal_static_google_cloud_dialogflow_v2_GetContextRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.ContextProto.internal_static_google_cloud_dialogflow_v2_GetContextRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.cloud.dialogflow.v2.GetContextRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.GetContextRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.ContextProto.internal_static_google_cloud_dialogflow_v2_GetContextRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.ContextProto.internal_static_google_cloud_dialogflow_v2_GetContextRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.ContextProto.internal_static_google_cloud_dialogflow_v2_GetContextRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.GetContextRequest getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.GetContextRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.GetContextRequest build() {
       com.google.cloud.dialogflow.v2.GetContextRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.cloud.dialogflow.v2.GetContextRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.GetContextRequest buildPartial() {
       com.google.cloud.dialogflow.v2.GetContextRequest result = new com.google.cloud.dialogflow.v2.GetContextRequest(this);
       result.name_ = name_;
@@ -359,39 +344,32 @@ public com.google.cloud.dialogflow.v2.GetContextRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.GetContextRequest) {
         return mergeFrom((com.google.cloud.dialogflow.v2.GetContextRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.GetContextRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.cloud.dialogflow.v2.GetContextRequest getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetContextRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetContextRequest(input, extensionRegistry);
+        return new GetContextRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.GetContextRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetEntityTypeRequest.java
index 5475a61da713..26cee4ed21b6 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetEntityTypeRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetEntityTypeRequest.java
@@ -34,9 +34,6 @@ private GetEntityTypeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private GetEntityTypeRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private GetEntityTypeRequest(
             languageCode_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private GetEntityTypeRequest(
     return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_GetEntityTypeRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_GetEntityTypeRequest_fieldAccessorTable
@@ -187,7 +183,6 @@ public java.lang.String getLanguageCode() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -197,7 +192,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -209,7 +203,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -331,7 +324,6 @@ public static com.google.cloud.dialogflow.v2.GetEntityTypeRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -339,7 +331,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.GetEntityTypeRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -367,7 +358,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_GetEntityTypeRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_GetEntityTypeRequest_fieldAccessorTable
@@ -390,7 +380,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -400,18 +389,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.EntityTypeProto.internal_static_google_cloud_dialogflow_v2_GetEntityTypeRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.GetEntityTypeRequest getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.GetEntityTypeRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.GetEntityTypeRequest build() {
       com.google.cloud.dialogflow.v2.GetEntityTypeRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -420,7 +406,6 @@ public com.google.cloud.dialogflow.v2.GetEntityTypeRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.GetEntityTypeRequest buildPartial() {
       com.google.cloud.dialogflow.v2.GetEntityTypeRequest result = new com.google.cloud.dialogflow.v2.GetEntityTypeRequest(this);
       result.name_ = name_;
@@ -429,39 +414,32 @@ public com.google.cloud.dialogflow.v2.GetEntityTypeRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.GetEntityTypeRequest) {
         return mergeFrom((com.google.cloud.dialogflow.v2.GetEntityTypeRequest)other);
@@ -486,12 +464,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.GetEntityTypeRequest oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -712,13 +688,11 @@ public Builder setLanguageCodeBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -740,12 +714,11 @@ public static com.google.cloud.dialogflow.v2.GetEntityTypeRequest getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetEntityTypeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetEntityTypeRequest(input, extensionRegistry);
+        return new GetEntityTypeRequest(input, extensionRegistry);
     }
   };
 
@@ -758,7 +731,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.GetEntityTypeRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetIntentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetIntentRequest.java
index 27043194d213..5ced7296c314 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetIntentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetIntentRequest.java
@@ -35,9 +35,6 @@ private GetIntentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private GetIntentRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -67,13 +71,6 @@ private GetIntentRequest(
             intentView_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private GetIntentRequest(
     return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_GetIntentRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_GetIntentRequest_fieldAccessorTable
@@ -213,13 +209,11 @@ public int getIntentViewValue() {
    * .google.cloud.dialogflow.v2.IntentView intent_view = 3;
    */
   public com.google.cloud.dialogflow.v2.IntentView getIntentView() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.IntentView result = com.google.cloud.dialogflow.v2.IntentView.valueOf(intentView_);
     return result == null ? com.google.cloud.dialogflow.v2.IntentView.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -229,7 +223,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -244,7 +237,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -373,7 +365,6 @@ public static com.google.cloud.dialogflow.v2.GetIntentRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -381,7 +372,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.GetIntentRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -409,7 +399,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_GetIntentRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_GetIntentRequest_fieldAccessorTable
@@ -432,7 +421,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -444,18 +432,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_GetIntentRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.GetIntentRequest getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.GetIntentRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.GetIntentRequest build() {
       com.google.cloud.dialogflow.v2.GetIntentRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -464,7 +449,6 @@ public com.google.cloud.dialogflow.v2.GetIntentRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.GetIntentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.GetIntentRequest result = new com.google.cloud.dialogflow.v2.GetIntentRequest(this);
       result.name_ = name_;
@@ -474,39 +458,32 @@ public com.google.cloud.dialogflow.v2.GetIntentRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.GetIntentRequest) {
         return mergeFrom((com.google.cloud.dialogflow.v2.GetIntentRequest)other);
@@ -534,12 +511,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.GetIntentRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -792,7 +767,6 @@ public Builder setIntentViewValue(int value) {
      * .google.cloud.dialogflow.v2.IntentView intent_view = 3;
      */
     public com.google.cloud.dialogflow.v2.IntentView getIntentView() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.IntentView result = com.google.cloud.dialogflow.v2.IntentView.valueOf(intentView_);
       return result == null ? com.google.cloud.dialogflow.v2.IntentView.UNRECOGNIZED : result;
     }
@@ -825,13 +799,11 @@ public Builder clearIntentView() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -853,12 +825,11 @@ public static com.google.cloud.dialogflow.v2.GetIntentRequest getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetIntentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetIntentRequest(input, extensionRegistry);
+        return new GetIntentRequest(input, extensionRegistry);
     }
   };
 
@@ -871,7 +842,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.GetIntentRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetSessionEntityTypeRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetSessionEntityTypeRequest.java
index 3989f779c005..e72da1b3ebf7 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetSessionEntityTypeRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/GetSessionEntityTypeRequest.java
@@ -33,9 +33,6 @@ private GetSessionEntityTypeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetSessionEntityTypeRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetSessionEntityTypeRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetSessionEntityTypeRequest(
     return com.google.cloud.dialogflow.v2.SessionEntityTypeProto.internal_static_google_cloud_dialogflow_v2_GetSessionEntityTypeRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.SessionEntityTypeProto.internal_static_google_cloud_dialogflow_v2_GetSessionEntityTypeRequest_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.dialogflow.v2.GetSessionEntityTypeRequest parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.GetSessionEntityTypeRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.SessionEntityTypeProto.internal_static_google_cloud_dialogflow_v2_GetSessionEntityTypeRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.SessionEntityTypeProto.internal_static_google_cloud_dialogflow_v2_GetSessionEntityTypeRequest_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.SessionEntityTypeProto.internal_static_google_cloud_dialogflow_v2_GetSessionEntityTypeRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.GetSessionEntityTypeRequest getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.GetSessionEntityTypeRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.GetSessionEntityTypeRequest build() {
       com.google.cloud.dialogflow.v2.GetSessionEntityTypeRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.dialogflow.v2.GetSessionEntityTypeRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.GetSessionEntityTypeRequest buildPartial() {
       com.google.cloud.dialogflow.v2.GetSessionEntityTypeRequest result = new com.google.cloud.dialogflow.v2.GetSessionEntityTypeRequest(this);
       result.name_ = name_;
@@ -361,39 +346,32 @@ public com.google.cloud.dialogflow.v2.GetSessionEntityTypeRequest buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.GetSessionEntityTypeRequest) {
         return mergeFrom((com.google.cloud.dialogflow.v2.GetSessionEntityTypeRequest)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.GetSessionEntityTypeRequ
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.dialogflow.v2.GetSessionEntityTypeRequest getDefa
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetSessionEntityTypeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetSessionEntityTypeRequest(input, extensionRegistry);
+        return new GetSessionEntityTypeRequest(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType(
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.GetSessionEntityTypeRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportAgentRequest.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportAgentRequest.java
index 9663631deeaa..ba7575e60e15 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportAgentRequest.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ImportAgentRequest.java
@@ -33,9 +33,6 @@ private ImportAgentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ImportAgentRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -64,13 +68,6 @@ private ImportAgentRequest(
             agent_ = input.readBytes();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -88,7 +85,6 @@ private ImportAgentRequest(
     return com.google.cloud.dialogflow.v2.AgentProto.internal_static_google_cloud_dialogflow_v2_ImportAgentRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.AgentProto.internal_static_google_cloud_dialogflow_v2_ImportAgentRequest_fieldAccessorTable
@@ -258,7 +254,6 @@ public com.google.protobuf.ByteString getAgentContent() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -268,7 +263,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -284,7 +278,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -434,7 +427,6 @@ public static com.google.cloud.dialogflow.v2.ImportAgentRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -442,7 +434,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.ImportAgentRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -470,7 +461,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.AgentProto.internal_static_google_cloud_dialogflow_v2_ImportAgentRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.AgentProto.internal_static_google_cloud_dialogflow_v2_ImportAgentRequest_fieldAccessorTable
@@ -493,7 +483,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -503,18 +492,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.AgentProto.internal_static_google_cloud_dialogflow_v2_ImportAgentRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.ImportAgentRequest getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.ImportAgentRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.ImportAgentRequest build() {
       com.google.cloud.dialogflow.v2.ImportAgentRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -523,7 +509,6 @@ public com.google.cloud.dialogflow.v2.ImportAgentRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.ImportAgentRequest buildPartial() {
       com.google.cloud.dialogflow.v2.ImportAgentRequest result = new com.google.cloud.dialogflow.v2.ImportAgentRequest(this);
       result.parent_ = parent_;
@@ -538,39 +523,32 @@ public com.google.cloud.dialogflow.v2.ImportAgentRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.ImportAgentRequest) {
         return mergeFrom((com.google.cloud.dialogflow.v2.ImportAgentRequest)other);
@@ -606,12 +584,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.ImportAgentRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -921,13 +897,11 @@ public Builder clearAgentContent() {
       }
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -949,12 +923,11 @@ public static com.google.cloud.dialogflow.v2.ImportAgentRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ImportAgentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImportAgentRequest(input, extensionRegistry);
+        return new ImportAgentRequest(input, extensionRegistry);
     }
   };
 
@@ -967,7 +940,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.ImportAgentRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputAudioConfig.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputAudioConfig.java
index e6f87e42a78b..703feacaf7a6 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputAudioConfig.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/InputAudioConfig.java
@@ -36,9 +36,6 @@ private InputAudioConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private InputAudioConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -76,13 +80,6 @@ private InputAudioConfig(
             phraseHints_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private InputAudioConfig(
     return com.google.cloud.dialogflow.v2.SessionProto.internal_static_google_cloud_dialogflow_v2_InputAudioConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.SessionProto.internal_static_google_cloud_dialogflow_v2_InputAudioConfig_fieldAccessorTable
@@ -132,7 +128,6 @@ public int getAudioEncodingValue() {
    * .google.cloud.dialogflow.v2.AudioEncoding audio_encoding = 1;
    */
   public com.google.cloud.dialogflow.v2.AudioEncoding getAudioEncoding() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.dialogflow.v2.AudioEncoding result = com.google.cloud.dialogflow.v2.AudioEncoding.valueOf(audioEncoding_);
     return result == null ? com.google.cloud.dialogflow.v2.AudioEncoding.UNRECOGNIZED : result;
   }
@@ -260,7 +255,6 @@ public java.lang.String getPhraseHints(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -270,7 +264,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (audioEncoding_ != com.google.cloud.dialogflow.v2.AudioEncoding.AUDIO_ENCODING_UNSPECIFIED.getNumber()) {
@@ -288,7 +281,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -432,7 +424,6 @@ public static com.google.cloud.dialogflow.v2.InputAudioConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -440,7 +431,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.dialogflow.v2.InputAudioConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -468,7 +458,6 @@ public static final class Builder extends
       return com.google.cloud.dialogflow.v2.SessionProto.internal_static_google_cloud_dialogflow_v2_InputAudioConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.SessionProto.internal_static_google_cloud_dialogflow_v2_InputAudioConfig_fieldAccessorTable
@@ -491,7 +480,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       audioEncoding_ = 0;
@@ -505,18 +493,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.dialogflow.v2.SessionProto.internal_static_google_cloud_dialogflow_v2_InputAudioConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.InputAudioConfig getDefaultInstanceForType() {
       return com.google.cloud.dialogflow.v2.InputAudioConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.InputAudioConfig build() {
       com.google.cloud.dialogflow.v2.InputAudioConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -525,7 +510,6 @@ public com.google.cloud.dialogflow.v2.InputAudioConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.InputAudioConfig buildPartial() {
       com.google.cloud.dialogflow.v2.InputAudioConfig result = new com.google.cloud.dialogflow.v2.InputAudioConfig(this);
       int from_bitField0_ = bitField0_;
@@ -543,39 +527,32 @@ public com.google.cloud.dialogflow.v2.InputAudioConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.dialogflow.v2.InputAudioConfig) {
         return mergeFrom((com.google.cloud.dialogflow.v2.InputAudioConfig)other);
@@ -612,12 +589,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.InputAudioConfig other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -668,7 +643,6 @@ public Builder setAudioEncodingValue(int value) {
      * .google.cloud.dialogflow.v2.AudioEncoding audio_encoding = 1;
      */
     public com.google.cloud.dialogflow.v2.AudioEncoding getAudioEncoding() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.AudioEncoding result = com.google.cloud.dialogflow.v2.AudioEncoding.valueOf(audioEncoding_);
       return result == null ? com.google.cloud.dialogflow.v2.AudioEncoding.UNRECOGNIZED : result;
     }
@@ -1011,13 +985,11 @@ public Builder addPhraseHintsBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1039,12 +1011,11 @@ public static com.google.cloud.dialogflow.v2.InputAudioConfig getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public InputAudioConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InputAudioConfig(input, extensionRegistry);
+        return new InputAudioConfig(input, extensionRegistry);
     }
   };
 
@@ -1057,7 +1028,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.dialogflow.v2.InputAudioConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Intent.java b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Intent.java
index f981137d117a..877de31f7e68 100644
--- a/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Intent.java
+++ b/google-api-grpc/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Intent.java
@@ -52,9 +52,6 @@ private Intent(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -66,6 +63,13 @@ private Intent(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -208,13 +212,6 @@ private Intent(
             mlDisabled_ = input.readBool();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -256,7 +253,6 @@ private Intent(
     return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_fieldAccessorTable
@@ -538,9 +534,6 @@ private TrainingPhrase(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -552,6 +545,13 @@ private TrainingPhrase(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -578,13 +578,6 @@ private TrainingPhrase(
               timesAddedCount_ = input.readInt32();
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -605,7 +598,6 @@ private TrainingPhrase(
       return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_TrainingPhrase_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_TrainingPhrase_fieldAccessorTable
@@ -863,9 +855,6 @@ private Part(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -877,6 +866,13 @@ private Part(
               case 0:
                 done = true;
                 break;
+              default: {
+                if (!parseUnknownFieldProto3(
+                    input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
               case 10: {
                 java.lang.String s = input.readStringRequireUtf8();
 
@@ -900,13 +896,6 @@ private Part(
                 userDefined_ = input.readBool();
                 break;
               }
-              default: {
-                if (!parseUnknownFieldProto3(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
             }
           }
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -924,7 +913,6 @@ private Part(
         return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_TrainingPhrase_Part_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_TrainingPhrase_Part_fieldAccessorTable
@@ -1083,7 +1071,6 @@ public boolean getUserDefined() {
       }
 
       private byte memoizedIsInitialized = -1;
-      @java.lang.Override
       public final boolean isInitialized() {
         byte isInitialized = memoizedIsInitialized;
         if (isInitialized == 1) return true;
@@ -1093,7 +1080,6 @@ public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public void writeTo(com.google.protobuf.CodedOutputStream output)
                           throws java.io.IOException {
         if (!getTextBytes().isEmpty()) {
@@ -1111,7 +1097,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         unknownFields.writeTo(output);
       }
 
-      @java.lang.Override
       public int getSerializedSize() {
         int size = memoizedSize;
         if (size != -1) return size;
@@ -1249,7 +1234,6 @@ public static com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part parseFro
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
-      @java.lang.Override
       public Builder newBuilderForType() { return newBuilder(); }
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
@@ -1257,7 +1241,6 @@ public static Builder newBuilder() {
       public static Builder newBuilder(com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
-      @java.lang.Override
       public Builder toBuilder() {
         return this == DEFAULT_INSTANCE
             ? new Builder() : new Builder().mergeFrom(this);
@@ -1285,7 +1268,6 @@ public static final class Builder extends
           return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_TrainingPhrase_Part_descriptor;
         }
 
-        @java.lang.Override
         protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
           return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_TrainingPhrase_Part_fieldAccessorTable
@@ -1308,7 +1290,6 @@ private void maybeForceBuilderInitialization() {
                   .alwaysUseFieldBuilders) {
           }
         }
-        @java.lang.Override
         public Builder clear() {
           super.clear();
           text_ = "";
@@ -1322,18 +1303,15 @@ public Builder clear() {
           return this;
         }
 
-        @java.lang.Override
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
           return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_TrainingPhrase_Part_descriptor;
         }
 
-        @java.lang.Override
         public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part getDefaultInstanceForType() {
           return com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part.getDefaultInstance();
         }
 
-        @java.lang.Override
         public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part build() {
           com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part result = buildPartial();
           if (!result.isInitialized()) {
@@ -1342,7 +1320,6 @@ public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part build() {
           return result;
         }
 
-        @java.lang.Override
         public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part buildPartial() {
           com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part result = new com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part(this);
           result.text_ = text_;
@@ -1353,39 +1330,32 @@ public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part buildPartial()
           return result;
         }
 
-        @java.lang.Override
         public Builder clone() {
           return (Builder) super.clone();
         }
-        @java.lang.Override
         public Builder setField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.setField(field, value);
         }
-        @java.lang.Override
         public Builder clearField(
             com.google.protobuf.Descriptors.FieldDescriptor field) {
           return (Builder) super.clearField(field);
         }
-        @java.lang.Override
         public Builder clearOneof(
             com.google.protobuf.Descriptors.OneofDescriptor oneof) {
           return (Builder) super.clearOneof(oneof);
         }
-        @java.lang.Override
         public Builder setRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return (Builder) super.setRepeatedField(field, index, value);
         }
-        @java.lang.Override
         public Builder addRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.addRepeatedField(field, value);
         }
-        @java.lang.Override
         public Builder mergeFrom(com.google.protobuf.Message other) {
           if (other instanceof com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part) {
             return mergeFrom((com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part)other);
@@ -1417,12 +1387,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Pa
           return this;
         }
 
-        @java.lang.Override
         public final boolean isInitialized() {
           return true;
         }
 
-        @java.lang.Override
         public Builder mergeFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1773,13 +1741,11 @@ public Builder clearUserDefined() {
           onChanged();
           return this;
         }
-        @java.lang.Override
         public final Builder setUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.setUnknownFieldsProto3(unknownFields);
         }
 
-        @java.lang.Override
         public final Builder mergeUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
@@ -1801,12 +1767,11 @@ public static com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part getDefau
 
       private static final com.google.protobuf.Parser
           PARSER = new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
         public Part parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Part(input, extensionRegistry);
+            return new Part(input, extensionRegistry);
         }
       };
 
@@ -1819,7 +1784,6 @@ public com.google.protobuf.Parser getParserForType() {
         return PARSER;
       }
 
-      @java.lang.Override
       public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Part getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
@@ -1889,7 +1853,6 @@ public int getTypeValue() {
      * .google.cloud.dialogflow.v2.Intent.TrainingPhrase.Type type = 2;
      */
     public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Type getType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Type result = com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Type.valueOf(type_);
       return result == null ? com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Type.UNRECOGNIZED : result;
     }
@@ -1975,7 +1938,6 @@ public int getTimesAddedCount() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1985,7 +1947,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getNameBytes().isEmpty()) {
@@ -2003,7 +1964,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -2143,7 +2103,6 @@ public static com.google.cloud.dialogflow.v2.Intent.TrainingPhrase parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -2151,7 +2110,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.dialogflow.v2.Intent.TrainingPhrase prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -2179,7 +2137,6 @@ public static final class Builder extends
         return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_TrainingPhrase_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_TrainingPhrase_fieldAccessorTable
@@ -2203,7 +2160,6 @@ private void maybeForceBuilderInitialization() {
           getPartsFieldBuilder();
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         name_ = "";
@@ -2221,18 +2177,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_TrainingPhrase_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase getDefaultInstanceForType() {
         return com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase build() {
         com.google.cloud.dialogflow.v2.Intent.TrainingPhrase result = buildPartial();
         if (!result.isInitialized()) {
@@ -2241,7 +2194,6 @@ public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase buildPartial() {
         com.google.cloud.dialogflow.v2.Intent.TrainingPhrase result = new com.google.cloud.dialogflow.v2.Intent.TrainingPhrase(this);
         int from_bitField0_ = bitField0_;
@@ -2263,39 +2215,32 @@ public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.dialogflow.v2.Intent.TrainingPhrase) {
           return mergeFrom((com.google.cloud.dialogflow.v2.Intent.TrainingPhrase)other);
@@ -2348,12 +2293,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.TrainingPhrase ot
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2493,7 +2436,6 @@ public Builder setTypeValue(int value) {
        * .google.cloud.dialogflow.v2.Intent.TrainingPhrase.Type type = 2;
        */
       public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Type getType() {
-        @SuppressWarnings("deprecation")
         com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Type result = com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Type.valueOf(type_);
         return result == null ? com.google.cloud.dialogflow.v2.Intent.TrainingPhrase.Type.UNRECOGNIZED : result;
       }
@@ -2918,13 +2860,11 @@ public Builder clearTimesAddedCount() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -2946,12 +2886,11 @@ public static com.google.cloud.dialogflow.v2.Intent.TrainingPhrase getDefaultIns
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public TrainingPhrase parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new TrainingPhrase(input, extensionRegistry);
+          return new TrainingPhrase(input, extensionRegistry);
       }
     };
 
@@ -2964,7 +2903,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.Intent.TrainingPhrase getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -3181,9 +3119,6 @@ private Parameter(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3195,6 +3130,13 @@ private Parameter(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -3244,13 +3186,6 @@ private Parameter(
               isList_ = input.readBool();
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -3271,7 +3206,6 @@ private Parameter(
       return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_Parameter_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_Parameter_fieldAccessorTable
@@ -3588,7 +3522,6 @@ public boolean getIsList() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -3598,7 +3531,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getNameBytes().isEmpty()) {
@@ -3628,7 +3560,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -3803,7 +3734,6 @@ public static com.google.cloud.dialogflow.v2.Intent.Parameter parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -3811,7 +3741,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.dialogflow.v2.Intent.Parameter prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -3839,7 +3768,6 @@ public static final class Builder extends
         return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_Parameter_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_Parameter_fieldAccessorTable
@@ -3862,7 +3790,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         name_ = "";
@@ -3884,18 +3811,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_Parameter_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.dialogflow.v2.Intent.Parameter getDefaultInstanceForType() {
         return com.google.cloud.dialogflow.v2.Intent.Parameter.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.dialogflow.v2.Intent.Parameter build() {
         com.google.cloud.dialogflow.v2.Intent.Parameter result = buildPartial();
         if (!result.isInitialized()) {
@@ -3904,7 +3828,6 @@ public com.google.cloud.dialogflow.v2.Intent.Parameter build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.dialogflow.v2.Intent.Parameter buildPartial() {
         com.google.cloud.dialogflow.v2.Intent.Parameter result = new com.google.cloud.dialogflow.v2.Intent.Parameter(this);
         int from_bitField0_ = bitField0_;
@@ -3926,39 +3849,32 @@ public com.google.cloud.dialogflow.v2.Intent.Parameter buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.dialogflow.v2.Intent.Parameter) {
           return mergeFrom((com.google.cloud.dialogflow.v2.Intent.Parameter)other);
@@ -4011,12 +3927,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.Parameter other)
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4751,13 +4665,11 @@ public Builder clearIsList() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -4779,12 +4691,11 @@ public static com.google.cloud.dialogflow.v2.Intent.Parameter getDefaultInstance
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Parameter parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Parameter(input, extensionRegistry);
+          return new Parameter(input, extensionRegistry);
       }
     };
 
@@ -4797,7 +4708,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.dialogflow.v2.Intent.Parameter getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -5138,9 +5048,6 @@ private Message(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -5152,6 +5059,13 @@ private Message(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               com.google.cloud.dialogflow.v2.Intent.Message.Text.Builder subBuilder = null;
               if (messageCase_ == 1) {
@@ -5312,13 +5226,6 @@ private Message(
               messageCase_ = 12;
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -5336,7 +5243,6 @@ private Message(
       return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_Message_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_Message_fieldAccessorTable
@@ -5770,9 +5676,6 @@ private Text(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -5784,6 +5687,13 @@ private Text(
               case 0:
                 done = true;
                 break;
+              default: {
+                if (!parseUnknownFieldProto3(
+                    input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
               case 10: {
                 java.lang.String s = input.readStringRequireUtf8();
                 if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -5793,13 +5703,6 @@ private Text(
                 text_.add(s);
                 break;
               }
-              default: {
-                if (!parseUnknownFieldProto3(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
             }
           }
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -5820,7 +5723,6 @@ private Text(
         return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_Message_Text_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_Message_Text_fieldAccessorTable
@@ -5874,7 +5776,6 @@ public java.lang.String getText(int index) {
       }
 
       private byte memoizedIsInitialized = -1;
-      @java.lang.Override
       public final boolean isInitialized() {
         byte isInitialized = memoizedIsInitialized;
         if (isInitialized == 1) return true;
@@ -5884,7 +5785,6 @@ public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public void writeTo(com.google.protobuf.CodedOutputStream output)
                           throws java.io.IOException {
         for (int i = 0; i < text_.size(); i++) {
@@ -5893,7 +5793,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         unknownFields.writeTo(output);
       }
 
-      @java.lang.Override
       public int getSerializedSize() {
         int size = memoizedSize;
         if (size != -1) return size;
@@ -6015,7 +5914,6 @@ public static com.google.cloud.dialogflow.v2.Intent.Message.Text parseFrom(
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
-      @java.lang.Override
       public Builder newBuilderForType() { return newBuilder(); }
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
@@ -6023,7 +5921,6 @@ public static Builder newBuilder() {
       public static Builder newBuilder(com.google.cloud.dialogflow.v2.Intent.Message.Text prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
-      @java.lang.Override
       public Builder toBuilder() {
         return this == DEFAULT_INSTANCE
             ? new Builder() : new Builder().mergeFrom(this);
@@ -6051,7 +5948,6 @@ public static final class Builder extends
           return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_Message_Text_descriptor;
         }
 
-        @java.lang.Override
         protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
           return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_Message_Text_fieldAccessorTable
@@ -6074,7 +5970,6 @@ private void maybeForceBuilderInitialization() {
                   .alwaysUseFieldBuilders) {
           }
         }
-        @java.lang.Override
         public Builder clear() {
           super.clear();
           text_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -6082,18 +5977,15 @@ public Builder clear() {
           return this;
         }
 
-        @java.lang.Override
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
           return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_Message_Text_descriptor;
         }
 
-        @java.lang.Override
         public com.google.cloud.dialogflow.v2.Intent.Message.Text getDefaultInstanceForType() {
           return com.google.cloud.dialogflow.v2.Intent.Message.Text.getDefaultInstance();
         }
 
-        @java.lang.Override
         public com.google.cloud.dialogflow.v2.Intent.Message.Text build() {
           com.google.cloud.dialogflow.v2.Intent.Message.Text result = buildPartial();
           if (!result.isInitialized()) {
@@ -6102,7 +5994,6 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Text build() {
           return result;
         }
 
-        @java.lang.Override
         public com.google.cloud.dialogflow.v2.Intent.Message.Text buildPartial() {
           com.google.cloud.dialogflow.v2.Intent.Message.Text result = new com.google.cloud.dialogflow.v2.Intent.Message.Text(this);
           int from_bitField0_ = bitField0_;
@@ -6115,39 +6006,32 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Text buildPartial() {
           return result;
         }
 
-        @java.lang.Override
         public Builder clone() {
           return (Builder) super.clone();
         }
-        @java.lang.Override
         public Builder setField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.setField(field, value);
         }
-        @java.lang.Override
         public Builder clearField(
             com.google.protobuf.Descriptors.FieldDescriptor field) {
           return (Builder) super.clearField(field);
         }
-        @java.lang.Override
         public Builder clearOneof(
             com.google.protobuf.Descriptors.OneofDescriptor oneof) {
           return (Builder) super.clearOneof(oneof);
         }
-        @java.lang.Override
         public Builder setRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return (Builder) super.setRepeatedField(field, index, value);
         }
-        @java.lang.Override
         public Builder addRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.addRepeatedField(field, value);
         }
-        @java.lang.Override
         public Builder mergeFrom(com.google.protobuf.Message other) {
           if (other instanceof com.google.cloud.dialogflow.v2.Intent.Message.Text) {
             return mergeFrom((com.google.cloud.dialogflow.v2.Intent.Message.Text)other);
@@ -6174,12 +6058,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.Message.Text othe
           return this;
         }
 
-        @java.lang.Override
         public final boolean isInitialized() {
           return true;
         }
 
-        @java.lang.Override
         public Builder mergeFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -6328,13 +6210,11 @@ public Builder addTextBytes(
           onChanged();
           return this;
         }
-        @java.lang.Override
         public final Builder setUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.setUnknownFieldsProto3(unknownFields);
         }
 
-        @java.lang.Override
         public final Builder mergeUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
@@ -6356,12 +6236,11 @@ public static com.google.cloud.dialogflow.v2.Intent.Message.Text getDefaultInsta
 
       private static final com.google.protobuf.Parser
           PARSER = new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
         public Text parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Text(input, extensionRegistry);
+            return new Text(input, extensionRegistry);
         }
       };
 
@@ -6374,7 +6253,6 @@ public com.google.protobuf.Parser getParserForType() {
         return PARSER;
       }
 
-      @java.lang.Override
       public com.google.cloud.dialogflow.v2.Intent.Message.Text getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
@@ -6454,9 +6332,6 @@ private Image(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -6468,6 +6343,13 @@ private Image(
               case 0:
                 done = true;
                 break;
+              default: {
+                if (!parseUnknownFieldProto3(
+                    input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
               case 10: {
                 java.lang.String s = input.readStringRequireUtf8();
 
@@ -6480,13 +6362,6 @@ private Image(
                 accessibilityText_ = s;
                 break;
               }
-              default: {
-                if (!parseUnknownFieldProto3(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
             }
           }
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -6504,7 +6379,6 @@ private Image(
         return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_Message_Image_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_Message_Image_fieldAccessorTable
@@ -6599,7 +6473,6 @@ public java.lang.String getAccessibilityText() {
       }
 
       private byte memoizedIsInitialized = -1;
-      @java.lang.Override
       public final boolean isInitialized() {
         byte isInitialized = memoizedIsInitialized;
         if (isInitialized == 1) return true;
@@ -6609,7 +6482,6 @@ public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public void writeTo(com.google.protobuf.CodedOutputStream output)
                           throws java.io.IOException {
         if (!getImageUriBytes().isEmpty()) {
@@ -6621,7 +6493,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         unknownFields.writeTo(output);
       }
 
-      @java.lang.Override
       public int getSerializedSize() {
         int size = memoizedSize;
         if (size != -1) return size;
@@ -6743,7 +6614,6 @@ public static com.google.cloud.dialogflow.v2.Intent.Message.Image parseFrom(
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
-      @java.lang.Override
       public Builder newBuilderForType() { return newBuilder(); }
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
@@ -6751,7 +6621,6 @@ public static Builder newBuilder() {
       public static Builder newBuilder(com.google.cloud.dialogflow.v2.Intent.Message.Image prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
-      @java.lang.Override
       public Builder toBuilder() {
         return this == DEFAULT_INSTANCE
             ? new Builder() : new Builder().mergeFrom(this);
@@ -6779,7 +6648,6 @@ public static final class Builder extends
           return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_Message_Image_descriptor;
         }
 
-        @java.lang.Override
         protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
           return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_Message_Image_fieldAccessorTable
@@ -6802,7 +6670,6 @@ private void maybeForceBuilderInitialization() {
                   .alwaysUseFieldBuilders) {
           }
         }
-        @java.lang.Override
         public Builder clear() {
           super.clear();
           imageUri_ = "";
@@ -6812,18 +6679,15 @@ public Builder clear() {
           return this;
         }
 
-        @java.lang.Override
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
           return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_Message_Image_descriptor;
         }
 
-        @java.lang.Override
         public com.google.cloud.dialogflow.v2.Intent.Message.Image getDefaultInstanceForType() {
           return com.google.cloud.dialogflow.v2.Intent.Message.Image.getDefaultInstance();
         }
 
-        @java.lang.Override
         public com.google.cloud.dialogflow.v2.Intent.Message.Image build() {
           com.google.cloud.dialogflow.v2.Intent.Message.Image result = buildPartial();
           if (!result.isInitialized()) {
@@ -6832,7 +6696,6 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Image build() {
           return result;
         }
 
-        @java.lang.Override
         public com.google.cloud.dialogflow.v2.Intent.Message.Image buildPartial() {
           com.google.cloud.dialogflow.v2.Intent.Message.Image result = new com.google.cloud.dialogflow.v2.Intent.Message.Image(this);
           result.imageUri_ = imageUri_;
@@ -6841,39 +6704,32 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Image buildPartial() {
           return result;
         }
 
-        @java.lang.Override
         public Builder clone() {
           return (Builder) super.clone();
         }
-        @java.lang.Override
         public Builder setField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.setField(field, value);
         }
-        @java.lang.Override
         public Builder clearField(
             com.google.protobuf.Descriptors.FieldDescriptor field) {
           return (Builder) super.clearField(field);
         }
-        @java.lang.Override
         public Builder clearOneof(
             com.google.protobuf.Descriptors.OneofDescriptor oneof) {
           return (Builder) super.clearOneof(oneof);
         }
-        @java.lang.Override
         public Builder setRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return (Builder) super.setRepeatedField(field, index, value);
         }
-        @java.lang.Override
         public Builder addRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.addRepeatedField(field, value);
         }
-        @java.lang.Override
         public Builder mergeFrom(com.google.protobuf.Message other) {
           if (other instanceof com.google.cloud.dialogflow.v2.Intent.Message.Image) {
             return mergeFrom((com.google.cloud.dialogflow.v2.Intent.Message.Image)other);
@@ -6898,12 +6754,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.Message.Image oth
           return this;
         }
 
-        @java.lang.Override
         public final boolean isInitialized() {
           return true;
         }
 
-        @java.lang.Override
         public Builder mergeFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -7104,13 +6958,11 @@ public Builder setAccessibilityTextBytes(
           onChanged();
           return this;
         }
-        @java.lang.Override
         public final Builder setUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.setUnknownFieldsProto3(unknownFields);
         }
 
-        @java.lang.Override
         public final Builder mergeUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
@@ -7132,12 +6984,11 @@ public static com.google.cloud.dialogflow.v2.Intent.Message.Image getDefaultInst
 
       private static final com.google.protobuf.Parser
           PARSER = new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
         public Image parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Image(input, extensionRegistry);
+            return new Image(input, extensionRegistry);
         }
       };
 
@@ -7150,7 +7001,6 @@ public com.google.protobuf.Parser getParserForType() {
         return PARSER;
       }
 
-      @java.lang.Override
       public com.google.cloud.dialogflow.v2.Intent.Message.Image getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
@@ -7245,9 +7095,6 @@ private QuickReplies(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -7259,6 +7106,13 @@ private QuickReplies(
               case 0:
                 done = true;
                 break;
+              default: {
+                if (!parseUnknownFieldProto3(
+                    input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
               case 10: {
                 java.lang.String s = input.readStringRequireUtf8();
 
@@ -7274,13 +7128,6 @@ private QuickReplies(
                 quickReplies_.add(s);
                 break;
               }
-              default: {
-                if (!parseUnknownFieldProto3(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
             }
           }
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -7301,7 +7148,6 @@ private QuickReplies(
         return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_Message_QuickReplies_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_Message_QuickReplies_fieldAccessorTable
@@ -7398,7 +7244,6 @@ public java.lang.String getQuickReplies(int index) {
       }
 
       private byte memoizedIsInitialized = -1;
-      @java.lang.Override
       public final boolean isInitialized() {
         byte isInitialized = memoizedIsInitialized;
         if (isInitialized == 1) return true;
@@ -7408,7 +7253,6 @@ public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public void writeTo(com.google.protobuf.CodedOutputStream output)
                           throws java.io.IOException {
         if (!getTitleBytes().isEmpty()) {
@@ -7420,7 +7264,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         unknownFields.writeTo(output);
       }
 
-      @java.lang.Override
       public int getSerializedSize() {
         int size = memoizedSize;
         if (size != -1) return size;
@@ -7549,7 +7392,6 @@ public static com.google.cloud.dialogflow.v2.Intent.Message.QuickReplies parseFr
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
-      @java.lang.Override
       public Builder newBuilderForType() { return newBuilder(); }
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
@@ -7557,7 +7399,6 @@ public static Builder newBuilder() {
       public static Builder newBuilder(com.google.cloud.dialogflow.v2.Intent.Message.QuickReplies prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
-      @java.lang.Override
       public Builder toBuilder() {
         return this == DEFAULT_INSTANCE
             ? new Builder() : new Builder().mergeFrom(this);
@@ -7585,7 +7426,6 @@ public static final class Builder extends
           return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_Message_QuickReplies_descriptor;
         }
 
-        @java.lang.Override
         protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
           return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_Message_QuickReplies_fieldAccessorTable
@@ -7608,7 +7448,6 @@ private void maybeForceBuilderInitialization() {
                   .alwaysUseFieldBuilders) {
           }
         }
-        @java.lang.Override
         public Builder clear() {
           super.clear();
           title_ = "";
@@ -7618,18 +7457,15 @@ public Builder clear() {
           return this;
         }
 
-        @java.lang.Override
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
           return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_Message_QuickReplies_descriptor;
         }
 
-        @java.lang.Override
         public com.google.cloud.dialogflow.v2.Intent.Message.QuickReplies getDefaultInstanceForType() {
           return com.google.cloud.dialogflow.v2.Intent.Message.QuickReplies.getDefaultInstance();
         }
 
-        @java.lang.Override
         public com.google.cloud.dialogflow.v2.Intent.Message.QuickReplies build() {
           com.google.cloud.dialogflow.v2.Intent.Message.QuickReplies result = buildPartial();
           if (!result.isInitialized()) {
@@ -7638,7 +7474,6 @@ public com.google.cloud.dialogflow.v2.Intent.Message.QuickReplies build() {
           return result;
         }
 
-        @java.lang.Override
         public com.google.cloud.dialogflow.v2.Intent.Message.QuickReplies buildPartial() {
           com.google.cloud.dialogflow.v2.Intent.Message.QuickReplies result = new com.google.cloud.dialogflow.v2.Intent.Message.QuickReplies(this);
           int from_bitField0_ = bitField0_;
@@ -7654,39 +7489,32 @@ public com.google.cloud.dialogflow.v2.Intent.Message.QuickReplies buildPartial()
           return result;
         }
 
-        @java.lang.Override
         public Builder clone() {
           return (Builder) super.clone();
         }
-        @java.lang.Override
         public Builder setField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.setField(field, value);
         }
-        @java.lang.Override
         public Builder clearField(
             com.google.protobuf.Descriptors.FieldDescriptor field) {
           return (Builder) super.clearField(field);
         }
-        @java.lang.Override
         public Builder clearOneof(
             com.google.protobuf.Descriptors.OneofDescriptor oneof) {
           return (Builder) super.clearOneof(oneof);
         }
-        @java.lang.Override
         public Builder setRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return (Builder) super.setRepeatedField(field, index, value);
         }
-        @java.lang.Override
         public Builder addRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.addRepeatedField(field, value);
         }
-        @java.lang.Override
         public Builder mergeFrom(com.google.protobuf.Message other) {
           if (other instanceof com.google.cloud.dialogflow.v2.Intent.Message.QuickReplies) {
             return mergeFrom((com.google.cloud.dialogflow.v2.Intent.Message.QuickReplies)other);
@@ -7717,12 +7545,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.Message.QuickRepl
           return this;
         }
 
-        @java.lang.Override
         public final boolean isInitialized() {
           return true;
         }
 
-        @java.lang.Override
         public Builder mergeFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -7960,13 +7786,11 @@ public Builder addQuickRepliesBytes(
           onChanged();
           return this;
         }
-        @java.lang.Override
         public final Builder setUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.setUnknownFieldsProto3(unknownFields);
         }
 
-        @java.lang.Override
         public final Builder mergeUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
@@ -7988,12 +7812,11 @@ public static com.google.cloud.dialogflow.v2.Intent.Message.QuickReplies getDefa
 
       private static final com.google.protobuf.Parser
           PARSER = new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
         public QuickReplies parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new QuickReplies(input, extensionRegistry);
+            return new QuickReplies(input, extensionRegistry);
         }
       };
 
@@ -8006,7 +7829,6 @@ public com.google.protobuf.Parser getParserForType() {
         return PARSER;
       }
 
-      @java.lang.Override
       public com.google.cloud.dialogflow.v2.Intent.Message.QuickReplies getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
@@ -8148,9 +7970,6 @@ private Card(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -8162,6 +7981,13 @@ private Card(
               case 0:
                 done = true;
                 break;
+              default: {
+                if (!parseUnknownFieldProto3(
+                    input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
               case 10: {
                 java.lang.String s = input.readStringRequireUtf8();
 
@@ -8189,13 +8015,6 @@ private Card(
                     input.readMessage(com.google.cloud.dialogflow.v2.Intent.Message.Card.Button.parser(), extensionRegistry));
                 break;
               }
-              default: {
-                if (!parseUnknownFieldProto3(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
             }
           }
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -8216,7 +8035,6 @@ private Card(
         return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_Message_Card_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_Message_Card_fieldAccessorTable
@@ -8297,9 +8115,6 @@ private Button(
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
           this();
-          if (extensionRegistry == null) {
-            throw new java.lang.NullPointerException();
-          }
           int mutable_bitField0_ = 0;
           com.google.protobuf.UnknownFieldSet.Builder unknownFields =
               com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -8311,6 +8126,13 @@ private Button(
                 case 0:
                   done = true;
                   break;
+                default: {
+                  if (!parseUnknownFieldProto3(
+                      input, unknownFields, extensionRegistry, tag)) {
+                    done = true;
+                  }
+                  break;
+                }
                 case 10: {
                   java.lang.String s = input.readStringRequireUtf8();
 
@@ -8323,13 +8145,6 @@ private Button(
                   postback_ = s;
                   break;
                 }
-                default: {
-                  if (!parseUnknownFieldProto3(
-                      input, unknownFields, extensionRegistry, tag)) {
-                    done = true;
-                  }
-                  break;
-                }
               }
             }
           } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -8347,7 +8162,6 @@ private Button(
           return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_Message_Card_Button_descriptor;
         }
 
-        @java.lang.Override
         protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
           return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_Message_Card_Button_fieldAccessorTable
@@ -8442,7 +8256,6 @@ public java.lang.String getPostback() {
         }
 
         private byte memoizedIsInitialized = -1;
-        @java.lang.Override
         public final boolean isInitialized() {
           byte isInitialized = memoizedIsInitialized;
           if (isInitialized == 1) return true;
@@ -8452,7 +8265,6 @@ public final boolean isInitialized() {
           return true;
         }
 
-        @java.lang.Override
         public void writeTo(com.google.protobuf.CodedOutputStream output)
                             throws java.io.IOException {
           if (!getTextBytes().isEmpty()) {
@@ -8464,7 +8276,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
           unknownFields.writeTo(output);
         }
 
-        @java.lang.Override
         public int getSerializedSize() {
           int size = memoizedSize;
           if (size != -1) return size;
@@ -8586,7 +8397,6 @@ public static com.google.cloud.dialogflow.v2.Intent.Message.Card.Button parseFro
               .parseWithIOException(PARSER, input, extensionRegistry);
         }
 
-        @java.lang.Override
         public Builder newBuilderForType() { return newBuilder(); }
         public static Builder newBuilder() {
           return DEFAULT_INSTANCE.toBuilder();
@@ -8594,7 +8404,6 @@ public static Builder newBuilder() {
         public static Builder newBuilder(com.google.cloud.dialogflow.v2.Intent.Message.Card.Button prototype) {
           return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
         }
-        @java.lang.Override
         public Builder toBuilder() {
           return this == DEFAULT_INSTANCE
               ? new Builder() : new Builder().mergeFrom(this);
@@ -8622,7 +8431,6 @@ public static final class Builder extends
             return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_Message_Card_Button_descriptor;
           }
 
-          @java.lang.Override
           protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
               internalGetFieldAccessorTable() {
             return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_Message_Card_Button_fieldAccessorTable
@@ -8645,7 +8453,6 @@ private void maybeForceBuilderInitialization() {
                     .alwaysUseFieldBuilders) {
             }
           }
-          @java.lang.Override
           public Builder clear() {
             super.clear();
             text_ = "";
@@ -8655,18 +8462,15 @@ public Builder clear() {
             return this;
           }
 
-          @java.lang.Override
           public com.google.protobuf.Descriptors.Descriptor
               getDescriptorForType() {
             return com.google.cloud.dialogflow.v2.IntentProto.internal_static_google_cloud_dialogflow_v2_Intent_Message_Card_Button_descriptor;
           }
 
-          @java.lang.Override
           public com.google.cloud.dialogflow.v2.Intent.Message.Card.Button getDefaultInstanceForType() {
             return com.google.cloud.dialogflow.v2.Intent.Message.Card.Button.getDefaultInstance();
           }
 
-          @java.lang.Override
           public com.google.cloud.dialogflow.v2.Intent.Message.Card.Button build() {
             com.google.cloud.dialogflow.v2.Intent.Message.Card.Button result = buildPartial();
             if (!result.isInitialized()) {
@@ -8675,7 +8479,6 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Card.Button build() {
             return result;
           }
 
-          @java.lang.Override
           public com.google.cloud.dialogflow.v2.Intent.Message.Card.Button buildPartial() {
             com.google.cloud.dialogflow.v2.Intent.Message.Card.Button result = new com.google.cloud.dialogflow.v2.Intent.Message.Card.Button(this);
             result.text_ = text_;
@@ -8684,39 +8487,32 @@ public com.google.cloud.dialogflow.v2.Intent.Message.Card.Button buildPartial()
             return result;
           }
 
-          @java.lang.Override
           public Builder clone() {
             return (Builder) super.clone();
           }
-          @java.lang.Override
           public Builder setField(
               com.google.protobuf.Descriptors.FieldDescriptor field,
               java.lang.Object value) {
             return (Builder) super.setField(field, value);
           }
-          @java.lang.Override
           public Builder clearField(
               com.google.protobuf.Descriptors.FieldDescriptor field) {
             return (Builder) super.clearField(field);
           }
-          @java.lang.Override
           public Builder clearOneof(
               com.google.protobuf.Descriptors.OneofDescriptor oneof) {
             return (Builder) super.clearOneof(oneof);
           }
-          @java.lang.Override
           public Builder setRepeatedField(
               com.google.protobuf.Descriptors.FieldDescriptor field,
               int index, java.lang.Object value) {
             return (Builder) super.setRepeatedField(field, index, value);
           }
-          @java.lang.Override
           public Builder addRepeatedField(
               com.google.protobuf.Descriptors.FieldDescriptor field,
               java.lang.Object value) {
             return (Builder) super.addRepeatedField(field, value);
           }
-          @java.lang.Override
           public Builder mergeFrom(com.google.protobuf.Message other) {
             if (other instanceof com.google.cloud.dialogflow.v2.Intent.Message.Card.Button) {
               return mergeFrom((com.google.cloud.dialogflow.v2.Intent.Message.Card.Button)other);
@@ -8741,12 +8537,10 @@ public Builder mergeFrom(com.google.cloud.dialogflow.v2.Intent.Message.Card.Butt
             return this;
           }
 
-          @java.lang.Override
           public final boolean isInitialized() {
             return true;
           }
 
-          @java.lang.Override
           public Builder mergeFrom(
               com.google.protobuf.CodedInputStream input,
               com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -8947,13 +8741,11 @@ public Builder setPostbackBytes(
             onChanged();
             return this;
           }
-          @java.lang.Override
           public final Builder setUnknownFields(
               final com.google.protobuf.UnknownFieldSet unknownFields) {
             return super.setUnknownFieldsProto3(unknownFields);
           }
 
-          @java.lang.Override
           public final Builder mergeUnknownFields(
               final com.google.protobuf.UnknownFieldSet unknownFields) {
             return super.mergeUnknownFields(unknownFields);
@@ -8975,12 +8767,11 @@ public static com.google.cloud.dialogflow.v2.Intent.Message.Card.Button getDefau
 
         private static final com.google.protobuf.Parser

       PARSER = new com.google.protobuf.AbstractParser
() {
-    @java.lang.Override
     public Table parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Table(input, extensionRegistry);
+        return new Table(input, extensionRegistry);
     }
   };
 
@@ -1887,7 +1832,6 @@ public com.google.protobuf.Parser
 getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.privacy.dlp.v2.Table getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TableLocation.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TableLocation.java
index 5fbffbc6223e..d590c2aacc9e 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TableLocation.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TableLocation.java
@@ -33,9 +33,6 @@ private TableLocation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,11 +44,6 @@ private TableLocation(
           case 0:
             done = true;
             break;
-          case 8: {
-
-            rowIndex_ = input.readInt64();
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -59,6 +51,11 @@ private TableLocation(
             }
             break;
           }
+          case 8: {
+
+            rowIndex_ = input.readInt64();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -76,7 +73,6 @@ private TableLocation(
     return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_TableLocation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_TableLocation_fieldAccessorTable
@@ -98,7 +94,6 @@ public long getRowIndex() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -108,7 +103,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (rowIndex_ != 0L) {
@@ -117,7 +111,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -234,7 +227,6 @@ public static com.google.privacy.dlp.v2.TableLocation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -242,7 +234,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.privacy.dlp.v2.TableLocation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -270,7 +261,6 @@ public static final class Builder extends
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_TableLocation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_TableLocation_fieldAccessorTable
@@ -293,7 +283,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       rowIndex_ = 0L;
@@ -301,18 +290,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_TableLocation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.TableLocation getDefaultInstanceForType() {
       return com.google.privacy.dlp.v2.TableLocation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.TableLocation build() {
       com.google.privacy.dlp.v2.TableLocation result = buildPartial();
       if (!result.isInitialized()) {
@@ -321,7 +307,6 @@ public com.google.privacy.dlp.v2.TableLocation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.TableLocation buildPartial() {
       com.google.privacy.dlp.v2.TableLocation result = new com.google.privacy.dlp.v2.TableLocation(this);
       result.rowIndex_ = rowIndex_;
@@ -329,39 +314,32 @@ public com.google.privacy.dlp.v2.TableLocation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.privacy.dlp.v2.TableLocation) {
         return mergeFrom((com.google.privacy.dlp.v2.TableLocation)other);
@@ -381,12 +359,10 @@ public Builder mergeFrom(com.google.privacy.dlp.v2.TableLocation other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -442,13 +418,11 @@ public Builder clearRowIndex() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -470,12 +444,11 @@ public static com.google.privacy.dlp.v2.TableLocation getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TableLocation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TableLocation(input, extensionRegistry);
+        return new TableLocation(input, extensionRegistry);
     }
   };
 
@@ -488,7 +461,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.privacy.dlp.v2.TableLocation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TimePartConfig.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TimePartConfig.java
index 63656e40b269..3455cca5f636 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TimePartConfig.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TimePartConfig.java
@@ -34,9 +34,6 @@ private TimePartConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,12 +45,6 @@ private TimePartConfig(
           case 0:
             done = true;
             break;
-          case 8: {
-            int rawValue = input.readEnum();
-
-            partToExtract_ = rawValue;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -61,6 +52,12 @@ private TimePartConfig(
             }
             break;
           }
+          case 8: {
+            int rawValue = input.readEnum();
+
+            partToExtract_ = rawValue;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -78,7 +75,6 @@ private TimePartConfig(
     return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_TimePartConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_TimePartConfig_fieldAccessorTable
@@ -289,13 +285,11 @@ public int getPartToExtractValue() {
    * .google.privacy.dlp.v2.TimePartConfig.TimePart part_to_extract = 1;
    */
   public com.google.privacy.dlp.v2.TimePartConfig.TimePart getPartToExtract() {
-    @SuppressWarnings("deprecation")
     com.google.privacy.dlp.v2.TimePartConfig.TimePart result = com.google.privacy.dlp.v2.TimePartConfig.TimePart.valueOf(partToExtract_);
     return result == null ? com.google.privacy.dlp.v2.TimePartConfig.TimePart.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -305,7 +299,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (partToExtract_ != com.google.privacy.dlp.v2.TimePartConfig.TimePart.TIME_PART_UNSPECIFIED.getNumber()) {
@@ -314,7 +307,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -429,7 +421,6 @@ public static com.google.privacy.dlp.v2.TimePartConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -437,7 +428,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.privacy.dlp.v2.TimePartConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -466,7 +456,6 @@ public static final class Builder extends
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_TimePartConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_TimePartConfig_fieldAccessorTable
@@ -489,7 +478,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       partToExtract_ = 0;
@@ -497,18 +485,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_TimePartConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.TimePartConfig getDefaultInstanceForType() {
       return com.google.privacy.dlp.v2.TimePartConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.TimePartConfig build() {
       com.google.privacy.dlp.v2.TimePartConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -517,7 +502,6 @@ public com.google.privacy.dlp.v2.TimePartConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.TimePartConfig buildPartial() {
       com.google.privacy.dlp.v2.TimePartConfig result = new com.google.privacy.dlp.v2.TimePartConfig(this);
       result.partToExtract_ = partToExtract_;
@@ -525,39 +509,32 @@ public com.google.privacy.dlp.v2.TimePartConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.privacy.dlp.v2.TimePartConfig) {
         return mergeFrom((com.google.privacy.dlp.v2.TimePartConfig)other);
@@ -577,12 +554,10 @@ public Builder mergeFrom(com.google.privacy.dlp.v2.TimePartConfig other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -620,7 +595,6 @@ public Builder setPartToExtractValue(int value) {
      * .google.privacy.dlp.v2.TimePartConfig.TimePart part_to_extract = 1;
      */
     public com.google.privacy.dlp.v2.TimePartConfig.TimePart getPartToExtract() {
-      @SuppressWarnings("deprecation")
       com.google.privacy.dlp.v2.TimePartConfig.TimePart result = com.google.privacy.dlp.v2.TimePartConfig.TimePart.valueOf(partToExtract_);
       return result == null ? com.google.privacy.dlp.v2.TimePartConfig.TimePart.UNRECOGNIZED : result;
     }
@@ -645,13 +619,11 @@ public Builder clearPartToExtract() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -673,12 +645,11 @@ public static com.google.privacy.dlp.v2.TimePartConfig getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TimePartConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TimePartConfig(input, extensionRegistry);
+        return new TimePartConfig(input, extensionRegistry);
     }
   };
 
@@ -691,7 +662,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.privacy.dlp.v2.TimePartConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransformationOverview.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransformationOverview.java
index b1a9cb42060e..2a9db114640f 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransformationOverview.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransformationOverview.java
@@ -34,9 +34,6 @@ private TransformationOverview(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private TransformationOverview(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 16: {
 
             transformedBytes_ = input.readInt64();
@@ -62,13 +66,6 @@ private TransformationOverview(
                 input.readMessage(com.google.privacy.dlp.v2.TransformationSummary.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -89,7 +86,6 @@ private TransformationOverview(
     return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_TransformationOverview_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_TransformationOverview_fieldAccessorTable
@@ -167,7 +163,6 @@ public com.google.privacy.dlp.v2.TransformationSummaryOrBuilder getTransformatio
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -177,7 +172,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (transformedBytes_ != 0L) {
@@ -189,7 +183,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -316,7 +309,6 @@ public static com.google.privacy.dlp.v2.TransformationOverview parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -324,7 +316,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.privacy.dlp.v2.TransformationOverview prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -352,7 +343,6 @@ public static final class Builder extends
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_TransformationOverview_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_TransformationOverview_fieldAccessorTable
@@ -376,7 +366,6 @@ private void maybeForceBuilderInitialization() {
         getTransformationSummariesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       transformedBytes_ = 0L;
@@ -390,18 +379,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_TransformationOverview_descriptor;
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.TransformationOverview getDefaultInstanceForType() {
       return com.google.privacy.dlp.v2.TransformationOverview.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.TransformationOverview build() {
       com.google.privacy.dlp.v2.TransformationOverview result = buildPartial();
       if (!result.isInitialized()) {
@@ -410,7 +396,6 @@ public com.google.privacy.dlp.v2.TransformationOverview build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.TransformationOverview buildPartial() {
       com.google.privacy.dlp.v2.TransformationOverview result = new com.google.privacy.dlp.v2.TransformationOverview(this);
       int from_bitField0_ = bitField0_;
@@ -430,39 +415,32 @@ public com.google.privacy.dlp.v2.TransformationOverview buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.privacy.dlp.v2.TransformationOverview) {
         return mergeFrom((com.google.privacy.dlp.v2.TransformationOverview)other);
@@ -508,12 +486,10 @@ public Builder mergeFrom(com.google.privacy.dlp.v2.TransformationOverview other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -882,13 +858,11 @@ public com.google.privacy.dlp.v2.TransformationSummary.Builder addTransformation
       }
       return transformationSummariesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -910,12 +884,11 @@ public static com.google.privacy.dlp.v2.TransformationOverview getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TransformationOverview parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TransformationOverview(input, extensionRegistry);
+        return new TransformationOverview(input, extensionRegistry);
     }
   };
 
@@ -928,7 +901,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.privacy.dlp.v2.TransformationOverview getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransformationSummary.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransformationSummary.java
index 1dc156b053a4..d04a93302b06 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransformationSummary.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransformationSummary.java
@@ -37,9 +37,6 @@ private TransformationSummary(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private TransformationSummary(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.privacy.dlp.v2.InfoType.Builder subBuilder = null;
             if (infoType_ != null) {
@@ -126,13 +130,6 @@ private TransformationSummary(
             transformedBytes_ = input.readInt64();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -156,7 +153,6 @@ private TransformationSummary(
     return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_TransformationSummary_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_TransformationSummary_fieldAccessorTable
@@ -346,9 +342,6 @@ private SummaryResult(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -360,6 +353,13 @@ private SummaryResult(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 8: {
 
               count_ = input.readInt64();
@@ -377,13 +377,6 @@ private SummaryResult(
               details_ = s;
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -401,7 +394,6 @@ private SummaryResult(
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_TransformationSummary_SummaryResult_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_TransformationSummary_SummaryResult_fieldAccessorTable
@@ -430,7 +422,6 @@ public int getCodeValue() {
      * .google.privacy.dlp.v2.TransformationSummary.TransformationResultCode code = 2;
      */
     public com.google.privacy.dlp.v2.TransformationSummary.TransformationResultCode getCode() {
-      @SuppressWarnings("deprecation")
       com.google.privacy.dlp.v2.TransformationSummary.TransformationResultCode result = com.google.privacy.dlp.v2.TransformationSummary.TransformationResultCode.valueOf(code_);
       return result == null ? com.google.privacy.dlp.v2.TransformationSummary.TransformationResultCode.UNRECOGNIZED : result;
     }
@@ -480,7 +471,6 @@ public java.lang.String getDetails() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -490,7 +480,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (count_ != 0L) {
@@ -505,7 +494,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -636,7 +624,6 @@ public static com.google.privacy.dlp.v2.TransformationSummary.SummaryResult pars
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -644,7 +631,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.privacy.dlp.v2.TransformationSummary.SummaryResult prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -673,7 +659,6 @@ public static final class Builder extends
         return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_TransformationSummary_SummaryResult_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_TransformationSummary_SummaryResult_fieldAccessorTable
@@ -696,7 +681,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         count_ = 0L;
@@ -708,18 +692,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_TransformationSummary_SummaryResult_descriptor;
       }
 
-      @java.lang.Override
       public com.google.privacy.dlp.v2.TransformationSummary.SummaryResult getDefaultInstanceForType() {
         return com.google.privacy.dlp.v2.TransformationSummary.SummaryResult.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.privacy.dlp.v2.TransformationSummary.SummaryResult build() {
         com.google.privacy.dlp.v2.TransformationSummary.SummaryResult result = buildPartial();
         if (!result.isInitialized()) {
@@ -728,7 +709,6 @@ public com.google.privacy.dlp.v2.TransformationSummary.SummaryResult build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.privacy.dlp.v2.TransformationSummary.SummaryResult buildPartial() {
         com.google.privacy.dlp.v2.TransformationSummary.SummaryResult result = new com.google.privacy.dlp.v2.TransformationSummary.SummaryResult(this);
         result.count_ = count_;
@@ -738,39 +718,32 @@ public com.google.privacy.dlp.v2.TransformationSummary.SummaryResult buildPartia
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.privacy.dlp.v2.TransformationSummary.SummaryResult) {
           return mergeFrom((com.google.privacy.dlp.v2.TransformationSummary.SummaryResult)other);
@@ -797,12 +770,10 @@ public Builder mergeFrom(com.google.privacy.dlp.v2.TransformationSummary.Summary
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -866,7 +837,6 @@ public Builder setCodeValue(int value) {
        * .google.privacy.dlp.v2.TransformationSummary.TransformationResultCode code = 2;
        */
       public com.google.privacy.dlp.v2.TransformationSummary.TransformationResultCode getCode() {
-        @SuppressWarnings("deprecation")
         com.google.privacy.dlp.v2.TransformationSummary.TransformationResultCode result = com.google.privacy.dlp.v2.TransformationSummary.TransformationResultCode.valueOf(code_);
         return result == null ? com.google.privacy.dlp.v2.TransformationSummary.TransformationResultCode.UNRECOGNIZED : result;
       }
@@ -985,13 +955,11 @@ public Builder setDetailsBytes(
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1013,12 +981,11 @@ public static com.google.privacy.dlp.v2.TransformationSummary.SummaryResult getD
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public SummaryResult parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new SummaryResult(input, extensionRegistry);
+          return new SummaryResult(input, extensionRegistry);
       }
     };
 
@@ -1031,7 +998,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.TransformationSummary.SummaryResult getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1285,7 +1251,6 @@ public long getTransformedBytes() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1295,7 +1260,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (infoType_ != null) {
@@ -1322,7 +1286,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1511,7 +1474,6 @@ public static com.google.privacy.dlp.v2.TransformationSummary parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1519,7 +1481,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.privacy.dlp.v2.TransformationSummary prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1549,7 +1510,6 @@ public static final class Builder extends
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_TransformationSummary_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_TransformationSummary_fieldAccessorTable
@@ -1574,7 +1534,6 @@ private void maybeForceBuilderInitialization() {
         getResultsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (infoTypeBuilder_ == null) {
@@ -1618,18 +1577,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_TransformationSummary_descriptor;
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.TransformationSummary getDefaultInstanceForType() {
       return com.google.privacy.dlp.v2.TransformationSummary.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.TransformationSummary build() {
       com.google.privacy.dlp.v2.TransformationSummary result = buildPartial();
       if (!result.isInitialized()) {
@@ -1638,7 +1594,6 @@ public com.google.privacy.dlp.v2.TransformationSummary build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.TransformationSummary buildPartial() {
       com.google.privacy.dlp.v2.TransformationSummary result = new com.google.privacy.dlp.v2.TransformationSummary(this);
       int from_bitField0_ = bitField0_;
@@ -1687,39 +1642,32 @@ public com.google.privacy.dlp.v2.TransformationSummary buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.privacy.dlp.v2.TransformationSummary) {
         return mergeFrom((com.google.privacy.dlp.v2.TransformationSummary)other);
@@ -1803,12 +1751,10 @@ public Builder mergeFrom(com.google.privacy.dlp.v2.TransformationSummary other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3065,13 +3011,11 @@ public Builder clearTransformedBytes() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -3093,12 +3037,11 @@ public static com.google.privacy.dlp.v2.TransformationSummary getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TransformationSummary parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TransformationSummary(input, extensionRegistry);
+        return new TransformationSummary(input, extensionRegistry);
     }
   };
 
@@ -3111,7 +3054,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.privacy.dlp.v2.TransformationSummary getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransientCryptoKey.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransientCryptoKey.java
index d08ba01fd1f7..be252f794e96 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransientCryptoKey.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/TransientCryptoKey.java
@@ -34,9 +34,6 @@ private TransientCryptoKey(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,12 +45,6 @@ private TransientCryptoKey(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -61,6 +52,12 @@ private TransientCryptoKey(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -78,7 +75,6 @@ private TransientCryptoKey(
     return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_TransientCryptoKey_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_TransientCryptoKey_fieldAccessorTable
@@ -139,7 +135,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -149,7 +144,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -158,7 +152,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -273,7 +266,6 @@ public static com.google.privacy.dlp.v2.TransientCryptoKey parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -281,7 +273,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.privacy.dlp.v2.TransientCryptoKey prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -310,7 +301,6 @@ public static final class Builder extends
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_TransientCryptoKey_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_TransientCryptoKey_fieldAccessorTable
@@ -333,7 +323,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -341,18 +330,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_TransientCryptoKey_descriptor;
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.TransientCryptoKey getDefaultInstanceForType() {
       return com.google.privacy.dlp.v2.TransientCryptoKey.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.TransientCryptoKey build() {
       com.google.privacy.dlp.v2.TransientCryptoKey result = buildPartial();
       if (!result.isInitialized()) {
@@ -361,7 +347,6 @@ public com.google.privacy.dlp.v2.TransientCryptoKey build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.TransientCryptoKey buildPartial() {
       com.google.privacy.dlp.v2.TransientCryptoKey result = new com.google.privacy.dlp.v2.TransientCryptoKey(this);
       result.name_ = name_;
@@ -369,39 +354,32 @@ public com.google.privacy.dlp.v2.TransientCryptoKey buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.privacy.dlp.v2.TransientCryptoKey) {
         return mergeFrom((com.google.privacy.dlp.v2.TransientCryptoKey)other);
@@ -422,12 +400,10 @@ public Builder mergeFrom(com.google.privacy.dlp.v2.TransientCryptoKey other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -559,13 +535,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -587,12 +561,11 @@ public static com.google.privacy.dlp.v2.TransientCryptoKey getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TransientCryptoKey parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TransientCryptoKey(input, extensionRegistry);
+        return new TransientCryptoKey(input, extensionRegistry);
     }
   };
 
@@ -605,7 +578,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.privacy.dlp.v2.TransientCryptoKey getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UnwrappedCryptoKey.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UnwrappedCryptoKey.java
index d29159b7c9ca..11835486b821 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UnwrappedCryptoKey.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UnwrappedCryptoKey.java
@@ -34,9 +34,6 @@ private UnwrappedCryptoKey(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,11 +45,6 @@ private UnwrappedCryptoKey(
           case 0:
             done = true;
             break;
-          case 10: {
-
-            key_ = input.readBytes();
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +52,11 @@ private UnwrappedCryptoKey(
             }
             break;
           }
+          case 10: {
+
+            key_ = input.readBytes();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private UnwrappedCryptoKey(
     return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_UnwrappedCryptoKey_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_UnwrappedCryptoKey_fieldAccessorTable
@@ -99,7 +95,6 @@ public com.google.protobuf.ByteString getKey() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -109,7 +104,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!key_.isEmpty()) {
@@ -118,7 +112,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -234,7 +227,6 @@ public static com.google.privacy.dlp.v2.UnwrappedCryptoKey parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -242,7 +234,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.privacy.dlp.v2.UnwrappedCryptoKey prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -271,7 +262,6 @@ public static final class Builder extends
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_UnwrappedCryptoKey_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_UnwrappedCryptoKey_fieldAccessorTable
@@ -294,7 +284,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       key_ = com.google.protobuf.ByteString.EMPTY;
@@ -302,18 +291,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_UnwrappedCryptoKey_descriptor;
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.UnwrappedCryptoKey getDefaultInstanceForType() {
       return com.google.privacy.dlp.v2.UnwrappedCryptoKey.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.UnwrappedCryptoKey build() {
       com.google.privacy.dlp.v2.UnwrappedCryptoKey result = buildPartial();
       if (!result.isInitialized()) {
@@ -322,7 +308,6 @@ public com.google.privacy.dlp.v2.UnwrappedCryptoKey build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.UnwrappedCryptoKey buildPartial() {
       com.google.privacy.dlp.v2.UnwrappedCryptoKey result = new com.google.privacy.dlp.v2.UnwrappedCryptoKey(this);
       result.key_ = key_;
@@ -330,39 +315,32 @@ public com.google.privacy.dlp.v2.UnwrappedCryptoKey buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.privacy.dlp.v2.UnwrappedCryptoKey) {
         return mergeFrom((com.google.privacy.dlp.v2.UnwrappedCryptoKey)other);
@@ -382,12 +360,10 @@ public Builder mergeFrom(com.google.privacy.dlp.v2.UnwrappedCryptoKey other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -446,13 +422,11 @@ public Builder clearKey() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -474,12 +448,11 @@ public static com.google.privacy.dlp.v2.UnwrappedCryptoKey getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UnwrappedCryptoKey parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UnwrappedCryptoKey(input, extensionRegistry);
+        return new UnwrappedCryptoKey(input, extensionRegistry);
     }
   };
 
@@ -492,7 +465,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.privacy.dlp.v2.UnwrappedCryptoKey getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateDeidentifyTemplateRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateDeidentifyTemplateRequest.java
index 51f710e628ec..1dfc0ce4bede 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateDeidentifyTemplateRequest.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateDeidentifyTemplateRequest.java
@@ -33,9 +33,6 @@ private UpdateDeidentifyTemplateRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private UpdateDeidentifyTemplateRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -79,13 +83,6 @@ private UpdateDeidentifyTemplateRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private UpdateDeidentifyTemplateRequest(
     return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_UpdateDeidentifyTemplateRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_UpdateDeidentifyTemplateRequest_fieldAccessorTable
@@ -224,7 +220,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -234,7 +229,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -249,7 +243,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -390,7 +383,6 @@ public static com.google.privacy.dlp.v2.UpdateDeidentifyTemplateRequest parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -398,7 +390,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.privacy.dlp.v2.UpdateDeidentifyTemplateRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -426,7 +417,6 @@ public static final class Builder extends
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_UpdateDeidentifyTemplateRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_UpdateDeidentifyTemplateRequest_fieldAccessorTable
@@ -449,7 +439,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -469,18 +458,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_UpdateDeidentifyTemplateRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.UpdateDeidentifyTemplateRequest getDefaultInstanceForType() {
       return com.google.privacy.dlp.v2.UpdateDeidentifyTemplateRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.UpdateDeidentifyTemplateRequest build() {
       com.google.privacy.dlp.v2.UpdateDeidentifyTemplateRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -489,7 +475,6 @@ public com.google.privacy.dlp.v2.UpdateDeidentifyTemplateRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.UpdateDeidentifyTemplateRequest buildPartial() {
       com.google.privacy.dlp.v2.UpdateDeidentifyTemplateRequest result = new com.google.privacy.dlp.v2.UpdateDeidentifyTemplateRequest(this);
       result.name_ = name_;
@@ -507,39 +492,32 @@ public com.google.privacy.dlp.v2.UpdateDeidentifyTemplateRequest buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.privacy.dlp.v2.UpdateDeidentifyTemplateRequest) {
         return mergeFrom((com.google.privacy.dlp.v2.UpdateDeidentifyTemplateRequest)other);
@@ -566,12 +544,10 @@ public Builder mergeFrom(com.google.privacy.dlp.v2.UpdateDeidentifyTemplateReque
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -994,13 +970,11 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
       }
       return updateMaskBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1022,12 +996,11 @@ public static com.google.privacy.dlp.v2.UpdateDeidentifyTemplateRequest getDefau
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateDeidentifyTemplateRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateDeidentifyTemplateRequest(input, extensionRegistry);
+        return new UpdateDeidentifyTemplateRequest(input, extensionRegistry);
     }
   };
 
@@ -1040,7 +1013,6 @@ public com.google.protobuf.Parser getParserForT
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.privacy.dlp.v2.UpdateDeidentifyTemplateRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateInspectTemplateRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateInspectTemplateRequest.java
index 47eb1ad2fd96..828f10884cf8 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateInspectTemplateRequest.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateInspectTemplateRequest.java
@@ -33,9 +33,6 @@ private UpdateInspectTemplateRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private UpdateInspectTemplateRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -79,13 +83,6 @@ private UpdateInspectTemplateRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private UpdateInspectTemplateRequest(
     return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_UpdateInspectTemplateRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_UpdateInspectTemplateRequest_fieldAccessorTable
@@ -224,7 +220,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -234,7 +229,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -249,7 +243,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -390,7 +383,6 @@ public static com.google.privacy.dlp.v2.UpdateInspectTemplateRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -398,7 +390,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.privacy.dlp.v2.UpdateInspectTemplateRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -426,7 +417,6 @@ public static final class Builder extends
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_UpdateInspectTemplateRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_UpdateInspectTemplateRequest_fieldAccessorTable
@@ -449,7 +439,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -469,18 +458,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_UpdateInspectTemplateRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.UpdateInspectTemplateRequest getDefaultInstanceForType() {
       return com.google.privacy.dlp.v2.UpdateInspectTemplateRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.UpdateInspectTemplateRequest build() {
       com.google.privacy.dlp.v2.UpdateInspectTemplateRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -489,7 +475,6 @@ public com.google.privacy.dlp.v2.UpdateInspectTemplateRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.UpdateInspectTemplateRequest buildPartial() {
       com.google.privacy.dlp.v2.UpdateInspectTemplateRequest result = new com.google.privacy.dlp.v2.UpdateInspectTemplateRequest(this);
       result.name_ = name_;
@@ -507,39 +492,32 @@ public com.google.privacy.dlp.v2.UpdateInspectTemplateRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.privacy.dlp.v2.UpdateInspectTemplateRequest) {
         return mergeFrom((com.google.privacy.dlp.v2.UpdateInspectTemplateRequest)other);
@@ -566,12 +544,10 @@ public Builder mergeFrom(com.google.privacy.dlp.v2.UpdateInspectTemplateRequest
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -994,13 +970,11 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
       }
       return updateMaskBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1022,12 +996,11 @@ public static com.google.privacy.dlp.v2.UpdateInspectTemplateRequest getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateInspectTemplateRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateInspectTemplateRequest(input, extensionRegistry);
+        return new UpdateInspectTemplateRequest(input, extensionRegistry);
     }
   };
 
@@ -1040,7 +1013,6 @@ public com.google.protobuf.Parser getParserForType
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.privacy.dlp.v2.UpdateInspectTemplateRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateJobTriggerRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateJobTriggerRequest.java
index 748289791819..a04982ce8828 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateJobTriggerRequest.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateJobTriggerRequest.java
@@ -33,9 +33,6 @@ private UpdateJobTriggerRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private UpdateJobTriggerRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -79,13 +83,6 @@ private UpdateJobTriggerRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private UpdateJobTriggerRequest(
     return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_UpdateJobTriggerRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_UpdateJobTriggerRequest_fieldAccessorTable
@@ -222,7 +218,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -232,7 +227,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -247,7 +241,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -388,7 +381,6 @@ public static com.google.privacy.dlp.v2.UpdateJobTriggerRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -396,7 +388,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.privacy.dlp.v2.UpdateJobTriggerRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -424,7 +415,6 @@ public static final class Builder extends
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_UpdateJobTriggerRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_UpdateJobTriggerRequest_fieldAccessorTable
@@ -447,7 +437,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -467,18 +456,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_UpdateJobTriggerRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.UpdateJobTriggerRequest getDefaultInstanceForType() {
       return com.google.privacy.dlp.v2.UpdateJobTriggerRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.UpdateJobTriggerRequest build() {
       com.google.privacy.dlp.v2.UpdateJobTriggerRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -487,7 +473,6 @@ public com.google.privacy.dlp.v2.UpdateJobTriggerRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.UpdateJobTriggerRequest buildPartial() {
       com.google.privacy.dlp.v2.UpdateJobTriggerRequest result = new com.google.privacy.dlp.v2.UpdateJobTriggerRequest(this);
       result.name_ = name_;
@@ -505,39 +490,32 @@ public com.google.privacy.dlp.v2.UpdateJobTriggerRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.privacy.dlp.v2.UpdateJobTriggerRequest) {
         return mergeFrom((com.google.privacy.dlp.v2.UpdateJobTriggerRequest)other);
@@ -564,12 +542,10 @@ public Builder mergeFrom(com.google.privacy.dlp.v2.UpdateJobTriggerRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -987,13 +963,11 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
       }
       return updateMaskBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1015,12 +989,11 @@ public static com.google.privacy.dlp.v2.UpdateJobTriggerRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateJobTriggerRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateJobTriggerRequest(input, extensionRegistry);
+        return new UpdateJobTriggerRequest(input, extensionRegistry);
     }
   };
 
@@ -1033,7 +1006,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.privacy.dlp.v2.UpdateJobTriggerRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateStoredInfoTypeRequest.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateStoredInfoTypeRequest.java
index aae1a99dff5b..f63b056532f5 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateStoredInfoTypeRequest.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/UpdateStoredInfoTypeRequest.java
@@ -33,9 +33,6 @@ private UpdateStoredInfoTypeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private UpdateStoredInfoTypeRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -79,13 +83,6 @@ private UpdateStoredInfoTypeRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private UpdateStoredInfoTypeRequest(
     return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_UpdateStoredInfoTypeRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_UpdateStoredInfoTypeRequest_fieldAccessorTable
@@ -230,7 +226,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -240,7 +235,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -255,7 +249,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -396,7 +389,6 @@ public static com.google.privacy.dlp.v2.UpdateStoredInfoTypeRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -404,7 +396,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.privacy.dlp.v2.UpdateStoredInfoTypeRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -432,7 +423,6 @@ public static final class Builder extends
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_UpdateStoredInfoTypeRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_UpdateStoredInfoTypeRequest_fieldAccessorTable
@@ -455,7 +445,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -475,18 +464,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_UpdateStoredInfoTypeRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.UpdateStoredInfoTypeRequest getDefaultInstanceForType() {
       return com.google.privacy.dlp.v2.UpdateStoredInfoTypeRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.UpdateStoredInfoTypeRequest build() {
       com.google.privacy.dlp.v2.UpdateStoredInfoTypeRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -495,7 +481,6 @@ public com.google.privacy.dlp.v2.UpdateStoredInfoTypeRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.UpdateStoredInfoTypeRequest buildPartial() {
       com.google.privacy.dlp.v2.UpdateStoredInfoTypeRequest result = new com.google.privacy.dlp.v2.UpdateStoredInfoTypeRequest(this);
       result.name_ = name_;
@@ -513,39 +498,32 @@ public com.google.privacy.dlp.v2.UpdateStoredInfoTypeRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.privacy.dlp.v2.UpdateStoredInfoTypeRequest) {
         return mergeFrom((com.google.privacy.dlp.v2.UpdateStoredInfoTypeRequest)other);
@@ -572,12 +550,10 @@ public Builder mergeFrom(com.google.privacy.dlp.v2.UpdateStoredInfoTypeRequest o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1018,13 +994,11 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
       }
       return updateMaskBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1046,12 +1020,11 @@ public static com.google.privacy.dlp.v2.UpdateStoredInfoTypeRequest getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateStoredInfoTypeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateStoredInfoTypeRequest(input, extensionRegistry);
+        return new UpdateStoredInfoTypeRequest(input, extensionRegistry);
     }
   };
 
@@ -1064,7 +1037,6 @@ public com.google.protobuf.Parser getParserForType(
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.privacy.dlp.v2.UpdateStoredInfoTypeRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Value.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Value.java
index 930ebbfbe4f3..44a5719a0ed7 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Value.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/Value.java
@@ -37,9 +37,6 @@ private Value(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private Value(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             typeCase_ = 1;
             type_ = input.readInt64();
@@ -120,13 +124,6 @@ private Value(
             type_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -144,7 +141,6 @@ private Value(
     return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_Value_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_Value_fieldAccessorTable
@@ -371,7 +367,6 @@ public int getDayOfWeekValueValue() {
    */
   public com.google.type.DayOfWeek getDayOfWeekValue() {
     if (typeCase_ == 8) {
-      @SuppressWarnings("deprecation")
       com.google.type.DayOfWeek result = com.google.type.DayOfWeek.valueOf(
           (java.lang.Integer) type_);
       return result == null ? com.google.type.DayOfWeek.UNRECOGNIZED : result;
@@ -380,7 +375,6 @@ public com.google.type.DayOfWeek getDayOfWeekValue() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -390,7 +384,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (typeCase_ == 1) {
@@ -423,7 +416,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -645,7 +637,6 @@ public static com.google.privacy.dlp.v2.Value parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -653,7 +644,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.privacy.dlp.v2.Value prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -686,7 +676,6 @@ public static final class Builder extends
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_Value_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_Value_fieldAccessorTable
@@ -709,7 +698,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       typeCase_ = 0;
@@ -717,18 +705,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_Value_descriptor;
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.Value getDefaultInstanceForType() {
       return com.google.privacy.dlp.v2.Value.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.Value build() {
       com.google.privacy.dlp.v2.Value result = buildPartial();
       if (!result.isInitialized()) {
@@ -737,7 +722,6 @@ public com.google.privacy.dlp.v2.Value build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.Value buildPartial() {
       com.google.privacy.dlp.v2.Value result = new com.google.privacy.dlp.v2.Value(this);
       if (typeCase_ == 1) {
@@ -781,39 +765,32 @@ public com.google.privacy.dlp.v2.Value buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.privacy.dlp.v2.Value) {
         return mergeFrom((com.google.privacy.dlp.v2.Value)other);
@@ -869,12 +846,10 @@ public Builder mergeFrom(com.google.privacy.dlp.v2.Value other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1509,7 +1484,6 @@ public Builder setDayOfWeekValueValue(int value) {
      */
     public com.google.type.DayOfWeek getDayOfWeekValue() {
       if (typeCase_ == 8) {
-        @SuppressWarnings("deprecation")
         com.google.type.DayOfWeek result = com.google.type.DayOfWeek.valueOf(
             (java.lang.Integer) type_);
         return result == null ? com.google.type.DayOfWeek.UNRECOGNIZED : result;
@@ -1539,13 +1513,11 @@ public Builder clearDayOfWeekValue() {
       }
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1567,12 +1539,11 @@ public static com.google.privacy.dlp.v2.Value getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Value parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Value(input, extensionRegistry);
+        return new Value(input, extensionRegistry);
     }
   };
 
@@ -1585,7 +1556,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.privacy.dlp.v2.Value getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ValueFrequency.java b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ValueFrequency.java
index e1655d95461f..cf3655cd3ac1 100644
--- a/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ValueFrequency.java
+++ b/google-api-grpc/proto-google-cloud-dlp-v2/src/main/java/com/google/privacy/dlp/v2/ValueFrequency.java
@@ -33,9 +33,6 @@ private ValueFrequency(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ValueFrequency(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.privacy.dlp.v2.Value.Builder subBuilder = null;
             if (value_ != null) {
@@ -65,13 +69,6 @@ private ValueFrequency(
             count_ = input.readInt64();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -89,7 +86,6 @@ private ValueFrequency(
     return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_ValueFrequency_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_ValueFrequency_fieldAccessorTable
@@ -144,7 +140,6 @@ public long getCount() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -154,7 +149,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (value_ != null) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -296,7 +289,6 @@ public static com.google.privacy.dlp.v2.ValueFrequency parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -304,7 +296,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.privacy.dlp.v2.ValueFrequency prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -332,7 +323,6 @@ public static final class Builder extends
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_ValueFrequency_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_ValueFrequency_fieldAccessorTable
@@ -355,7 +345,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (valueBuilder_ == null) {
@@ -369,18 +358,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.privacy.dlp.v2.DlpProto.internal_static_google_privacy_dlp_v2_ValueFrequency_descriptor;
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.ValueFrequency getDefaultInstanceForType() {
       return com.google.privacy.dlp.v2.ValueFrequency.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.ValueFrequency build() {
       com.google.privacy.dlp.v2.ValueFrequency result = buildPartial();
       if (!result.isInitialized()) {
@@ -389,7 +375,6 @@ public com.google.privacy.dlp.v2.ValueFrequency build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.privacy.dlp.v2.ValueFrequency buildPartial() {
       com.google.privacy.dlp.v2.ValueFrequency result = new com.google.privacy.dlp.v2.ValueFrequency(this);
       if (valueBuilder_ == null) {
@@ -402,39 +387,32 @@ public com.google.privacy.dlp.v2.ValueFrequency buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.privacy.dlp.v2.ValueFrequency) {
         return mergeFrom((com.google.privacy.dlp.v2.ValueFrequency)other);
@@ -457,12 +435,10 @@ public Builder mergeFrom(com.google.privacy.dlp.v2.ValueFrequency other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -671,13 +647,11 @@ public Builder clearCount() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -699,12 +673,11 @@ public static com.google.privacy.dlp.v2.ValueFrequency getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ValueFrequency parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ValueFrequency(input, extensionRegistry);
+        return new ValueFrequency(input, extensionRegistry);
     }
   };
 
@@ -717,7 +690,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.privacy.dlp.v2.ValueFrequency getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/CommonProto.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/CommonProto.java
index 71a1f151e119..2c7232cbb3d2 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/CommonProto.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/CommonProto.java
@@ -67,7 +67,7 @@ public static void registerAllExtensions(
       "p_id\030\002 \001(\t\022S\n\017tracking_issues\030\003 \003(\0132:.go" +
       "ogle.devtools.clouderrorreporting.v1beta" +
       "1.TrackingIssue\"\034\n\rTrackingIssue\022\013\n\003url\030" +
-      "\001 \001(\t\"\357\001\n\nErrorEvent\022.\n\nevent_time\030\001 \001(\013" +
+      "\001 \001(\t\"\357\001\n\nErrorEvent\022.\n\nevent_time\030\001 \001(\013",
       "2\032.google.protobuf.Timestamp\022T\n\017service_" +
       "context\030\002 \001(\0132;.google.devtools.clouderr" +
       "orreporting.v1beta1.ServiceContext\022\017\n\007me" +
@@ -77,7 +77,7 @@ public static void registerAllExtensions(
       "(\t\022\017\n\007version\030\003 \001(\t\022\025\n\rresource_type\030\004 \001" +
       "(\t\"\311\001\n\014ErrorContext\022U\n\014http_request\030\001 \001(" +
       "\0132?.google.devtools.clouderrorreporting." +
-      "v1beta1.HttpRequestContext\022\014\n\004user\030\002 \001(\t" +
+      "v1beta1.HttpRequestContext\022\014\n\004user\030\002 \001(\t",
       "\022T\n\017report_location\030\003 \001(\0132;.google.devto" +
       "ols.clouderrorreporting.v1beta1.SourceLo" +
       "cation\"\210\001\n\022HttpRequestContext\022\016\n\006method\030" +
@@ -87,7 +87,7 @@ public static void registerAllExtensions(
       "ion\022\021\n\tfile_path\030\001 \001(\t\022\023\n\013line_number\030\002 " +
       "\001(\005\022\025\n\rfunction_name\030\004 \001(\tB\354\001\n/com.googl" +
       "e.devtools.clouderrorreporting.v1beta1B\013" +
-      "CommonProtoP\001Z^google.golang.org/genprot" +
+      "CommonProtoP\001Z^google.golang.org/genprot",
       "o/googleapis/devtools/clouderrorreportin" +
       "g/v1beta1;clouderrorreporting\252\002#Google.C" +
       "loud.ErrorReporting.V1Beta1\312\002#Google\\Clo" +
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/DeleteEventsRequest.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/DeleteEventsRequest.java
index 2b176cd35b82..7dcbb819988f 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/DeleteEventsRequest.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/DeleteEventsRequest.java
@@ -33,9 +33,6 @@ private DeleteEventsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteEventsRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            projectName_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteEventsRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            projectName_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteEventsRequest(
     return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_DeleteEventsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_DeleteEventsRequest_fieldAccessorTable
@@ -136,7 +132,6 @@ public java.lang.String getProjectName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -146,7 +141,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectNameBytes().isEmpty()) {
@@ -155,7 +149,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -270,7 +263,6 @@ public static com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsReques
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -278,7 +270,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -306,7 +297,6 @@ public static final class Builder extends
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_DeleteEventsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_DeleteEventsRequest_fieldAccessorTable
@@ -329,7 +319,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectName_ = "";
@@ -337,18 +326,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_DeleteEventsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsRequest getDefaultInstanceForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsRequest build() {
       com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -357,7 +343,6 @@ public com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsRequest build
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsRequest buildPartial() {
       com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsRequest result = new com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsRequest(this);
       result.projectName_ = projectName_;
@@ -365,39 +350,32 @@ public com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsRequest build
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsRequest) {
         return mergeFrom((com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsRequest)other);
@@ -418,12 +396,10 @@ public Builder mergeFrom(com.google.devtools.clouderrorreporting.v1beta1.DeleteE
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -550,13 +526,11 @@ public Builder setProjectNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -578,12 +552,11 @@ public static com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsReques
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteEventsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteEventsRequest(input, extensionRegistry);
+        return new DeleteEventsRequest(input, extensionRegistry);
     }
   };
 
@@ -596,7 +569,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/DeleteEventsResponse.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/DeleteEventsResponse.java
index b6e150a42fdf..d30b3b22cea5 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/DeleteEventsResponse.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/DeleteEventsResponse.java
@@ -32,9 +32,6 @@ private DeleteEventsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -69,7 +66,6 @@ private DeleteEventsResponse(
     return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_DeleteEventsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_DeleteEventsResponse_fieldAccessorTable
@@ -78,7 +74,6 @@ private DeleteEventsResponse(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -88,13 +83,11 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -202,7 +195,6 @@ public static com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsRespon
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -210,7 +202,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -238,7 +229,6 @@ public static final class Builder extends
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_DeleteEventsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_DeleteEventsResponse_fieldAccessorTable
@@ -261,24 +251,20 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_DeleteEventsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsResponse getDefaultInstanceForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsResponse build() {
       com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -287,46 +273,38 @@ public com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsResponse buil
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsResponse buildPartial() {
       com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsResponse result = new com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsResponse(this);
       onBuilt();
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsResponse) {
         return mergeFrom((com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsResponse)other);
@@ -343,12 +321,10 @@ public Builder mergeFrom(com.google.devtools.clouderrorreporting.v1beta1.DeleteE
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -366,13 +342,11 @@ public Builder mergeFrom(
       }
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -394,12 +368,11 @@ public static com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsRespon
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteEventsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteEventsResponse(input, extensionRegistry);
+        return new DeleteEventsResponse(input, extensionRegistry);
     }
   };
 
@@ -412,7 +385,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.clouderrorreporting.v1beta1.DeleteEventsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorContext.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorContext.java
index f3bc56ca9c3b..ae00581c4ea0 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorContext.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorContext.java
@@ -36,9 +36,6 @@ private ErrorContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private ErrorContext(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.devtools.clouderrorreporting.v1beta1.HttpRequestContext.Builder subBuilder = null;
             if (httpRequest_ != null) {
@@ -82,13 +86,6 @@ private ErrorContext(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -106,7 +103,6 @@ private ErrorContext(
     return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ErrorContext_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ErrorContext_fieldAccessorTable
@@ -255,7 +251,6 @@ public com.google.devtools.clouderrorreporting.v1beta1.SourceLocationOrBuilder g
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -265,7 +260,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (httpRequest_ != null) {
@@ -280,7 +274,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -421,7 +414,6 @@ public static com.google.devtools.clouderrorreporting.v1beta1.ErrorContext parse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -429,7 +421,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.clouderrorreporting.v1beta1.ErrorContext prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -460,7 +451,6 @@ public static final class Builder extends
       return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ErrorContext_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ErrorContext_fieldAccessorTable
@@ -483,7 +473,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (httpRequestBuilder_ == null) {
@@ -503,18 +492,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ErrorContext_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ErrorContext getDefaultInstanceForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorContext.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ErrorContext build() {
       com.google.devtools.clouderrorreporting.v1beta1.ErrorContext result = buildPartial();
       if (!result.isInitialized()) {
@@ -523,7 +509,6 @@ public com.google.devtools.clouderrorreporting.v1beta1.ErrorContext build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ErrorContext buildPartial() {
       com.google.devtools.clouderrorreporting.v1beta1.ErrorContext result = new com.google.devtools.clouderrorreporting.v1beta1.ErrorContext(this);
       if (httpRequestBuilder_ == null) {
@@ -541,39 +526,32 @@ public com.google.devtools.clouderrorreporting.v1beta1.ErrorContext buildPartial
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.clouderrorreporting.v1beta1.ErrorContext) {
         return mergeFrom((com.google.devtools.clouderrorreporting.v1beta1.ErrorContext)other);
@@ -600,12 +578,10 @@ public Builder mergeFrom(com.google.devtools.clouderrorreporting.v1beta1.ErrorCo
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1107,13 +1083,11 @@ public com.google.devtools.clouderrorreporting.v1beta1.SourceLocationOrBuilder g
       }
       return reportLocationBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1135,12 +1109,11 @@ public static com.google.devtools.clouderrorreporting.v1beta1.ErrorContext getDe
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ErrorContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ErrorContext(input, extensionRegistry);
+        return new ErrorContext(input, extensionRegistry);
     }
   };
 
@@ -1153,7 +1126,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.clouderrorreporting.v1beta1.ErrorContext getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorEvent.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorEvent.java
index 06357ca157ab..583286959f24 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorEvent.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorEvent.java
@@ -33,9 +33,6 @@ private ErrorEvent(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ErrorEvent(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.protobuf.Timestamp.Builder subBuilder = null;
             if (eventTime_ != null) {
@@ -92,13 +96,6 @@ private ErrorEvent(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -116,7 +113,6 @@ private ErrorEvent(
     return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ErrorEvent_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ErrorEvent_fieldAccessorTable
@@ -272,7 +268,6 @@ public com.google.devtools.clouderrorreporting.v1beta1.ErrorContextOrBuilder get
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -282,7 +277,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (eventTime_ != null) {
@@ -300,7 +294,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -454,7 +447,6 @@ public static com.google.devtools.clouderrorreporting.v1beta1.ErrorEvent parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -462,7 +454,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.clouderrorreporting.v1beta1.ErrorEvent prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -490,7 +481,6 @@ public static final class Builder extends
       return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ErrorEvent_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ErrorEvent_fieldAccessorTable
@@ -513,7 +503,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (eventTimeBuilder_ == null) {
@@ -539,18 +528,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ErrorEvent_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ErrorEvent getDefaultInstanceForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorEvent.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ErrorEvent build() {
       com.google.devtools.clouderrorreporting.v1beta1.ErrorEvent result = buildPartial();
       if (!result.isInitialized()) {
@@ -559,7 +545,6 @@ public com.google.devtools.clouderrorreporting.v1beta1.ErrorEvent build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ErrorEvent buildPartial() {
       com.google.devtools.clouderrorreporting.v1beta1.ErrorEvent result = new com.google.devtools.clouderrorreporting.v1beta1.ErrorEvent(this);
       if (eventTimeBuilder_ == null) {
@@ -582,39 +567,32 @@ public com.google.devtools.clouderrorreporting.v1beta1.ErrorEvent buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.clouderrorreporting.v1beta1.ErrorEvent) {
         return mergeFrom((com.google.devtools.clouderrorreporting.v1beta1.ErrorEvent)other);
@@ -644,12 +622,10 @@ public Builder mergeFrom(com.google.devtools.clouderrorreporting.v1beta1.ErrorEv
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1233,13 +1209,11 @@ public com.google.devtools.clouderrorreporting.v1beta1.ErrorContextOrBuilder get
       }
       return contextBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1261,12 +1235,11 @@ public static com.google.devtools.clouderrorreporting.v1beta1.ErrorEvent getDefa
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ErrorEvent parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ErrorEvent(input, extensionRegistry);
+        return new ErrorEvent(input, extensionRegistry);
     }
   };
 
@@ -1279,7 +1252,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.clouderrorreporting.v1beta1.ErrorEvent getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorGroup.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorGroup.java
index 7436a2b476fe..53db8027af5a 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorGroup.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorGroup.java
@@ -35,9 +35,6 @@ private ErrorGroup(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ErrorGroup(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -70,13 +74,6 @@ private ErrorGroup(
                 input.readMessage(com.google.devtools.clouderrorreporting.v1beta1.TrackingIssue.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private ErrorGroup(
     return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ErrorGroup_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ErrorGroup_fieldAccessorTable
@@ -250,7 +246,6 @@ public com.google.devtools.clouderrorreporting.v1beta1.TrackingIssueOrBuilder ge
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -260,7 +255,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -275,7 +269,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -407,7 +400,6 @@ public static com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -415,7 +407,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -443,7 +434,6 @@ public static final class Builder extends
       return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ErrorGroup_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ErrorGroup_fieldAccessorTable
@@ -467,7 +457,6 @@ private void maybeForceBuilderInitialization() {
         getTrackingIssuesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -483,18 +472,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ErrorGroup_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup getDefaultInstanceForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup build() {
       com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup result = buildPartial();
       if (!result.isInitialized()) {
@@ -503,7 +489,6 @@ public com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup buildPartial() {
       com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup result = new com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup(this);
       int from_bitField0_ = bitField0_;
@@ -524,39 +509,32 @@ public com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup) {
         return mergeFrom((com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup)other);
@@ -607,12 +585,10 @@ public Builder mergeFrom(com.google.devtools.clouderrorreporting.v1beta1.ErrorGr
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1131,13 +1107,11 @@ public com.google.devtools.clouderrorreporting.v1beta1.TrackingIssue.Builder add
       }
       return trackingIssuesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1159,12 +1133,11 @@ public static com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup getDefa
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ErrorGroup parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ErrorGroup(input, extensionRegistry);
+        return new ErrorGroup(input, extensionRegistry);
     }
   };
 
@@ -1177,7 +1150,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorGroupServiceProto.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorGroupServiceProto.java
index ffcce50e6650..a8ef22bf952e 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorGroupServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorGroupServiceProto.java
@@ -42,7 +42,7 @@ public static void registerAllExtensions(
       "\001(\t\"\\\n\022UpdateGroupRequest\022F\n\005group\030\001 \001(\013" +
       "27.google.devtools.clouderrorreporting.v" +
       "1beta1.ErrorGroup2\216\003\n\021ErrorGroupService\022" +
-      "\264\001\n\010GetGroup\022<.google.devtools.clouderro" +
+      "\264\001\n\010GetGroup\022<.google.devtools.clouderro",
       "rreporting.v1beta1.GetGroupRequest\0327.goo" +
       "gle.devtools.clouderrorreporting.v1beta1" +
       ".ErrorGroup\"1\202\323\344\223\002+\022)/v1beta1/{group_nam" +
@@ -52,7 +52,7 @@ public static void registerAllExtensions(
       "s.clouderrorreporting.v1beta1.ErrorGroup" +
       "\"8\202\323\344\223\0022\032)/v1beta1/{group.name=projects/" +
       "*/groups/*}:\005groupB\367\001\n/com.google.devtoo" +
-      "ls.clouderrorreporting.v1beta1B\026ErrorGro" +
+      "ls.clouderrorreporting.v1beta1B\026ErrorGro",
       "upServiceProtoP\001Z^google.golang.org/genp" +
       "roto/googleapis/devtools/clouderrorrepor" +
       "ting/v1beta1;clouderrorreporting\252\002#Googl" +
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorGroupStats.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorGroupStats.java
index b774656b13da..3548431ba28b 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorGroupStats.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorGroupStats.java
@@ -38,9 +38,6 @@ private ErrorGroupStats(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private ErrorGroupStats(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup.Builder subBuilder = null;
             if (group_ != null) {
@@ -137,13 +141,6 @@ private ErrorGroupStats(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -167,7 +164,6 @@ private ErrorGroupStats(
     return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ErrorGroupStats_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ErrorGroupStats_fieldAccessorTable
@@ -525,7 +521,6 @@ public com.google.devtools.clouderrorreporting.v1beta1.ErrorEventOrBuilder getRe
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -535,7 +530,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (group_ != null) {
@@ -568,7 +562,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -774,7 +767,6 @@ public static com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupStats pa
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -782,7 +774,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupStats prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -811,7 +802,6 @@ public static final class Builder extends
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ErrorGroupStats_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ErrorGroupStats_fieldAccessorTable
@@ -836,7 +826,6 @@ private void maybeForceBuilderInitialization() {
         getAffectedServicesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (groupBuilder_ == null) {
@@ -884,18 +873,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ErrorGroupStats_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupStats getDefaultInstanceForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupStats.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupStats build() {
       com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupStats result = buildPartial();
       if (!result.isInitialized()) {
@@ -904,7 +890,6 @@ public com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupStats build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupStats buildPartial() {
       com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupStats result = new com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupStats(this);
       int from_bitField0_ = bitField0_;
@@ -955,39 +940,32 @@ public com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupStats buildPart
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupStats) {
         return mergeFrom((com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupStats)other);
@@ -1077,12 +1055,10 @@ public Builder mergeFrom(com.google.devtools.clouderrorreporting.v1beta1.ErrorGr
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2670,13 +2646,11 @@ public com.google.devtools.clouderrorreporting.v1beta1.ErrorEventOrBuilder getRe
       }
       return representativeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2698,12 +2672,11 @@ public static com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupStats ge
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ErrorGroupStats parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ErrorGroupStats(input, extensionRegistry);
+        return new ErrorGroupStats(input, extensionRegistry);
     }
   };
 
@@ -2716,7 +2689,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupStats getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorStatsServiceProto.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorStatsServiceProto.java
index a1b12446a5cc..a824b80172ff 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorStatsServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ErrorStatsServiceProto.java
@@ -82,7 +82,7 @@ public static void registerAllExtensions(
       "ogle/protobuf/timestamp.proto\"\241\004\n\025ListGr" +
       "oupStatsRequest\022\024\n\014project_name\030\001 \001(\t\022\020\n" +
       "\010group_id\030\002 \003(\t\022Y\n\016service_filter\030\003 \001(\0132" +
-      "A.google.devtools.clouderrorreporting.v1" +
+      "A.google.devtools.clouderrorreporting.v1",
       "beta1.ServiceContextFilter\022O\n\ntime_range" +
       "\030\005 \001(\0132;.google.devtools.clouderrorrepor" +
       "ting.v1beta1.QueryTimeRange\0227\n\024timed_cou" +
@@ -92,7 +92,7 @@ public static void registerAllExtensions(
       "Alignment\0222\n\016alignment_time\030\010 \001(\0132\032.goog" +
       "le.protobuf.Timestamp\022K\n\005order\030\t \001(\0162<.g" +
       "oogle.devtools.clouderrorreporting.v1bet" +
-      "a1.ErrorGroupOrder\022\021\n\tpage_size\030\013 \001(\005\022\022\n" +
+      "a1.ErrorGroupOrder\022\021\n\tpage_size\030\013 \001(\005\022\022\n",
       "\npage_token\030\014 \001(\t\"\300\001\n\026ListGroupStatsResp" +
       "onse\022W\n\021error_group_stats\030\001 \003(\0132<.google" +
       ".devtools.clouderrorreporting.v1beta1.Er" +
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "p\030\001 \001(\01327.google.devtools.clouderrorrepo" +
       "rting.v1beta1.ErrorGroup\022\r\n\005count\030\002 \001(\003\022" +
       "\034\n\024affected_users_count\030\003 \001(\003\022M\n\014timed_c" +
-      "ounts\030\004 \003(\01327.google.devtools.clouderror" +
+      "ounts\030\004 \003(\01327.google.devtools.clouderror",
       "reporting.v1beta1.TimedCount\0223\n\017first_se" +
       "en_time\030\005 \001(\0132\032.google.protobuf.Timestam" +
       "p\0222\n\016last_seen_time\030\006 \001(\0132\032.google.proto" +
@@ -112,7 +112,7 @@ public static void registerAllExtensions(
       "rvices\030\010 \001(\005\022O\n\016representative\030\t \001(\01327.g" +
       "oogle.devtools.clouderrorreporting.v1bet" +
       "a1.ErrorEvent\"y\n\nTimedCount\022\r\n\005count\030\001 \001" +
-      "(\003\022.\n\nstart_time\030\002 \001(\0132\032.google.protobuf" +
+      "(\003\022.\n\nstart_time\030\002 \001(\0132\032.google.protobuf",
       ".Timestamp\022,\n\010end_time\030\003 \001(\0132\032.google.pr" +
       "otobuf.Timestamp\"\216\002\n\021ListEventsRequest\022\024" +
       "\n\014project_name\030\001 \001(\t\022\020\n\010group_id\030\002 \001(\t\022Y" +
@@ -122,7 +122,7 @@ public static void registerAllExtensions(
       "evtools.clouderrorreporting.v1beta1.Quer" +
       "yTimeRange\022\021\n\tpage_size\030\006 \001(\005\022\022\n\npage_to" +
       "ken\030\007 \001(\t\"\262\001\n\022ListEventsResponse\022M\n\014erro" +
-      "r_events\030\001 \003(\01327.google.devtools.clouder" +
+      "r_events\030\001 \003(\01327.google.devtools.clouder",
       "rorreporting.v1beta1.ErrorEvent\022\027\n\017next_" +
       "page_token\030\002 \001(\t\0224\n\020time_range_begin\030\004 \001" +
       "(\0132\032.google.protobuf.Timestamp\"\347\001\n\016Query" +
@@ -132,7 +132,7 @@ public static void registerAllExtensions(
       "CIFIED\020\000\022\021\n\rPERIOD_1_HOUR\020\001\022\022\n\016PERIOD_6_" +
       "HOURS\020\002\022\020\n\014PERIOD_1_DAY\020\003\022\021\n\rPERIOD_1_WE" +
       "EK\020\004\022\022\n\016PERIOD_30_DAYS\020\005\"O\n\024ServiceConte" +
-      "xtFilter\022\017\n\007service\030\002 \001(\t\022\017\n\007version\030\003 \001" +
+      "xtFilter\022\017\n\007service\030\002 \001(\t\022\017\n\007version\030\003 \001",
       "(\t\022\025\n\rresource_type\030\004 \001(\t\"+\n\023DeleteEvent" +
       "sRequest\022\024\n\014project_name\030\001 \001(\t\"\026\n\024Delete" +
       "EventsResponse*u\n\023TimedCountAlignment\022%\n" +
@@ -142,7 +142,7 @@ public static void registerAllExtensions(
       "P_ORDER_UNSPECIFIED\020\000\022\016\n\nCOUNT_DESC\020\001\022\022\n" +
       "\016LAST_SEEN_DESC\020\002\022\020\n\014CREATED_DESC\020\003\022\027\n\023A" +
       "FFECTED_USERS_DESC\020\0042\362\004\n\021ErrorStatsServi" +
-      "ce\022\320\001\n\016ListGroupStats\022B.google.devtools." +
+      "ce\022\320\001\n\016ListGroupStats\022B.google.devtools.",
       "clouderrorreporting.v1beta1.ListGroupSta" +
       "tsRequest\032C.google.devtools.clouderrorre" +
       "porting.v1beta1.ListGroupStatsResponse\"5" +
@@ -152,7 +152,7 @@ public static void registerAllExtensions(
       "ventsRequest\032?.google.devtools.clouderro" +
       "rreporting.v1beta1.ListEventsResponse\"1\202" +
       "\323\344\223\002+\022)/v1beta1/{project_name=projects/*" +
-      "}/events\022\306\001\n\014DeleteEvents\022@.google.devto" +
+      "}/events\022\306\001\n\014DeleteEvents\022@.google.devto",
       "ols.clouderrorreporting.v1beta1.DeleteEv" +
       "entsRequest\032A.google.devtools.clouderror" +
       "reporting.v1beta1.DeleteEventsResponse\"1" +
@@ -162,7 +162,7 @@ public static void registerAllExtensions(
       "ProtoP\001Z^google.golang.org/genproto/goog" +
       "leapis/devtools/clouderrorreporting/v1be" +
       "ta1;clouderrorreporting\252\002#Google.Cloud.E" +
-      "rrorReporting.V1Beta1\312\002#Google\\Cloud\\Err" +
+      "rrorReporting.V1Beta1\312\002#Google\\Cloud\\Err",
       "orReporting\\V1beta1b\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/GetGroupRequest.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/GetGroupRequest.java
index 552e015fc028..fb79fdd1147d 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/GetGroupRequest.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/GetGroupRequest.java
@@ -33,9 +33,6 @@ private GetGroupRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetGroupRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            groupName_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetGroupRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            groupName_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetGroupRequest(
     return com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_GetGroupRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_GetGroupRequest_fieldAccessorTable
@@ -140,7 +136,6 @@ public java.lang.String getGroupName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -150,7 +145,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getGroupNameBytes().isEmpty()) {
@@ -159,7 +153,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -274,7 +267,6 @@ public static com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest pa
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -282,7 +274,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -310,7 +301,6 @@ public static final class Builder extends
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_GetGroupRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_GetGroupRequest_fieldAccessorTable
@@ -333,7 +323,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       groupName_ = "";
@@ -341,18 +330,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_GetGroupRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest getDefaultInstanceForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest build() {
       com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -361,7 +347,6 @@ public com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest buildPartial() {
       com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest result = new com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest(this);
       result.groupName_ = groupName_;
@@ -369,39 +354,32 @@ public com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest buildPart
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest) {
         return mergeFrom((com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest)other);
@@ -422,12 +400,10 @@ public Builder mergeFrom(com.google.devtools.clouderrorreporting.v1beta1.GetGrou
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -564,13 +540,11 @@ public Builder setGroupNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -592,12 +566,11 @@ public static com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest ge
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetGroupRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetGroupRequest(input, extensionRegistry);
+        return new GetGroupRequest(input, extensionRegistry);
     }
   };
 
@@ -610,7 +583,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.clouderrorreporting.v1beta1.GetGroupRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/HttpRequestContext.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/HttpRequestContext.java
index 329a1b4658d6..c7e1d7fe78ac 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/HttpRequestContext.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/HttpRequestContext.java
@@ -41,9 +41,6 @@ private HttpRequestContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -55,6 +52,13 @@ private HttpRequestContext(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -90,13 +94,6 @@ private HttpRequestContext(
             remoteIp_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -114,7 +111,6 @@ private HttpRequestContext(
     return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_HttpRequestContext_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_HttpRequestContext_fieldAccessorTable
@@ -352,7 +348,6 @@ public java.lang.String getRemoteIp() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -362,7 +357,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getMethodBytes().isEmpty()) {
@@ -386,7 +380,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -537,7 +530,6 @@ public static com.google.devtools.clouderrorreporting.v1beta1.HttpRequestContext
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -545,7 +537,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.clouderrorreporting.v1beta1.HttpRequestContext prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -576,7 +567,6 @@ public static final class Builder extends
       return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_HttpRequestContext_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_HttpRequestContext_fieldAccessorTable
@@ -599,7 +589,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       method_ = "";
@@ -617,18 +606,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_HttpRequestContext_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.HttpRequestContext getDefaultInstanceForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.HttpRequestContext.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.HttpRequestContext build() {
       com.google.devtools.clouderrorreporting.v1beta1.HttpRequestContext result = buildPartial();
       if (!result.isInitialized()) {
@@ -637,7 +623,6 @@ public com.google.devtools.clouderrorreporting.v1beta1.HttpRequestContext build(
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.HttpRequestContext buildPartial() {
       com.google.devtools.clouderrorreporting.v1beta1.HttpRequestContext result = new com.google.devtools.clouderrorreporting.v1beta1.HttpRequestContext(this);
       result.method_ = method_;
@@ -650,39 +635,32 @@ public com.google.devtools.clouderrorreporting.v1beta1.HttpRequestContext buildP
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.clouderrorreporting.v1beta1.HttpRequestContext) {
         return mergeFrom((com.google.devtools.clouderrorreporting.v1beta1.HttpRequestContext)other);
@@ -722,12 +700,10 @@ public Builder mergeFrom(com.google.devtools.clouderrorreporting.v1beta1.HttpReq
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1243,13 +1219,11 @@ public Builder setRemoteIpBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1271,12 +1245,11 @@ public static com.google.devtools.clouderrorreporting.v1beta1.HttpRequestContext
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public HttpRequestContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new HttpRequestContext(input, extensionRegistry);
+        return new HttpRequestContext(input, extensionRegistry);
     }
   };
 
@@ -1289,7 +1262,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.clouderrorreporting.v1beta1.HttpRequestContext getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListEventsRequest.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListEventsRequest.java
index 7a880d9f548c..baffd7370d96 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListEventsRequest.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListEventsRequest.java
@@ -36,9 +36,6 @@ private ListEventsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private ListEventsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -99,13 +103,6 @@ private ListEventsRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -123,7 +120,6 @@ private ListEventsRequest(
     return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ListEventsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ListEventsRequest_fieldAccessorTable
@@ -357,7 +353,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -367,7 +362,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectNameBytes().isEmpty()) {
@@ -391,7 +385,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -554,7 +547,6 @@ public static com.google.devtools.clouderrorreporting.v1beta1.ListEventsRequest
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -562,7 +554,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.clouderrorreporting.v1beta1.ListEventsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -590,7 +581,6 @@ public static final class Builder extends
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ListEventsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ListEventsRequest_fieldAccessorTable
@@ -613,7 +603,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectName_ = "";
@@ -639,18 +628,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ListEventsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ListEventsRequest getDefaultInstanceForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.ListEventsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ListEventsRequest build() {
       com.google.devtools.clouderrorreporting.v1beta1.ListEventsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -659,7 +645,6 @@ public com.google.devtools.clouderrorreporting.v1beta1.ListEventsRequest build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ListEventsRequest buildPartial() {
       com.google.devtools.clouderrorreporting.v1beta1.ListEventsRequest result = new com.google.devtools.clouderrorreporting.v1beta1.ListEventsRequest(this);
       result.projectName_ = projectName_;
@@ -680,39 +665,32 @@ public com.google.devtools.clouderrorreporting.v1beta1.ListEventsRequest buildPa
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.clouderrorreporting.v1beta1.ListEventsRequest) {
         return mergeFrom((com.google.devtools.clouderrorreporting.v1beta1.ListEventsRequest)other);
@@ -750,12 +728,10 @@ public Builder mergeFrom(com.google.devtools.clouderrorreporting.v1beta1.ListEve
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1440,13 +1416,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1468,12 +1442,11 @@ public static com.google.devtools.clouderrorreporting.v1beta1.ListEventsRequest
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListEventsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListEventsRequest(input, extensionRegistry);
+        return new ListEventsRequest(input, extensionRegistry);
     }
   };
 
@@ -1486,7 +1459,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.clouderrorreporting.v1beta1.ListEventsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListEventsResponse.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListEventsResponse.java
index 9cb91d4b2123..4f3787042288 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListEventsResponse.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListEventsResponse.java
@@ -34,9 +34,6 @@ private ListEventsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListEventsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               errorEvents_ = new java.util.ArrayList();
@@ -76,13 +80,6 @@ private ListEventsResponse(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private ListEventsResponse(
     return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ListEventsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ListEventsResponse_fieldAccessorTable
@@ -247,7 +243,6 @@ public com.google.protobuf.TimestampOrBuilder getTimeRangeBeginOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -257,7 +252,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < errorEvents_.size(); i++) {
@@ -272,7 +266,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -410,7 +403,6 @@ public static com.google.devtools.clouderrorreporting.v1beta1.ListEventsResponse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -418,7 +410,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.clouderrorreporting.v1beta1.ListEventsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -446,7 +437,6 @@ public static final class Builder extends
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ListEventsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ListEventsResponse_fieldAccessorTable
@@ -470,7 +460,6 @@ private void maybeForceBuilderInitialization() {
         getErrorEventsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (errorEventsBuilder_ == null) {
@@ -490,18 +479,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ListEventsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ListEventsResponse getDefaultInstanceForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.ListEventsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ListEventsResponse build() {
       com.google.devtools.clouderrorreporting.v1beta1.ListEventsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -510,7 +496,6 @@ public com.google.devtools.clouderrorreporting.v1beta1.ListEventsResponse build(
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ListEventsResponse buildPartial() {
       com.google.devtools.clouderrorreporting.v1beta1.ListEventsResponse result = new com.google.devtools.clouderrorreporting.v1beta1.ListEventsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -535,39 +520,32 @@ public com.google.devtools.clouderrorreporting.v1beta1.ListEventsResponse buildP
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.clouderrorreporting.v1beta1.ListEventsResponse) {
         return mergeFrom((com.google.devtools.clouderrorreporting.v1beta1.ListEventsResponse)other);
@@ -617,12 +595,10 @@ public Builder mergeFrom(com.google.devtools.clouderrorreporting.v1beta1.ListEve
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1205,13 +1181,11 @@ public com.google.protobuf.TimestampOrBuilder getTimeRangeBeginOrBuilder() {
       }
       return timeRangeBeginBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1233,12 +1207,11 @@ public static com.google.devtools.clouderrorreporting.v1beta1.ListEventsResponse
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListEventsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListEventsResponse(input, extensionRegistry);
+        return new ListEventsResponse(input, extensionRegistry);
     }
   };
 
@@ -1251,7 +1224,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.clouderrorreporting.v1beta1.ListEventsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListGroupStatsRequest.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListGroupStatsRequest.java
index d59175749372..0c27c08684c5 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListGroupStatsRequest.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListGroupStatsRequest.java
@@ -38,9 +38,6 @@ private ListGroupStatsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private ListGroupStatsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -142,13 +146,6 @@ private ListGroupStatsRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -169,7 +166,6 @@ private ListGroupStatsRequest(
     return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ListGroupStatsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ListGroupStatsRequest_fieldAccessorTable
@@ -421,7 +417,6 @@ public int getAlignmentValue() {
    * .google.devtools.clouderrorreporting.v1beta1.TimedCountAlignment alignment = 7;
    */
   public com.google.devtools.clouderrorreporting.v1beta1.TimedCountAlignment getAlignment() {
-    @SuppressWarnings("deprecation")
     com.google.devtools.clouderrorreporting.v1beta1.TimedCountAlignment result = com.google.devtools.clouderrorreporting.v1beta1.TimedCountAlignment.valueOf(alignment_);
     return result == null ? com.google.devtools.clouderrorreporting.v1beta1.TimedCountAlignment.UNRECOGNIZED : result;
   }
@@ -484,7 +479,6 @@ public int getOrderValue() {
    * .google.devtools.clouderrorreporting.v1beta1.ErrorGroupOrder order = 9;
    */
   public com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupOrder getOrder() {
-    @SuppressWarnings("deprecation")
     com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupOrder result = com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupOrder.valueOf(order_);
     return result == null ? com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupOrder.UNRECOGNIZED : result;
   }
@@ -550,7 +544,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -560,7 +553,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectNameBytes().isEmpty()) {
@@ -596,7 +588,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -806,7 +797,6 @@ public static com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsRequ
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -814,7 +804,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -842,7 +831,6 @@ public static final class Builder extends
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ListGroupStatsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ListGroupStatsRequest_fieldAccessorTable
@@ -865,7 +853,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectName_ = "";
@@ -907,18 +894,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ListGroupStatsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsRequest getDefaultInstanceForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsRequest build() {
       com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -927,7 +911,6 @@ public com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsRequest bui
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsRequest buildPartial() {
       com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsRequest result = new com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsRequest(this);
       int from_bitField0_ = bitField0_;
@@ -967,39 +950,32 @@ public com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsRequest bui
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsRequest) {
         return mergeFrom((com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsRequest)other);
@@ -1055,12 +1031,10 @@ public Builder mergeFrom(com.google.devtools.clouderrorreporting.v1beta1.ListGro
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1893,7 +1867,6 @@ public Builder setAlignmentValue(int value) {
      * .google.devtools.clouderrorreporting.v1beta1.TimedCountAlignment alignment = 7;
      */
     public com.google.devtools.clouderrorreporting.v1beta1.TimedCountAlignment getAlignment() {
-      @SuppressWarnings("deprecation")
       com.google.devtools.clouderrorreporting.v1beta1.TimedCountAlignment result = com.google.devtools.clouderrorreporting.v1beta1.TimedCountAlignment.valueOf(alignment_);
       return result == null ? com.google.devtools.clouderrorreporting.v1beta1.TimedCountAlignment.UNRECOGNIZED : result;
     }
@@ -2125,7 +2098,6 @@ public Builder setOrderValue(int value) {
      * .google.devtools.clouderrorreporting.v1beta1.ErrorGroupOrder order = 9;
      */
     public com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupOrder getOrder() {
-      @SuppressWarnings("deprecation")
       com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupOrder result = com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupOrder.valueOf(order_);
       return result == null ? com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupOrder.UNRECOGNIZED : result;
     }
@@ -2300,13 +2272,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2328,12 +2298,11 @@ public static com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsRequ
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListGroupStatsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListGroupStatsRequest(input, extensionRegistry);
+        return new ListGroupStatsRequest(input, extensionRegistry);
     }
   };
 
@@ -2346,7 +2315,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListGroupStatsResponse.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListGroupStatsResponse.java
index 27014feff634..f69fb284edd0 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListGroupStatsResponse.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ListGroupStatsResponse.java
@@ -34,9 +34,6 @@ private ListGroupStatsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListGroupStatsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               errorGroupStats_ = new java.util.ArrayList();
@@ -76,13 +80,6 @@ private ListGroupStatsResponse(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private ListGroupStatsResponse(
     return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ListGroupStatsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ListGroupStatsResponse_fieldAccessorTable
@@ -256,7 +252,6 @@ public com.google.protobuf.TimestampOrBuilder getTimeRangeBeginOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -266,7 +261,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < errorGroupStats_.size(); i++) {
@@ -281,7 +275,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -419,7 +412,6 @@ public static com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResp
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -427,7 +419,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -455,7 +446,6 @@ public static final class Builder extends
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ListGroupStatsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ListGroupStatsResponse_fieldAccessorTable
@@ -479,7 +469,6 @@ private void maybeForceBuilderInitialization() {
         getErrorGroupStatsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (errorGroupStatsBuilder_ == null) {
@@ -499,18 +488,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ListGroupStatsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResponse getDefaultInstanceForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResponse build() {
       com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -519,7 +505,6 @@ public com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResponse bu
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResponse buildPartial() {
       com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResponse result = new com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -544,39 +529,32 @@ public com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResponse bu
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResponse) {
         return mergeFrom((com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResponse)other);
@@ -626,12 +604,10 @@ public Builder mergeFrom(com.google.devtools.clouderrorreporting.v1beta1.ListGro
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1241,13 +1217,11 @@ public com.google.protobuf.TimestampOrBuilder getTimeRangeBeginOrBuilder() {
       }
       return timeRangeBeginBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1269,12 +1243,11 @@ public static com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResp
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListGroupStatsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListGroupStatsResponse(input, extensionRegistry);
+        return new ListGroupStatsResponse(input, extensionRegistry);
     }
   };
 
@@ -1287,7 +1260,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.clouderrorreporting.v1beta1.ListGroupStatsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/QueryTimeRange.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/QueryTimeRange.java
index c65c6aaa62d5..ee217f9780db 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/QueryTimeRange.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/QueryTimeRange.java
@@ -34,9 +34,6 @@ private QueryTimeRange(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,12 +45,6 @@ private QueryTimeRange(
           case 0:
             done = true;
             break;
-          case 8: {
-            int rawValue = input.readEnum();
-
-            period_ = rawValue;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -61,6 +52,12 @@ private QueryTimeRange(
             }
             break;
           }
+          case 8: {
+            int rawValue = input.readEnum();
+
+            period_ = rawValue;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -78,7 +75,6 @@ private QueryTimeRange(
     return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_QueryTimeRange_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_QueryTimeRange_fieldAccessorTable
@@ -302,13 +298,11 @@ public int getPeriodValue() {
    * .google.devtools.clouderrorreporting.v1beta1.QueryTimeRange.Period period = 1;
    */
   public com.google.devtools.clouderrorreporting.v1beta1.QueryTimeRange.Period getPeriod() {
-    @SuppressWarnings("deprecation")
     com.google.devtools.clouderrorreporting.v1beta1.QueryTimeRange.Period result = com.google.devtools.clouderrorreporting.v1beta1.QueryTimeRange.Period.valueOf(period_);
     return result == null ? com.google.devtools.clouderrorreporting.v1beta1.QueryTimeRange.Period.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -318,7 +312,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (period_ != com.google.devtools.clouderrorreporting.v1beta1.QueryTimeRange.Period.PERIOD_UNSPECIFIED.getNumber()) {
@@ -327,7 +320,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -442,7 +434,6 @@ public static com.google.devtools.clouderrorreporting.v1beta1.QueryTimeRange par
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -450,7 +441,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.clouderrorreporting.v1beta1.QueryTimeRange prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -479,7 +469,6 @@ public static final class Builder extends
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_QueryTimeRange_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_QueryTimeRange_fieldAccessorTable
@@ -502,7 +491,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       period_ = 0;
@@ -510,18 +498,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_QueryTimeRange_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.QueryTimeRange getDefaultInstanceForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.QueryTimeRange.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.QueryTimeRange build() {
       com.google.devtools.clouderrorreporting.v1beta1.QueryTimeRange result = buildPartial();
       if (!result.isInitialized()) {
@@ -530,7 +515,6 @@ public com.google.devtools.clouderrorreporting.v1beta1.QueryTimeRange build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.QueryTimeRange buildPartial() {
       com.google.devtools.clouderrorreporting.v1beta1.QueryTimeRange result = new com.google.devtools.clouderrorreporting.v1beta1.QueryTimeRange(this);
       result.period_ = period_;
@@ -538,39 +522,32 @@ public com.google.devtools.clouderrorreporting.v1beta1.QueryTimeRange buildParti
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.clouderrorreporting.v1beta1.QueryTimeRange) {
         return mergeFrom((com.google.devtools.clouderrorreporting.v1beta1.QueryTimeRange)other);
@@ -590,12 +567,10 @@ public Builder mergeFrom(com.google.devtools.clouderrorreporting.v1beta1.QueryTi
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -645,7 +620,6 @@ public Builder setPeriodValue(int value) {
      * .google.devtools.clouderrorreporting.v1beta1.QueryTimeRange.Period period = 1;
      */
     public com.google.devtools.clouderrorreporting.v1beta1.QueryTimeRange.Period getPeriod() {
-      @SuppressWarnings("deprecation")
       com.google.devtools.clouderrorreporting.v1beta1.QueryTimeRange.Period result = com.google.devtools.clouderrorreporting.v1beta1.QueryTimeRange.Period.valueOf(period_);
       return result == null ? com.google.devtools.clouderrorreporting.v1beta1.QueryTimeRange.Period.UNRECOGNIZED : result;
     }
@@ -678,13 +652,11 @@ public Builder clearPeriod() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -706,12 +678,11 @@ public static com.google.devtools.clouderrorreporting.v1beta1.QueryTimeRange get
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public QueryTimeRange parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new QueryTimeRange(input, extensionRegistry);
+        return new QueryTimeRange(input, extensionRegistry);
     }
   };
 
@@ -724,7 +695,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.clouderrorreporting.v1beta1.QueryTimeRange getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportErrorEventRequest.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportErrorEventRequest.java
index b83972954e9a..d88793879228 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportErrorEventRequest.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportErrorEventRequest.java
@@ -33,9 +33,6 @@ private ReportErrorEventRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ReportErrorEventRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ReportErrorEventRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ReportErrorEventRequest(
     return com.google.devtools.clouderrorreporting.v1beta1.ReportErrorsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ReportErrorEventRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.clouderrorreporting.v1beta1.ReportErrorsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ReportErrorEventRequest_fieldAccessorTable
@@ -180,7 +176,6 @@ public com.google.devtools.clouderrorreporting.v1beta1.ReportedErrorEventOrBuild
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -190,7 +185,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectNameBytes().isEmpty()) {
@@ -202,7 +196,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -330,7 +323,6 @@ public static com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventRe
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -338,7 +330,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -366,7 +357,6 @@ public static final class Builder extends
       return com.google.devtools.clouderrorreporting.v1beta1.ReportErrorsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ReportErrorEventRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.clouderrorreporting.v1beta1.ReportErrorsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ReportErrorEventRequest_fieldAccessorTable
@@ -389,7 +379,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectName_ = "";
@@ -403,18 +392,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.ReportErrorsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ReportErrorEventRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventRequest getDefaultInstanceForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventRequest build() {
       com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -423,7 +409,6 @@ public com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventRequest b
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventRequest buildPartial() {
       com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventRequest result = new com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventRequest(this);
       result.projectName_ = projectName_;
@@ -436,39 +421,32 @@ public com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventRequest b
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventRequest) {
         return mergeFrom((com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventRequest)other);
@@ -492,12 +470,10 @@ public Builder mergeFrom(com.google.devtools.clouderrorreporting.v1beta1.ReportE
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -772,13 +748,11 @@ public com.google.devtools.clouderrorreporting.v1beta1.ReportedErrorEventOrBuild
       }
       return eventBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -800,12 +774,11 @@ public static com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventRe
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ReportErrorEventRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReportErrorEventRequest(input, extensionRegistry);
+        return new ReportErrorEventRequest(input, extensionRegistry);
     }
   };
 
@@ -818,7 +791,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportErrorEventResponse.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportErrorEventResponse.java
index 49a462e301c6..0183fdfe61f2 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportErrorEventResponse.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportErrorEventResponse.java
@@ -33,9 +33,6 @@ private ReportErrorEventResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -70,7 +67,6 @@ private ReportErrorEventResponse(
     return com.google.devtools.clouderrorreporting.v1beta1.ReportErrorsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ReportErrorEventResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.clouderrorreporting.v1beta1.ReportErrorsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ReportErrorEventResponse_fieldAccessorTable
@@ -79,7 +75,6 @@ private ReportErrorEventResponse(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -89,13 +84,11 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -203,7 +196,6 @@ public static com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventRe
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -211,7 +203,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -240,7 +231,6 @@ public static final class Builder extends
       return com.google.devtools.clouderrorreporting.v1beta1.ReportErrorsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ReportErrorEventResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.clouderrorreporting.v1beta1.ReportErrorsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ReportErrorEventResponse_fieldAccessorTable
@@ -263,24 +253,20 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.ReportErrorsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ReportErrorEventResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventResponse getDefaultInstanceForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventResponse build() {
       com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -289,46 +275,38 @@ public com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventResponse
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventResponse buildPartial() {
       com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventResponse result = new com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventResponse(this);
       onBuilt();
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventResponse) {
         return mergeFrom((com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventResponse)other);
@@ -345,12 +323,10 @@ public Builder mergeFrom(com.google.devtools.clouderrorreporting.v1beta1.ReportE
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -368,13 +344,11 @@ public Builder mergeFrom(
       }
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -396,12 +370,11 @@ public static com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventRe
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ReportErrorEventResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReportErrorEventResponse(input, extensionRegistry);
+        return new ReportErrorEventResponse(input, extensionRegistry);
     }
   };
 
@@ -414,7 +387,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.clouderrorreporting.v1beta1.ReportErrorEventResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportErrorsServiceProto.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportErrorsServiceProto.java
index 92f9797f54cd..03050c5ee946 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportErrorsServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportErrorsServiceProto.java
@@ -47,7 +47,7 @@ public static void registerAllExtensions(
       "\177\n\027ReportErrorEventRequest\022\024\n\014project_na" +
       "me\030\001 \001(\t\022N\n\005event\030\002 \001(\0132?.google.devtool" +
       "s.clouderrorreporting.v1beta1.ReportedEr" +
-      "rorEvent\"\032\n\030ReportErrorEventResponse\"\367\001\n" +
+      "rorEvent\"\032\n\030ReportErrorEventResponse\"\367\001\n",
       "\022ReportedErrorEvent\022.\n\nevent_time\030\001 \001(\0132" +
       "\032.google.protobuf.Timestamp\022T\n\017service_c" +
       "ontext\030\002 \001(\0132;.google.devtools.clouderro" +
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "ontext2\370\001\n\023ReportErrorsService\022\340\001\n\020Repor" +
       "tErrorEvent\022D.google.devtools.clouderror" +
       "reporting.v1beta1.ReportErrorEventReques" +
-      "t\032E.google.devtools.clouderrorreporting." +
+      "t\032E.google.devtools.clouderrorreporting.",
       "v1beta1.ReportErrorEventResponse\"?\202\323\344\223\0029" +
       "\"0/v1beta1/{project_name=projects/*}/eve" +
       "nts:report:\005eventB\371\001\n/com.google.devtool" +
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportedErrorEvent.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportedErrorEvent.java
index 5a9c36e019d6..20ad60b1b894 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportedErrorEvent.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ReportedErrorEvent.java
@@ -33,9 +33,6 @@ private ReportedErrorEvent(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ReportedErrorEvent(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.protobuf.Timestamp.Builder subBuilder = null;
             if (eventTime_ != null) {
@@ -92,13 +96,6 @@ private ReportedErrorEvent(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -116,7 +113,6 @@ private ReportedErrorEvent(
     return com.google.devtools.clouderrorreporting.v1beta1.ReportErrorsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ReportedErrorEvent_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.clouderrorreporting.v1beta1.ReportErrorsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ReportedErrorEvent_fieldAccessorTable
@@ -278,7 +274,6 @@ public com.google.devtools.clouderrorreporting.v1beta1.ErrorContextOrBuilder get
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -288,7 +283,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (eventTime_ != null) {
@@ -306,7 +300,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -460,7 +453,6 @@ public static com.google.devtools.clouderrorreporting.v1beta1.ReportedErrorEvent
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -468,7 +460,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.clouderrorreporting.v1beta1.ReportedErrorEvent prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -496,7 +487,6 @@ public static final class Builder extends
       return com.google.devtools.clouderrorreporting.v1beta1.ReportErrorsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ReportedErrorEvent_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.clouderrorreporting.v1beta1.ReportErrorsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ReportedErrorEvent_fieldAccessorTable
@@ -519,7 +509,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (eventTimeBuilder_ == null) {
@@ -545,18 +534,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.ReportErrorsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ReportedErrorEvent_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ReportedErrorEvent getDefaultInstanceForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.ReportedErrorEvent.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ReportedErrorEvent build() {
       com.google.devtools.clouderrorreporting.v1beta1.ReportedErrorEvent result = buildPartial();
       if (!result.isInitialized()) {
@@ -565,7 +551,6 @@ public com.google.devtools.clouderrorreporting.v1beta1.ReportedErrorEvent build(
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ReportedErrorEvent buildPartial() {
       com.google.devtools.clouderrorreporting.v1beta1.ReportedErrorEvent result = new com.google.devtools.clouderrorreporting.v1beta1.ReportedErrorEvent(this);
       if (eventTimeBuilder_ == null) {
@@ -588,39 +573,32 @@ public com.google.devtools.clouderrorreporting.v1beta1.ReportedErrorEvent buildP
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.clouderrorreporting.v1beta1.ReportedErrorEvent) {
         return mergeFrom((com.google.devtools.clouderrorreporting.v1beta1.ReportedErrorEvent)other);
@@ -650,12 +628,10 @@ public Builder mergeFrom(com.google.devtools.clouderrorreporting.v1beta1.Reporte
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1254,13 +1230,11 @@ public com.google.devtools.clouderrorreporting.v1beta1.ErrorContextOrBuilder get
       }
       return contextBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1282,12 +1256,11 @@ public static com.google.devtools.clouderrorreporting.v1beta1.ReportedErrorEvent
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ReportedErrorEvent parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReportedErrorEvent(input, extensionRegistry);
+        return new ReportedErrorEvent(input, extensionRegistry);
     }
   };
 
@@ -1300,7 +1273,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.clouderrorreporting.v1beta1.ReportedErrorEvent getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ServiceContext.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ServiceContext.java
index e05a95c98b9e..5703de39d953 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ServiceContext.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ServiceContext.java
@@ -36,9 +36,6 @@ private ServiceContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private ServiceContext(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -68,13 +72,6 @@ private ServiceContext(
             resourceType_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -92,7 +89,6 @@ private ServiceContext(
     return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ServiceContext_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ServiceContext_fieldAccessorTable
@@ -245,7 +241,6 @@ public java.lang.String getResourceType() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -255,7 +250,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getServiceBytes().isEmpty()) {
@@ -270,7 +264,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -399,7 +392,6 @@ public static com.google.devtools.clouderrorreporting.v1beta1.ServiceContext par
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -407,7 +399,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.clouderrorreporting.v1beta1.ServiceContext prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -436,7 +427,6 @@ public static final class Builder extends
       return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ServiceContext_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ServiceContext_fieldAccessorTable
@@ -459,7 +449,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       service_ = "";
@@ -471,18 +460,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ServiceContext_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ServiceContext getDefaultInstanceForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.ServiceContext.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ServiceContext build() {
       com.google.devtools.clouderrorreporting.v1beta1.ServiceContext result = buildPartial();
       if (!result.isInitialized()) {
@@ -491,7 +477,6 @@ public com.google.devtools.clouderrorreporting.v1beta1.ServiceContext build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ServiceContext buildPartial() {
       com.google.devtools.clouderrorreporting.v1beta1.ServiceContext result = new com.google.devtools.clouderrorreporting.v1beta1.ServiceContext(this);
       result.service_ = service_;
@@ -501,39 +486,32 @@ public com.google.devtools.clouderrorreporting.v1beta1.ServiceContext buildParti
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.clouderrorreporting.v1beta1.ServiceContext) {
         return mergeFrom((com.google.devtools.clouderrorreporting.v1beta1.ServiceContext)other);
@@ -562,12 +540,10 @@ public Builder mergeFrom(com.google.devtools.clouderrorreporting.v1beta1.Service
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -897,13 +873,11 @@ public Builder setResourceTypeBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -925,12 +899,11 @@ public static com.google.devtools.clouderrorreporting.v1beta1.ServiceContext get
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ServiceContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ServiceContext(input, extensionRegistry);
+        return new ServiceContext(input, extensionRegistry);
     }
   };
 
@@ -943,7 +916,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.clouderrorreporting.v1beta1.ServiceContext getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ServiceContextFilter.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ServiceContextFilter.java
index 7119ecbdff7c..a7433d163258 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ServiceContextFilter.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/ServiceContextFilter.java
@@ -38,9 +38,6 @@ private ServiceContextFilter(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private ServiceContextFilter(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -70,13 +74,6 @@ private ServiceContextFilter(
             resourceType_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -94,7 +91,6 @@ private ServiceContextFilter(
     return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ServiceContextFilter_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ServiceContextFilter_fieldAccessorTable
@@ -235,7 +231,6 @@ public java.lang.String getResourceType() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -245,7 +240,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getServiceBytes().isEmpty()) {
@@ -260,7 +254,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -389,7 +382,6 @@ public static com.google.devtools.clouderrorreporting.v1beta1.ServiceContextFilt
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -397,7 +389,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.clouderrorreporting.v1beta1.ServiceContextFilter prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -428,7 +419,6 @@ public static final class Builder extends
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ServiceContextFilter_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ServiceContextFilter_fieldAccessorTable
@@ -451,7 +441,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       service_ = "";
@@ -463,18 +452,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_ServiceContextFilter_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ServiceContextFilter getDefaultInstanceForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.ServiceContextFilter.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ServiceContextFilter build() {
       com.google.devtools.clouderrorreporting.v1beta1.ServiceContextFilter result = buildPartial();
       if (!result.isInitialized()) {
@@ -483,7 +469,6 @@ public com.google.devtools.clouderrorreporting.v1beta1.ServiceContextFilter buil
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.ServiceContextFilter buildPartial() {
       com.google.devtools.clouderrorreporting.v1beta1.ServiceContextFilter result = new com.google.devtools.clouderrorreporting.v1beta1.ServiceContextFilter(this);
       result.service_ = service_;
@@ -493,39 +478,32 @@ public com.google.devtools.clouderrorreporting.v1beta1.ServiceContextFilter buil
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.clouderrorreporting.v1beta1.ServiceContextFilter) {
         return mergeFrom((com.google.devtools.clouderrorreporting.v1beta1.ServiceContextFilter)other);
@@ -554,12 +532,10 @@ public Builder mergeFrom(com.google.devtools.clouderrorreporting.v1beta1.Service
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -859,13 +835,11 @@ public Builder setResourceTypeBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -887,12 +861,11 @@ public static com.google.devtools.clouderrorreporting.v1beta1.ServiceContextFilt
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ServiceContextFilter parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ServiceContextFilter(input, extensionRegistry);
+        return new ServiceContextFilter(input, extensionRegistry);
     }
   };
 
@@ -905,7 +878,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.clouderrorreporting.v1beta1.ServiceContextFilter getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/SourceLocation.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/SourceLocation.java
index 722e0e766837..4c73cba81843 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/SourceLocation.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/SourceLocation.java
@@ -39,9 +39,6 @@ private SourceLocation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private SourceLocation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -70,13 +74,6 @@ private SourceLocation(
             functionName_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -94,7 +91,6 @@ private SourceLocation(
     return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_SourceLocation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_SourceLocation_fieldAccessorTable
@@ -206,7 +202,6 @@ public java.lang.String getFunctionName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -216,7 +211,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getFilePathBytes().isEmpty()) {
@@ -231,7 +225,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -361,7 +354,6 @@ public static com.google.devtools.clouderrorreporting.v1beta1.SourceLocation par
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -369,7 +361,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.clouderrorreporting.v1beta1.SourceLocation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -401,7 +392,6 @@ public static final class Builder extends
       return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_SourceLocation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_SourceLocation_fieldAccessorTable
@@ -424,7 +414,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       filePath_ = "";
@@ -436,18 +425,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_SourceLocation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.SourceLocation getDefaultInstanceForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.SourceLocation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.SourceLocation build() {
       com.google.devtools.clouderrorreporting.v1beta1.SourceLocation result = buildPartial();
       if (!result.isInitialized()) {
@@ -456,7 +442,6 @@ public com.google.devtools.clouderrorreporting.v1beta1.SourceLocation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.SourceLocation buildPartial() {
       com.google.devtools.clouderrorreporting.v1beta1.SourceLocation result = new com.google.devtools.clouderrorreporting.v1beta1.SourceLocation(this);
       result.filePath_ = filePath_;
@@ -466,39 +451,32 @@ public com.google.devtools.clouderrorreporting.v1beta1.SourceLocation buildParti
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.clouderrorreporting.v1beta1.SourceLocation) {
         return mergeFrom((com.google.devtools.clouderrorreporting.v1beta1.SourceLocation)other);
@@ -526,12 +504,10 @@ public Builder mergeFrom(com.google.devtools.clouderrorreporting.v1beta1.SourceL
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -780,13 +756,11 @@ public Builder setFunctionNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -808,12 +782,11 @@ public static com.google.devtools.clouderrorreporting.v1beta1.SourceLocation get
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SourceLocation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SourceLocation(input, extensionRegistry);
+        return new SourceLocation(input, extensionRegistry);
     }
   };
 
@@ -826,7 +799,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.clouderrorreporting.v1beta1.SourceLocation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/TimedCount.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/TimedCount.java
index 0647c1c2ce7d..7ed9f296d2ac 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/TimedCount.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/TimedCount.java
@@ -35,9 +35,6 @@ private TimedCount(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private TimedCount(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
 
             count_ = input.readInt64();
@@ -80,13 +84,6 @@ private TimedCount(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private TimedCount(
     return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_TimedCount_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_TimedCount_fieldAccessorTable
@@ -192,7 +188,6 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -202,7 +197,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (count_ != 0L) {
@@ -217,7 +211,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -360,7 +353,6 @@ public static com.google.devtools.clouderrorreporting.v1beta1.TimedCount parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -368,7 +360,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.clouderrorreporting.v1beta1.TimedCount prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -398,7 +389,6 @@ public static final class Builder extends
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_TimedCount_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_TimedCount_fieldAccessorTable
@@ -421,7 +411,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       count_ = 0L;
@@ -441,18 +430,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorStatsServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_TimedCount_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.TimedCount getDefaultInstanceForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.TimedCount.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.TimedCount build() {
       com.google.devtools.clouderrorreporting.v1beta1.TimedCount result = buildPartial();
       if (!result.isInitialized()) {
@@ -461,7 +447,6 @@ public com.google.devtools.clouderrorreporting.v1beta1.TimedCount build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.TimedCount buildPartial() {
       com.google.devtools.clouderrorreporting.v1beta1.TimedCount result = new com.google.devtools.clouderrorreporting.v1beta1.TimedCount(this);
       result.count_ = count_;
@@ -479,39 +464,32 @@ public com.google.devtools.clouderrorreporting.v1beta1.TimedCount buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.clouderrorreporting.v1beta1.TimedCount) {
         return mergeFrom((com.google.devtools.clouderrorreporting.v1beta1.TimedCount)other);
@@ -537,12 +515,10 @@ public Builder mergeFrom(com.google.devtools.clouderrorreporting.v1beta1.TimedCo
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -904,13 +880,11 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
       }
       return endTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -932,12 +906,11 @@ public static com.google.devtools.clouderrorreporting.v1beta1.TimedCount getDefa
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TimedCount parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TimedCount(input, extensionRegistry);
+        return new TimedCount(input, extensionRegistry);
     }
   };
 
@@ -950,7 +923,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.clouderrorreporting.v1beta1.TimedCount getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/TrackingIssue.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/TrackingIssue.java
index b9c19b0781ca..ab01f20ea591 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/TrackingIssue.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/TrackingIssue.java
@@ -33,9 +33,6 @@ private TrackingIssue(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private TrackingIssue(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            url_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private TrackingIssue(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            url_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private TrackingIssue(
     return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_TrackingIssue_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_TrackingIssue_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getUrl() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getUrlBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.devtools.clouderrorreporting.v1beta1.TrackingIssue pars
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.clouderrorreporting.v1beta1.TrackingIssue prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_TrackingIssue_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_TrackingIssue_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       url_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.CommonProto.internal_static_google_devtools_clouderrorreporting_v1beta1_TrackingIssue_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.TrackingIssue getDefaultInstanceForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.TrackingIssue.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.TrackingIssue build() {
       com.google.devtools.clouderrorreporting.v1beta1.TrackingIssue result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.devtools.clouderrorreporting.v1beta1.TrackingIssue build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.TrackingIssue buildPartial() {
       com.google.devtools.clouderrorreporting.v1beta1.TrackingIssue result = new com.google.devtools.clouderrorreporting.v1beta1.TrackingIssue(this);
       result.url_ = url_;
@@ -359,39 +344,32 @@ public com.google.devtools.clouderrorreporting.v1beta1.TrackingIssue buildPartia
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.clouderrorreporting.v1beta1.TrackingIssue) {
         return mergeFrom((com.google.devtools.clouderrorreporting.v1beta1.TrackingIssue)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.devtools.clouderrorreporting.v1beta1.Trackin
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setUrlBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.devtools.clouderrorreporting.v1beta1.TrackingIssue getD
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TrackingIssue parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TrackingIssue(input, extensionRegistry);
+        return new TrackingIssue(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.clouderrorreporting.v1beta1.TrackingIssue getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/UpdateGroupRequest.java b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/UpdateGroupRequest.java
index 3911e2c2842d..9a3bf5cce94b 100644
--- a/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/UpdateGroupRequest.java
+++ b/google-api-grpc/proto-google-cloud-error-reporting-v1beta1/src/main/java/com/google/devtools/clouderrorreporting/v1beta1/UpdateGroupRequest.java
@@ -32,9 +32,6 @@ private UpdateGroupRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private UpdateGroupRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.devtools.clouderrorreporting.v1beta1.ErrorGroup.Builder subBuilder = null;
             if (group_ != null) {
@@ -59,13 +63,6 @@ private UpdateGroupRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private UpdateGroupRequest(
     return com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_UpdateGroupRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_UpdateGroupRequest_fieldAccessorTable
@@ -125,7 +121,6 @@ public com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupOrBuilder getGr
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -135,7 +130,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (group_ != null) {
@@ -144,7 +138,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static com.google.devtools.clouderrorreporting.v1beta1.UpdateGroupRequest
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.clouderrorreporting.v1beta1.UpdateGroupRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_UpdateGroupRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_UpdateGroupRequest_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (groupBuilder_ == null) {
@@ -336,18 +325,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupServiceProto.internal_static_google_devtools_clouderrorreporting_v1beta1_UpdateGroupRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.UpdateGroupRequest getDefaultInstanceForType() {
       return com.google.devtools.clouderrorreporting.v1beta1.UpdateGroupRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.UpdateGroupRequest build() {
       com.google.devtools.clouderrorreporting.v1beta1.UpdateGroupRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -356,7 +342,6 @@ public com.google.devtools.clouderrorreporting.v1beta1.UpdateGroupRequest build(
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.clouderrorreporting.v1beta1.UpdateGroupRequest buildPartial() {
       com.google.devtools.clouderrorreporting.v1beta1.UpdateGroupRequest result = new com.google.devtools.clouderrorreporting.v1beta1.UpdateGroupRequest(this);
       if (groupBuilder_ == null) {
@@ -368,39 +353,32 @@ public com.google.devtools.clouderrorreporting.v1beta1.UpdateGroupRequest buildP
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.clouderrorreporting.v1beta1.UpdateGroupRequest) {
         return mergeFrom((com.google.devtools.clouderrorreporting.v1beta1.UpdateGroupRequest)other);
@@ -420,12 +398,10 @@ public Builder mergeFrom(com.google.devtools.clouderrorreporting.v1beta1.UpdateG
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -596,13 +572,11 @@ public com.google.devtools.clouderrorreporting.v1beta1.ErrorGroupOrBuilder getGr
       }
       return groupBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -624,12 +598,11 @@ public static com.google.devtools.clouderrorreporting.v1beta1.UpdateGroupRequest
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateGroupRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateGroupRequest(input, extensionRegistry);
+        return new UpdateGroupRequest(input, extensionRegistry);
     }
   };
 
@@ -642,7 +615,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.clouderrorreporting.v1beta1.UpdateGroupRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ArrayValue.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ArrayValue.java
index b1d1ef1533cb..9db63bfc1626 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ArrayValue.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ArrayValue.java
@@ -33,9 +33,6 @@ private ArrayValue(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ArrayValue(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               values_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private ArrayValue(
                 input.readMessage(com.google.firestore.v1beta1.Value.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private ArrayValue(
     return com.google.firestore.v1beta1.DocumentProto.internal_static_google_firestore_v1beta1_ArrayValue_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.DocumentProto.internal_static_google_firestore_v1beta1_ArrayValue_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.firestore.v1beta1.ValueOrBuilder getValuesOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < values_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.firestore.v1beta1.ArrayValue parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.ArrayValue prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.DocumentProto.internal_static_google_firestore_v1beta1_ArrayValue_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.DocumentProto.internal_static_google_firestore_v1beta1_ArrayValue_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getValuesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (valuesBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.DocumentProto.internal_static_google_firestore_v1beta1_ArrayValue_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.ArrayValue getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.ArrayValue.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.ArrayValue build() {
       com.google.firestore.v1beta1.ArrayValue result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.firestore.v1beta1.ArrayValue build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.ArrayValue buildPartial() {
       com.google.firestore.v1beta1.ArrayValue result = new com.google.firestore.v1beta1.ArrayValue(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.firestore.v1beta1.ArrayValue buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.ArrayValue) {
         return mergeFrom((com.google.firestore.v1beta1.ArrayValue)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.ArrayValue other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.firestore.v1beta1.Value.Builder addValuesBuilder(
       }
       return valuesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.firestore.v1beta1.ArrayValue getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ArrayValue parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ArrayValue(input, extensionRegistry);
+        return new ArrayValue(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.ArrayValue getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BatchGetDocumentsRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BatchGetDocumentsRequest.java
index af5645993de9..07547c6c990a 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BatchGetDocumentsRequest.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BatchGetDocumentsRequest.java
@@ -34,9 +34,6 @@ private BatchGetDocumentsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private BatchGetDocumentsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -109,13 +113,6 @@ private BatchGetDocumentsRequest(
             consistencySelectorCase_ = 7;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -136,7 +133,6 @@ private BatchGetDocumentsRequest(
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_BatchGetDocumentsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_BatchGetDocumentsRequest_fieldAccessorTable
@@ -429,7 +425,6 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -439,7 +434,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getDatabaseBytes().isEmpty()) {
@@ -464,7 +458,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -654,7 +647,6 @@ public static com.google.firestore.v1beta1.BatchGetDocumentsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -662,7 +654,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.BatchGetDocumentsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -690,7 +681,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_BatchGetDocumentsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_BatchGetDocumentsRequest_fieldAccessorTable
@@ -713,7 +703,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       database_ = "";
@@ -731,18 +720,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_BatchGetDocumentsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.BatchGetDocumentsRequest getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.BatchGetDocumentsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.BatchGetDocumentsRequest build() {
       com.google.firestore.v1beta1.BatchGetDocumentsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -751,7 +737,6 @@ public com.google.firestore.v1beta1.BatchGetDocumentsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.BatchGetDocumentsRequest buildPartial() {
       com.google.firestore.v1beta1.BatchGetDocumentsRequest result = new com.google.firestore.v1beta1.BatchGetDocumentsRequest(this);
       int from_bitField0_ = bitField0_;
@@ -790,39 +775,32 @@ public com.google.firestore.v1beta1.BatchGetDocumentsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.BatchGetDocumentsRequest) {
         return mergeFrom((com.google.firestore.v1beta1.BatchGetDocumentsRequest)other);
@@ -873,12 +851,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.BatchGetDocumentsRequest o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1759,13 +1735,11 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
       onChanged();;
       return readTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1787,12 +1761,11 @@ public static com.google.firestore.v1beta1.BatchGetDocumentsRequest getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BatchGetDocumentsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchGetDocumentsRequest(input, extensionRegistry);
+        return new BatchGetDocumentsRequest(input, extensionRegistry);
     }
   };
 
@@ -1805,7 +1778,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.BatchGetDocumentsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BatchGetDocumentsResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BatchGetDocumentsResponse.java
index 6b1dd67e5fc3..5011b50781eb 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BatchGetDocumentsResponse.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BatchGetDocumentsResponse.java
@@ -33,9 +33,6 @@ private BatchGetDocumentsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private BatchGetDocumentsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.firestore.v1beta1.Document.Builder subBuilder = null;
             if (resultCase_ == 1) {
@@ -85,13 +89,6 @@ private BatchGetDocumentsResponse(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -109,7 +106,6 @@ private BatchGetDocumentsResponse(
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_BatchGetDocumentsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_BatchGetDocumentsResponse_fieldAccessorTable
@@ -304,7 +300,6 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -314,7 +309,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (resultCase_ == 1) {
@@ -332,7 +326,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -495,7 +488,6 @@ public static com.google.firestore.v1beta1.BatchGetDocumentsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -503,7 +495,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.BatchGetDocumentsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -531,7 +522,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_BatchGetDocumentsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_BatchGetDocumentsResponse_fieldAccessorTable
@@ -554,7 +544,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       transaction_ = com.google.protobuf.ByteString.EMPTY;
@@ -570,18 +559,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_BatchGetDocumentsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.BatchGetDocumentsResponse getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.BatchGetDocumentsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.BatchGetDocumentsResponse build() {
       com.google.firestore.v1beta1.BatchGetDocumentsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -590,7 +576,6 @@ public com.google.firestore.v1beta1.BatchGetDocumentsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.BatchGetDocumentsResponse buildPartial() {
       com.google.firestore.v1beta1.BatchGetDocumentsResponse result = new com.google.firestore.v1beta1.BatchGetDocumentsResponse(this);
       if (resultCase_ == 1) {
@@ -614,39 +599,32 @@ public com.google.firestore.v1beta1.BatchGetDocumentsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.BatchGetDocumentsResponse) {
         return mergeFrom((com.google.firestore.v1beta1.BatchGetDocumentsResponse)other);
@@ -684,12 +662,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.BatchGetDocumentsResponse
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1226,13 +1202,11 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
       }
       return readTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1254,12 +1228,11 @@ public static com.google.firestore.v1beta1.BatchGetDocumentsResponse getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BatchGetDocumentsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchGetDocumentsResponse(input, extensionRegistry);
+        return new BatchGetDocumentsResponse(input, extensionRegistry);
     }
   };
 
@@ -1272,7 +1245,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.BatchGetDocumentsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BeginTransactionRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BeginTransactionRequest.java
index ab6be3765088..da56a69ffa59 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BeginTransactionRequest.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BeginTransactionRequest.java
@@ -33,9 +33,6 @@ private BeginTransactionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private BeginTransactionRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private BeginTransactionRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private BeginTransactionRequest(
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_BeginTransactionRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_BeginTransactionRequest_fieldAccessorTable
@@ -179,7 +175,6 @@ public com.google.firestore.v1beta1.TransactionOptionsOrBuilder getOptionsOrBuil
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -189,7 +184,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getDatabaseBytes().isEmpty()) {
@@ -201,7 +195,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -329,7 +322,6 @@ public static com.google.firestore.v1beta1.BeginTransactionRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -337,7 +329,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.BeginTransactionRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -365,7 +356,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_BeginTransactionRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_BeginTransactionRequest_fieldAccessorTable
@@ -388,7 +378,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       database_ = "";
@@ -402,18 +391,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_BeginTransactionRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.BeginTransactionRequest getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.BeginTransactionRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.BeginTransactionRequest build() {
       com.google.firestore.v1beta1.BeginTransactionRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -422,7 +408,6 @@ public com.google.firestore.v1beta1.BeginTransactionRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.BeginTransactionRequest buildPartial() {
       com.google.firestore.v1beta1.BeginTransactionRequest result = new com.google.firestore.v1beta1.BeginTransactionRequest(this);
       result.database_ = database_;
@@ -435,39 +420,32 @@ public com.google.firestore.v1beta1.BeginTransactionRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.BeginTransactionRequest) {
         return mergeFrom((com.google.firestore.v1beta1.BeginTransactionRequest)other);
@@ -491,12 +469,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.BeginTransactionRequest ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -770,13 +746,11 @@ public com.google.firestore.v1beta1.TransactionOptionsOrBuilder getOptionsOrBuil
       }
       return optionsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -798,12 +772,11 @@ public static com.google.firestore.v1beta1.BeginTransactionRequest getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BeginTransactionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BeginTransactionRequest(input, extensionRegistry);
+        return new BeginTransactionRequest(input, extensionRegistry);
     }
   };
 
@@ -816,7 +789,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.BeginTransactionRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BeginTransactionResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BeginTransactionResponse.java
index 4144105e7f64..3ea8fd9b0213 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BeginTransactionResponse.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BeginTransactionResponse.java
@@ -33,9 +33,6 @@ private BeginTransactionResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,11 +44,6 @@ private BeginTransactionResponse(
           case 0:
             done = true;
             break;
-          case 10: {
-
-            transaction_ = input.readBytes();
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -59,6 +51,11 @@ private BeginTransactionResponse(
             }
             break;
           }
+          case 10: {
+
+            transaction_ = input.readBytes();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -76,7 +73,6 @@ private BeginTransactionResponse(
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_BeginTransactionResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_BeginTransactionResponse_fieldAccessorTable
@@ -98,7 +94,6 @@ public com.google.protobuf.ByteString getTransaction() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -108,7 +103,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!transaction_.isEmpty()) {
@@ -117,7 +111,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -233,7 +226,6 @@ public static com.google.firestore.v1beta1.BeginTransactionResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -241,7 +233,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.BeginTransactionResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -269,7 +260,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_BeginTransactionResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_BeginTransactionResponse_fieldAccessorTable
@@ -292,7 +282,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       transaction_ = com.google.protobuf.ByteString.EMPTY;
@@ -300,18 +289,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_BeginTransactionResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.BeginTransactionResponse getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.BeginTransactionResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.BeginTransactionResponse build() {
       com.google.firestore.v1beta1.BeginTransactionResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -320,7 +306,6 @@ public com.google.firestore.v1beta1.BeginTransactionResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.BeginTransactionResponse buildPartial() {
       com.google.firestore.v1beta1.BeginTransactionResponse result = new com.google.firestore.v1beta1.BeginTransactionResponse(this);
       result.transaction_ = transaction_;
@@ -328,39 +313,32 @@ public com.google.firestore.v1beta1.BeginTransactionResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.BeginTransactionResponse) {
         return mergeFrom((com.google.firestore.v1beta1.BeginTransactionResponse)other);
@@ -380,12 +358,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.BeginTransactionResponse o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -444,13 +420,11 @@ public Builder clearTransaction() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -472,12 +446,11 @@ public static com.google.firestore.v1beta1.BeginTransactionResponse getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BeginTransactionResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BeginTransactionResponse(input, extensionRegistry);
+        return new BeginTransactionResponse(input, extensionRegistry);
     }
   };
 
@@ -490,7 +463,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.BeginTransactionResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommitRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommitRequest.java
index d3a9dd04d5d4..d73b6b83bbeb 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommitRequest.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommitRequest.java
@@ -35,9 +35,6 @@ private CommitRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private CommitRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -69,13 +73,6 @@ private CommitRequest(
             transaction_ = input.readBytes();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private CommitRequest(
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_CommitRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_CommitRequest_fieldAccessorTable
@@ -223,7 +219,6 @@ public com.google.protobuf.ByteString getTransaction() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -233,7 +228,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getDatabaseBytes().isEmpty()) {
@@ -248,7 +242,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -381,7 +374,6 @@ public static com.google.firestore.v1beta1.CommitRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -389,7 +381,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.CommitRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -417,7 +408,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_CommitRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_CommitRequest_fieldAccessorTable
@@ -441,7 +431,6 @@ private void maybeForceBuilderInitialization() {
         getWritesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       database_ = "";
@@ -457,18 +446,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_CommitRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.CommitRequest getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.CommitRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.CommitRequest build() {
       com.google.firestore.v1beta1.CommitRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -477,7 +463,6 @@ public com.google.firestore.v1beta1.CommitRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.CommitRequest buildPartial() {
       com.google.firestore.v1beta1.CommitRequest result = new com.google.firestore.v1beta1.CommitRequest(this);
       int from_bitField0_ = bitField0_;
@@ -498,39 +483,32 @@ public com.google.firestore.v1beta1.CommitRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.CommitRequest) {
         return mergeFrom((com.google.firestore.v1beta1.CommitRequest)other);
@@ -580,12 +558,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.CommitRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1069,13 +1045,11 @@ public Builder clearTransaction() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1097,12 +1071,11 @@ public static com.google.firestore.v1beta1.CommitRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CommitRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CommitRequest(input, extensionRegistry);
+        return new CommitRequest(input, extensionRegistry);
     }
   };
 
@@ -1115,7 +1088,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.CommitRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommitResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommitResponse.java
index 26cd6c8a4063..893c6c4b0c11 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommitResponse.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommitResponse.java
@@ -33,9 +33,6 @@ private CommitResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private CommitResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               writeResults_ = new java.util.ArrayList();
@@ -69,13 +73,6 @@ private CommitResponse(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private CommitResponse(
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_CommitResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_CommitResponse_fieldAccessorTable
@@ -204,7 +200,6 @@ public com.google.protobuf.TimestampOrBuilder getCommitTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -214,7 +209,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < writeResults_.size(); i++) {
@@ -226,7 +220,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -357,7 +350,6 @@ public static com.google.firestore.v1beta1.CommitResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -365,7 +357,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.CommitResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -393,7 +384,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_CommitResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_CommitResponse_fieldAccessorTable
@@ -417,7 +407,6 @@ private void maybeForceBuilderInitialization() {
         getWriteResultsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (writeResultsBuilder_ == null) {
@@ -435,18 +424,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_CommitResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.CommitResponse getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.CommitResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.CommitResponse build() {
       com.google.firestore.v1beta1.CommitResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -455,7 +441,6 @@ public com.google.firestore.v1beta1.CommitResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.CommitResponse buildPartial() {
       com.google.firestore.v1beta1.CommitResponse result = new com.google.firestore.v1beta1.CommitResponse(this);
       int from_bitField0_ = bitField0_;
@@ -479,39 +464,32 @@ public com.google.firestore.v1beta1.CommitResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.CommitResponse) {
         return mergeFrom((com.google.firestore.v1beta1.CommitResponse)other);
@@ -557,12 +535,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.CommitResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1082,13 +1058,11 @@ public com.google.protobuf.TimestampOrBuilder getCommitTimeOrBuilder() {
       }
       return commitTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1110,12 +1084,11 @@ public static com.google.firestore.v1beta1.CommitResponse getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CommitResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CommitResponse(input, extensionRegistry);
+        return new CommitResponse(input, extensionRegistry);
     }
   };
 
@@ -1128,7 +1101,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.CommitResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommonProto.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommonProto.java
index a2f1961b1db8..81ec3ade5f01 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommonProto.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommonProto.java
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "imestampH\000B\020\n\016condition_type\"\263\002\n\022Transac" +
       "tionOptions\022J\n\tread_only\030\002 \001(\01325.google." +
       "firestore.v1beta1.TransactionOptions.Rea" +
-      "dOnlyH\000\022L\n\nread_write\030\003 \001(\01326.google.fir" +
+      "dOnlyH\000\022L\n\nread_write\030\003 \001(\01326.google.fir",
       "estore.v1beta1.TransactionOptions.ReadWr" +
       "iteH\000\032&\n\tReadWrite\022\031\n\021retry_transaction\030" +
       "\001 \001(\014\032S\n\010ReadOnly\022/\n\tread_time\030\002 \001(\0132\032.g" +
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CreateDocumentRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CreateDocumentRequest.java
index f8b4e4158d0a..ab61e5b6f324 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CreateDocumentRequest.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CreateDocumentRequest.java
@@ -35,9 +35,6 @@ private CreateDocumentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private CreateDocumentRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -93,13 +97,6 @@ private CreateDocumentRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -117,7 +114,6 @@ private CreateDocumentRequest(
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_CreateDocumentRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_CreateDocumentRequest_fieldAccessorTable
@@ -330,7 +326,6 @@ public com.google.firestore.v1beta1.DocumentMaskOrBuilder getMaskOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -340,7 +335,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -361,7 +355,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -516,7 +509,6 @@ public static com.google.firestore.v1beta1.CreateDocumentRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -524,7 +516,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.CreateDocumentRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -552,7 +543,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_CreateDocumentRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_CreateDocumentRequest_fieldAccessorTable
@@ -575,7 +565,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -599,18 +588,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_CreateDocumentRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.CreateDocumentRequest getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.CreateDocumentRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.CreateDocumentRequest build() {
       com.google.firestore.v1beta1.CreateDocumentRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -619,7 +605,6 @@ public com.google.firestore.v1beta1.CreateDocumentRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.CreateDocumentRequest buildPartial() {
       com.google.firestore.v1beta1.CreateDocumentRequest result = new com.google.firestore.v1beta1.CreateDocumentRequest(this);
       result.parent_ = parent_;
@@ -639,39 +624,32 @@ public com.google.firestore.v1beta1.CreateDocumentRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.CreateDocumentRequest) {
         return mergeFrom((com.google.firestore.v1beta1.CreateDocumentRequest)other);
@@ -706,12 +684,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.CreateDocumentRequest othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1335,13 +1311,11 @@ public com.google.firestore.v1beta1.DocumentMaskOrBuilder getMaskOrBuilder() {
       }
       return maskBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1363,12 +1337,11 @@ public static com.google.firestore.v1beta1.CreateDocumentRequest getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateDocumentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateDocumentRequest(input, extensionRegistry);
+        return new CreateDocumentRequest(input, extensionRegistry);
     }
   };
 
@@ -1381,7 +1354,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.CreateDocumentRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Cursor.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Cursor.java
index 6a57ceeab8e3..f298bd3a8e0e 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Cursor.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Cursor.java
@@ -34,9 +34,6 @@ private Cursor(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private Cursor(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               values_ = new java.util.ArrayList();
@@ -62,13 +66,6 @@ private Cursor(
             before_ = input.readBool();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -89,7 +86,6 @@ private Cursor(
     return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_Cursor_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_Cursor_fieldAccessorTable
@@ -178,7 +174,6 @@ public boolean getBefore() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -188,7 +183,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < values_.size(); i++) {
@@ -200,7 +194,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -327,7 +320,6 @@ public static com.google.firestore.v1beta1.Cursor parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -335,7 +327,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.Cursor prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -363,7 +354,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_Cursor_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_Cursor_fieldAccessorTable
@@ -387,7 +377,6 @@ private void maybeForceBuilderInitialization() {
         getValuesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (valuesBuilder_ == null) {
@@ -401,18 +390,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_Cursor_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.Cursor getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.Cursor.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.Cursor build() {
       com.google.firestore.v1beta1.Cursor result = buildPartial();
       if (!result.isInitialized()) {
@@ -421,7 +407,6 @@ public com.google.firestore.v1beta1.Cursor build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.Cursor buildPartial() {
       com.google.firestore.v1beta1.Cursor result = new com.google.firestore.v1beta1.Cursor(this);
       int from_bitField0_ = bitField0_;
@@ -441,39 +426,32 @@ public com.google.firestore.v1beta1.Cursor buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.Cursor) {
         return mergeFrom((com.google.firestore.v1beta1.Cursor)other);
@@ -519,12 +497,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.Cursor other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -932,13 +908,11 @@ public Builder clearBefore() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -960,12 +934,11 @@ public static com.google.firestore.v1beta1.Cursor getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Cursor parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Cursor(input, extensionRegistry);
+        return new Cursor(input, extensionRegistry);
     }
   };
 
@@ -978,7 +951,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.Cursor getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DeleteDocumentRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DeleteDocumentRequest.java
index 6634a2e5a3a2..10fa0522a6c2 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DeleteDocumentRequest.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DeleteDocumentRequest.java
@@ -33,9 +33,6 @@ private DeleteDocumentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private DeleteDocumentRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private DeleteDocumentRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private DeleteDocumentRequest(
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_DeleteDocumentRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_DeleteDocumentRequest_fieldAccessorTable
@@ -179,7 +175,6 @@ public com.google.firestore.v1beta1.PreconditionOrBuilder getCurrentDocumentOrBu
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -189,7 +184,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -201,7 +195,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -329,7 +322,6 @@ public static com.google.firestore.v1beta1.DeleteDocumentRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -337,7 +329,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.DeleteDocumentRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -365,7 +356,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_DeleteDocumentRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_DeleteDocumentRequest_fieldAccessorTable
@@ -388,7 +378,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -402,18 +391,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_DeleteDocumentRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.DeleteDocumentRequest getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.DeleteDocumentRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.DeleteDocumentRequest build() {
       com.google.firestore.v1beta1.DeleteDocumentRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -422,7 +408,6 @@ public com.google.firestore.v1beta1.DeleteDocumentRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.DeleteDocumentRequest buildPartial() {
       com.google.firestore.v1beta1.DeleteDocumentRequest result = new com.google.firestore.v1beta1.DeleteDocumentRequest(this);
       result.name_ = name_;
@@ -435,39 +420,32 @@ public com.google.firestore.v1beta1.DeleteDocumentRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.DeleteDocumentRequest) {
         return mergeFrom((com.google.firestore.v1beta1.DeleteDocumentRequest)other);
@@ -491,12 +469,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.DeleteDocumentRequest othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -770,13 +746,11 @@ public com.google.firestore.v1beta1.PreconditionOrBuilder getCurrentDocumentOrBu
       }
       return currentDocumentBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -798,12 +772,11 @@ public static com.google.firestore.v1beta1.DeleteDocumentRequest getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteDocumentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteDocumentRequest(input, extensionRegistry);
+        return new DeleteDocumentRequest(input, extensionRegistry);
     }
   };
 
@@ -816,7 +789,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.DeleteDocumentRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Document.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Document.java
index 4e41f93ce169..ab8d93fe99b2 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Document.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Document.java
@@ -34,9 +34,6 @@ private Document(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private Document(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -93,13 +97,6 @@ private Document(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -118,7 +115,6 @@ private Document(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -129,7 +125,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.DocumentProto.internal_static_google_firestore_v1beta1_Document_fieldAccessorTable
@@ -431,7 +426,6 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -441,7 +435,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -462,7 +455,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -619,7 +611,6 @@ public static com.google.firestore.v1beta1.Document parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -627,7 +618,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.Document prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -678,7 +668,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.DocumentProto.internal_static_google_firestore_v1beta1_Document_fieldAccessorTable
@@ -701,7 +690,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -722,18 +710,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.DocumentProto.internal_static_google_firestore_v1beta1_Document_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.Document getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.Document.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.Document build() {
       com.google.firestore.v1beta1.Document result = buildPartial();
       if (!result.isInitialized()) {
@@ -742,7 +727,6 @@ public com.google.firestore.v1beta1.Document build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.Document buildPartial() {
       com.google.firestore.v1beta1.Document result = new com.google.firestore.v1beta1.Document(this);
       int from_bitField0_ = bitField0_;
@@ -765,39 +749,32 @@ public com.google.firestore.v1beta1.Document buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.Document) {
         return mergeFrom((com.google.firestore.v1beta1.Document)other);
@@ -826,12 +803,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.Document other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1581,13 +1556,11 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
       }
       return updateTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1609,12 +1582,11 @@ public static com.google.firestore.v1beta1.Document getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Document parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Document(input, extensionRegistry);
+        return new Document(input, extensionRegistry);
     }
   };
 
@@ -1627,7 +1599,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.Document getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentChange.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentChange.java
index 667295520270..79a46d8d1f3d 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentChange.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentChange.java
@@ -38,9 +38,6 @@ private DocumentChange(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private DocumentChange(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.firestore.v1beta1.Document.Builder subBuilder = null;
             if (document_ != null) {
@@ -107,13 +111,6 @@ private DocumentChange(
             input.popLimit(limit);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -137,7 +134,6 @@ private DocumentChange(
     return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_DocumentChange_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_DocumentChange_fieldAccessorTable
@@ -253,7 +249,6 @@ public int getRemovedTargetIds(int index) {
   private int removedTargetIdsMemoizedSerializedSize = -1;
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -263,7 +258,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     getSerializedSize();
@@ -287,7 +281,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -448,7 +441,6 @@ public static com.google.firestore.v1beta1.DocumentChange parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -456,7 +448,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.DocumentChange prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -488,7 +479,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_DocumentChange_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_DocumentChange_fieldAccessorTable
@@ -511,7 +501,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (documentBuilder_ == null) {
@@ -527,18 +516,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_DocumentChange_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.DocumentChange getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.DocumentChange.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.DocumentChange build() {
       com.google.firestore.v1beta1.DocumentChange result = buildPartial();
       if (!result.isInitialized()) {
@@ -547,7 +533,6 @@ public com.google.firestore.v1beta1.DocumentChange build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.DocumentChange buildPartial() {
       com.google.firestore.v1beta1.DocumentChange result = new com.google.firestore.v1beta1.DocumentChange(this);
       int from_bitField0_ = bitField0_;
@@ -572,39 +557,32 @@ public com.google.firestore.v1beta1.DocumentChange buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.DocumentChange) {
         return mergeFrom((com.google.firestore.v1beta1.DocumentChange)other);
@@ -644,12 +622,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.DocumentChange other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1018,13 +994,11 @@ public Builder clearRemovedTargetIds() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1046,12 +1020,11 @@ public static com.google.firestore.v1beta1.DocumentChange getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DocumentChange parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DocumentChange(input, extensionRegistry);
+        return new DocumentChange(input, extensionRegistry);
     }
   };
 
@@ -1064,7 +1037,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.DocumentChange getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentDelete.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentDelete.java
index 4c672c55f5bf..7a38c2145b18 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentDelete.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentDelete.java
@@ -38,9 +38,6 @@ private DocumentDelete(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private DocumentDelete(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -92,13 +96,6 @@ private DocumentDelete(
             input.popLimit(limit);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -119,7 +116,6 @@ private DocumentDelete(
     return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_DocumentDelete_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_DocumentDelete_fieldAccessorTable
@@ -242,7 +238,6 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -252,7 +247,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     getSerializedSize();
@@ -272,7 +266,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -420,7 +413,6 @@ public static com.google.firestore.v1beta1.DocumentDelete parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -428,7 +420,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.DocumentDelete prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -460,7 +451,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_DocumentDelete_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_DocumentDelete_fieldAccessorTable
@@ -483,7 +473,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       document_ = "";
@@ -499,18 +488,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_DocumentDelete_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.DocumentDelete getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.DocumentDelete.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.DocumentDelete build() {
       com.google.firestore.v1beta1.DocumentDelete result = buildPartial();
       if (!result.isInitialized()) {
@@ -519,7 +505,6 @@ public com.google.firestore.v1beta1.DocumentDelete build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.DocumentDelete buildPartial() {
       com.google.firestore.v1beta1.DocumentDelete result = new com.google.firestore.v1beta1.DocumentDelete(this);
       int from_bitField0_ = bitField0_;
@@ -540,39 +525,32 @@ public com.google.firestore.v1beta1.DocumentDelete buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.DocumentDelete) {
         return mergeFrom((com.google.firestore.v1beta1.DocumentDelete)other);
@@ -606,12 +584,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.DocumentDelete other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -975,13 +951,11 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
       }
       return readTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1003,12 +977,11 @@ public static com.google.firestore.v1beta1.DocumentDelete getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DocumentDelete parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DocumentDelete(input, extensionRegistry);
+        return new DocumentDelete(input, extensionRegistry);
     }
   };
 
@@ -1021,7 +994,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.DocumentDelete getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentMask.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentMask.java
index 1226e44061cf..17306fd5e8f9 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentMask.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentMask.java
@@ -37,9 +37,6 @@ private DocumentMask(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private DocumentMask(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -60,13 +64,6 @@ private DocumentMask(
             fieldPaths_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -87,7 +84,6 @@ private DocumentMask(
     return com.google.firestore.v1beta1.CommonProto.internal_static_google_firestore_v1beta1_DocumentMask_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.CommonProto.internal_static_google_firestore_v1beta1_DocumentMask_fieldAccessorTable
@@ -145,7 +141,6 @@ public java.lang.String getFieldPaths(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -155,7 +150,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < fieldPaths_.size(); i++) {
@@ -164,7 +158,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -286,7 +279,6 @@ public static com.google.firestore.v1beta1.DocumentMask parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -294,7 +286,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.DocumentMask prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -326,7 +317,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.CommonProto.internal_static_google_firestore_v1beta1_DocumentMask_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.CommonProto.internal_static_google_firestore_v1beta1_DocumentMask_fieldAccessorTable
@@ -349,7 +339,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       fieldPaths_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -357,18 +346,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.CommonProto.internal_static_google_firestore_v1beta1_DocumentMask_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.DocumentMask getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.DocumentMask.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.DocumentMask build() {
       com.google.firestore.v1beta1.DocumentMask result = buildPartial();
       if (!result.isInitialized()) {
@@ -377,7 +363,6 @@ public com.google.firestore.v1beta1.DocumentMask build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.DocumentMask buildPartial() {
       com.google.firestore.v1beta1.DocumentMask result = new com.google.firestore.v1beta1.DocumentMask(this);
       int from_bitField0_ = bitField0_;
@@ -390,39 +375,32 @@ public com.google.firestore.v1beta1.DocumentMask buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.DocumentMask) {
         return mergeFrom((com.google.firestore.v1beta1.DocumentMask)other);
@@ -449,12 +427,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.DocumentMask other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -612,13 +588,11 @@ public Builder addFieldPathsBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -640,12 +614,11 @@ public static com.google.firestore.v1beta1.DocumentMask getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DocumentMask parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DocumentMask(input, extensionRegistry);
+        return new DocumentMask(input, extensionRegistry);
     }
   };
 
@@ -658,7 +631,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.DocumentMask getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentProto.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentProto.java
index 4148458381b2..b8d5c4dcc282 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentProto.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentProto.java
@@ -62,7 +62,7 @@ public static void registerAllExtensions(
       "irestore.v1beta1.Document.FieldsEntry\022/\n" +
       "\013create_time\030\003 \001(\0132\032.google.protobuf.Tim" +
       "estamp\022/\n\013update_time\030\004 \001(\0132\032.google.pro" +
-      "tobuf.Timestamp\032N\n\013FieldsEntry\022\013\n\003key\030\001 " +
+      "tobuf.Timestamp\032N\n\013FieldsEntry\022\013\n\003key\030\001 ",
       "\001(\t\022.\n\005value\030\002 \001(\0132\037.google.firestore.v1" +
       "beta1.Value:\0028\001\"\270\003\n\005Value\0220\n\nnull_value\030" +
       "\013 \001(\0162\032.google.protobuf.NullValueH\000\022\027\n\rb" +
@@ -72,7 +72,7 @@ public static void registerAllExtensions(
       "mpH\000\022\026\n\014string_value\030\021 \001(\tH\000\022\025\n\013bytes_va" +
       "lue\030\022 \001(\014H\000\022\031\n\017reference_value\030\005 \001(\tH\000\022." +
       "\n\017geo_point_value\030\010 \001(\0132\023.google.type.La" +
-      "tLngH\000\022;\n\013array_value\030\t \001(\0132$.google.fir" +
+      "tLngH\000\022;\n\013array_value\030\t \001(\0132$.google.fir",
       "estore.v1beta1.ArrayValueH\000\0227\n\tmap_value" +
       "\030\006 \001(\0132\".google.firestore.v1beta1.MapVal" +
       "ueH\000B\014\n\nvalue_type\"=\n\nArrayValue\022/\n\006valu" +
@@ -82,7 +82,7 @@ public static void registerAllExtensions(
       "\n\013FieldsEntry\022\013\n\003key\030\001 \001(\t\022.\n\005value\030\002 \001(" +
       "\0132\037.google.firestore.v1beta1.Value:\0028\001B\273" +
       "\001\n\034com.google.firestore.v1beta1B\rDocumen" +
-      "tProtoP\001ZAgoogle.golang.org/genproto/goo" +
+      "tProtoP\001ZAgoogle.golang.org/genproto/goo",
       "gleapis/firestore/v1beta1;firestore\242\002\004GC" +
       "FS\252\002\036Google.Cloud.Firestore.V1Beta1\312\002\036Go" +
       "ogle\\Cloud\\Firestore\\V1beta1b\006proto3"
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentRemove.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentRemove.java
index 85f2f82caac3..c2f377a47b2b 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentRemove.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentRemove.java
@@ -39,9 +39,6 @@ private DocumentRemove(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private DocumentRemove(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -93,13 +97,6 @@ private DocumentRemove(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -120,7 +117,6 @@ private DocumentRemove(
     return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_DocumentRemove_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_DocumentRemove_fieldAccessorTable
@@ -243,7 +239,6 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -253,7 +248,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     getSerializedSize();
@@ -273,7 +267,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -421,7 +414,6 @@ public static com.google.firestore.v1beta1.DocumentRemove parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -429,7 +421,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.DocumentRemove prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -462,7 +453,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_DocumentRemove_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_DocumentRemove_fieldAccessorTable
@@ -485,7 +475,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       document_ = "";
@@ -501,18 +490,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_DocumentRemove_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.DocumentRemove getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.DocumentRemove.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.DocumentRemove build() {
       com.google.firestore.v1beta1.DocumentRemove result = buildPartial();
       if (!result.isInitialized()) {
@@ -521,7 +507,6 @@ public com.google.firestore.v1beta1.DocumentRemove build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.DocumentRemove buildPartial() {
       com.google.firestore.v1beta1.DocumentRemove result = new com.google.firestore.v1beta1.DocumentRemove(this);
       int from_bitField0_ = bitField0_;
@@ -542,39 +527,32 @@ public com.google.firestore.v1beta1.DocumentRemove buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.DocumentRemove) {
         return mergeFrom((com.google.firestore.v1beta1.DocumentRemove)other);
@@ -608,12 +586,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.DocumentRemove other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -977,13 +953,11 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
       }
       return readTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1005,12 +979,11 @@ public static com.google.firestore.v1beta1.DocumentRemove getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DocumentRemove parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DocumentRemove(input, extensionRegistry);
+        return new DocumentRemove(input, extensionRegistry);
     }
   };
 
@@ -1023,7 +996,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.DocumentRemove getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentTransform.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentTransform.java
index dc3ec1df4c95..be2dbb2c1a6d 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentTransform.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentTransform.java
@@ -34,9 +34,6 @@ private DocumentTransform(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private DocumentTransform(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -63,13 +67,6 @@ private DocumentTransform(
                 input.readMessage(com.google.firestore.v1beta1.DocumentTransform.FieldTransform.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private DocumentTransform(
     return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_DocumentTransform_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_DocumentTransform_fieldAccessorTable
@@ -269,9 +265,6 @@ private FieldTransform(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -283,6 +276,13 @@ private FieldTransform(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -323,13 +323,6 @@ private FieldTransform(
               transformTypeCase_ = 7;
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -347,7 +340,6 @@ private FieldTransform(
       return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_DocumentTransform_FieldTransform_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_DocumentTransform_FieldTransform_fieldAccessorTable
@@ -582,7 +574,6 @@ public int getSetToServerValueValue() {
      */
     public com.google.firestore.v1beta1.DocumentTransform.FieldTransform.ServerValue getSetToServerValue() {
       if (transformTypeCase_ == 2) {
-        @SuppressWarnings("deprecation")
         com.google.firestore.v1beta1.DocumentTransform.FieldTransform.ServerValue result = com.google.firestore.v1beta1.DocumentTransform.FieldTransform.ServerValue.valueOf(
             (java.lang.Integer) transformType_);
         return result == null ? com.google.firestore.v1beta1.DocumentTransform.FieldTransform.ServerValue.UNRECOGNIZED : result;
@@ -715,7 +706,6 @@ public com.google.firestore.v1beta1.ArrayValueOrBuilder getRemoveAllFromArrayOrB
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -725,7 +715,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getFieldPathBytes().isEmpty()) {
@@ -743,7 +732,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -905,7 +893,6 @@ public static com.google.firestore.v1beta1.DocumentTransform.FieldTransform pars
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -913,7 +900,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.firestore.v1beta1.DocumentTransform.FieldTransform prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -941,7 +927,6 @@ public static final class Builder extends
         return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_DocumentTransform_FieldTransform_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_DocumentTransform_FieldTransform_fieldAccessorTable
@@ -964,7 +949,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         fieldPath_ = "";
@@ -974,18 +958,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_DocumentTransform_FieldTransform_descriptor;
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.DocumentTransform.FieldTransform getDefaultInstanceForType() {
         return com.google.firestore.v1beta1.DocumentTransform.FieldTransform.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.DocumentTransform.FieldTransform build() {
         com.google.firestore.v1beta1.DocumentTransform.FieldTransform result = buildPartial();
         if (!result.isInitialized()) {
@@ -994,7 +975,6 @@ public com.google.firestore.v1beta1.DocumentTransform.FieldTransform build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.DocumentTransform.FieldTransform buildPartial() {
         com.google.firestore.v1beta1.DocumentTransform.FieldTransform result = new com.google.firestore.v1beta1.DocumentTransform.FieldTransform(this);
         result.fieldPath_ = fieldPath_;
@@ -1020,39 +1000,32 @@ public com.google.firestore.v1beta1.DocumentTransform.FieldTransform buildPartia
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.firestore.v1beta1.DocumentTransform.FieldTransform) {
           return mergeFrom((com.google.firestore.v1beta1.DocumentTransform.FieldTransform)other);
@@ -1090,12 +1063,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.DocumentTransform.FieldTra
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1258,7 +1229,6 @@ public Builder setSetToServerValueValue(int value) {
        */
       public com.google.firestore.v1beta1.DocumentTransform.FieldTransform.ServerValue getSetToServerValue() {
         if (transformTypeCase_ == 2) {
-          @SuppressWarnings("deprecation")
           com.google.firestore.v1beta1.DocumentTransform.FieldTransform.ServerValue result = com.google.firestore.v1beta1.DocumentTransform.FieldTransform.ServerValue.valueOf(
               (java.lang.Integer) transformType_);
           return result == null ? com.google.firestore.v1beta1.DocumentTransform.FieldTransform.ServerValue.UNRECOGNIZED : result;
@@ -1784,13 +1754,11 @@ public com.google.firestore.v1beta1.ArrayValueOrBuilder getRemoveAllFromArrayOrB
         onChanged();;
         return removeAllFromArrayBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1812,12 +1780,11 @@ public static com.google.firestore.v1beta1.DocumentTransform.FieldTransform getD
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public FieldTransform parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new FieldTransform(input, extensionRegistry);
+          return new FieldTransform(input, extensionRegistry);
       }
     };
 
@@ -1830,7 +1797,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.DocumentTransform.FieldTransform getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1946,7 +1912,6 @@ public com.google.firestore.v1beta1.DocumentTransform.FieldTransformOrBuilder ge
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1956,7 +1921,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getDocumentBytes().isEmpty()) {
@@ -1968,7 +1932,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -2093,7 +2056,6 @@ public static com.google.firestore.v1beta1.DocumentTransform parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -2101,7 +2063,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.DocumentTransform prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -2129,7 +2090,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_DocumentTransform_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_DocumentTransform_fieldAccessorTable
@@ -2153,7 +2113,6 @@ private void maybeForceBuilderInitialization() {
         getFieldTransformsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       document_ = "";
@@ -2167,18 +2126,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_DocumentTransform_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.DocumentTransform getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.DocumentTransform.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.DocumentTransform build() {
       com.google.firestore.v1beta1.DocumentTransform result = buildPartial();
       if (!result.isInitialized()) {
@@ -2187,7 +2143,6 @@ public com.google.firestore.v1beta1.DocumentTransform build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.DocumentTransform buildPartial() {
       com.google.firestore.v1beta1.DocumentTransform result = new com.google.firestore.v1beta1.DocumentTransform(this);
       int from_bitField0_ = bitField0_;
@@ -2207,39 +2162,32 @@ public com.google.firestore.v1beta1.DocumentTransform buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.DocumentTransform) {
         return mergeFrom((com.google.firestore.v1beta1.DocumentTransform)other);
@@ -2286,12 +2234,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.DocumentTransform other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2747,13 +2693,11 @@ public com.google.firestore.v1beta1.DocumentTransform.FieldTransform.Builder add
       }
       return fieldTransformsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2775,12 +2719,11 @@ public static com.google.firestore.v1beta1.DocumentTransform getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DocumentTransform parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DocumentTransform(input, extensionRegistry);
+        return new DocumentTransform(input, extensionRegistry);
     }
   };
 
@@ -2793,7 +2736,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.DocumentTransform getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ExistenceFilter.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ExistenceFilter.java
index 3fa820d0e7ae..f80cae49451c 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ExistenceFilter.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ExistenceFilter.java
@@ -34,9 +34,6 @@ private ExistenceFilter(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ExistenceFilter(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
 
             targetId_ = input.readInt32();
@@ -58,13 +62,6 @@ private ExistenceFilter(
             count_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -82,7 +79,6 @@ private ExistenceFilter(
     return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_ExistenceFilter_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_ExistenceFilter_fieldAccessorTable
@@ -119,7 +115,6 @@ public int getCount() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -129,7 +124,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (targetId_ != 0) {
@@ -141,7 +135,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static com.google.firestore.v1beta1.ExistenceFilter parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.ExistenceFilter prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_ExistenceFilter_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_ExistenceFilter_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       targetId_ = 0;
@@ -334,18 +323,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_ExistenceFilter_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.ExistenceFilter getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.ExistenceFilter.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.ExistenceFilter build() {
       com.google.firestore.v1beta1.ExistenceFilter result = buildPartial();
       if (!result.isInitialized()) {
@@ -354,7 +340,6 @@ public com.google.firestore.v1beta1.ExistenceFilter build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.ExistenceFilter buildPartial() {
       com.google.firestore.v1beta1.ExistenceFilter result = new com.google.firestore.v1beta1.ExistenceFilter(this);
       result.targetId_ = targetId_;
@@ -363,39 +348,32 @@ public com.google.firestore.v1beta1.ExistenceFilter buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.ExistenceFilter) {
         return mergeFrom((com.google.firestore.v1beta1.ExistenceFilter)other);
@@ -418,12 +396,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.ExistenceFilter other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -523,13 +499,11 @@ public Builder clearCount() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -551,12 +525,11 @@ public static com.google.firestore.v1beta1.ExistenceFilter getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ExistenceFilter parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ExistenceFilter(input, extensionRegistry);
+        return new ExistenceFilter(input, extensionRegistry);
     }
   };
 
@@ -569,7 +542,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.ExistenceFilter getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/FirestoreProto.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/FirestoreProto.java
index f5552191403d..78f1fffb2158 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/FirestoreProto.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/FirestoreProto.java
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       "a1/write.proto\032\033google/protobuf/empty.pr" +
       "oto\032\037google/protobuf/timestamp.proto\032\027go" +
       "ogle/rpc/status.proto\"\270\001\n\022GetDocumentReq" +
-      "uest\022\014\n\004name\030\001 \001(\t\0224\n\004mask\030\002 \001(\0132&.googl" +
+      "uest\022\014\n\004name\030\001 \001(\t\0224\n\004mask\030\002 \001(\0132&.googl",
       "e.firestore.v1beta1.DocumentMask\022\025\n\013tran" +
       "saction\030\003 \001(\014H\000\022/\n\tread_time\030\005 \001(\0132\032.goo" +
       "gle.protobuf.TimestampH\000B\026\n\024consistency_" +
@@ -177,7 +177,7 @@ public static void registerAllExtensions(
       "_by\030\006 \001(\t\0224\n\004mask\030\007 \001(\0132&.google.firesto" +
       "re.v1beta1.DocumentMask\022\025\n\013transaction\030\010" +
       " \001(\014H\000\022/\n\tread_time\030\n \001(\0132\032.google.proto" +
-      "buf.TimestampH\000\022\024\n\014show_missing\030\014 \001(\010B\026\n" +
+      "buf.TimestampH\000\022\024\n\014show_missing\030\014 \001(\010B\026\n",
       "\024consistency_selector\"g\n\025ListDocumentsRe" +
       "sponse\0225\n\tdocuments\030\001 \003(\0132\".google.fires" +
       "tore.v1beta1.Document\022\027\n\017next_page_token" +
@@ -187,7 +187,7 @@ public static void registerAllExtensions(
       "firestore.v1beta1.Document\0224\n\004mask\030\005 \001(\013" +
       "2&.google.firestore.v1beta1.DocumentMask" +
       "\"\202\002\n\025UpdateDocumentRequest\0224\n\010document\030\001" +
-      " \001(\0132\".google.firestore.v1beta1.Document" +
+      " \001(\0132\".google.firestore.v1beta1.Document",
       "\022;\n\013update_mask\030\002 \001(\0132&.google.firestore" +
       ".v1beta1.DocumentMask\0224\n\004mask\030\003 \001(\0132&.go" +
       "ogle.firestore.v1beta1.DocumentMask\022@\n\020c" +
@@ -197,7 +197,7 @@ public static void registerAllExtensions(
       "\030\002 \001(\0132&.google.firestore.v1beta1.Precon" +
       "dition\"\236\002\n\030BatchGetDocumentsRequest\022\020\n\010d" +
       "atabase\030\001 \001(\t\022\021\n\tdocuments\030\002 \003(\t\0224\n\004mask" +
-      "\030\003 \001(\0132&.google.firestore.v1beta1.Docume" +
+      "\030\003 \001(\0132&.google.firestore.v1beta1.Docume",
       "ntMask\022\025\n\013transaction\030\004 \001(\014H\000\022G\n\017new_tra" +
       "nsaction\030\005 \001(\0132,.google.firestore.v1beta" +
       "1.TransactionOptionsH\000\022/\n\tread_time\030\007 \001(" +
@@ -207,7 +207,7 @@ public static void registerAllExtensions(
       "v1beta1.DocumentH\000\022\021\n\007missing\030\002 \001(\tH\000\022\023\n" +
       "\013transaction\030\003 \001(\014\022-\n\tread_time\030\004 \001(\0132\032." +
       "google.protobuf.TimestampB\010\n\006result\"j\n\027B" +
-      "eginTransactionRequest\022\020\n\010database\030\001 \001(\t" +
+      "eginTransactionRequest\022\020\n\010database\030\001 \001(\t",
       "\022=\n\007options\030\002 \001(\0132,.google.firestore.v1b" +
       "eta1.TransactionOptions\"/\n\030BeginTransact" +
       "ionResponse\022\023\n\013transaction\030\001 \001(\014\"g\n\rComm" +
@@ -217,7 +217,7 @@ public static void registerAllExtensions(
       "rite_results\030\001 \003(\0132%.google.firestore.v1" +
       "beta1.WriteResult\022/\n\013commit_time\030\002 \001(\0132\032" +
       ".google.protobuf.Timestamp\"8\n\017RollbackRe" +
-      "quest\022\020\n\010database\030\001 \001(\t\022\023\n\013transaction\030\002" +
+      "quest\022\020\n\010database\030\001 \001(\t\022\023\n\013transaction\030\002",
       " \001(\014\"\237\002\n\017RunQueryRequest\022\016\n\006parent\030\001 \001(\t" +
       "\022E\n\020structured_query\030\002 \001(\0132).google.fire" +
       "store.v1beta1.StructuredQueryH\000\022\025\n\013trans" +
@@ -227,7 +227,7 @@ public static void registerAllExtensions(
       "obuf.TimestampH\001B\014\n\nquery_typeB\026\n\024consis" +
       "tency_selector\"\245\001\n\020RunQueryResponse\022\023\n\013t" +
       "ransaction\030\002 \001(\014\0224\n\010document\030\001 \001(\0132\".goo" +
-      "gle.firestore.v1beta1.Document\022-\n\tread_t" +
+      "gle.firestore.v1beta1.Document\022-\n\tread_t",
       "ime\030\003 \001(\0132\032.google.protobuf.Timestamp\022\027\n" +
       "\017skipped_results\030\004 \001(\005\"\355\001\n\014WriteRequest\022" +
       "\020\n\010database\030\001 \001(\t\022\021\n\tstream_id\030\002 \001(\t\022/\n\006" +
@@ -237,7 +237,7 @@ public static void registerAllExtensions(
       "est.LabelsEntry\032-\n\013LabelsEntry\022\013\n\003key\030\001 " +
       "\001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\247\001\n\rWriteResponse" +
       "\022\021\n\tstream_id\030\001 \001(\t\022\024\n\014stream_token\030\002 \001(" +
-      "\014\022<\n\rwrite_results\030\003 \003(\0132%.google.firest" +
+      "\014\022<\n\rwrite_results\030\003 \003(\0132%.google.firest",
       "ore.v1beta1.WriteResult\022/\n\013commit_time\030\004" +
       " \001(\0132\032.google.protobuf.Timestamp\"\367\001\n\rLis" +
       "tenRequest\022\020\n\010database\030\001 \001(\t\0226\n\nadd_targ" +
@@ -247,7 +247,7 @@ public static void registerAllExtensions(
       "equest.LabelsEntry\032-\n\013LabelsEntry\022\013\n\003key" +
       "\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001B\017\n\rtarget_chan" +
       "ge\"\356\002\n\016ListenResponse\022?\n\rtarget_change\030\002" +
-      " \001(\0132&.google.firestore.v1beta1.TargetCh" +
+      " \001(\0132&.google.firestore.v1beta1.TargetCh",
       "angeH\000\022C\n\017document_change\030\003 \001(\0132(.google" +
       ".firestore.v1beta1.DocumentChangeH\000\022C\n\017d" +
       "ocument_delete\030\004 \001(\0132(.google.firestore." +
@@ -257,7 +257,7 @@ public static void registerAllExtensions(
       "irestore.v1beta1.ExistenceFilterH\000B\017\n\rre" +
       "sponse_type\"\260\003\n\006Target\022=\n\005query\030\002 \001(\0132,." +
       "google.firestore.v1beta1.Target.QueryTar" +
-      "getH\000\022E\n\tdocuments\030\003 \001(\01320.google.firest" +
+      "getH\000\022E\n\tdocuments\030\003 \001(\01320.google.firest",
       "ore.v1beta1.Target.DocumentsTargetH\000\022\026\n\014" +
       "resume_token\030\004 \001(\014H\001\022/\n\tread_time\030\013 \001(\0132" +
       "\032.google.protobuf.TimestampH\001\022\021\n\ttarget_" +
@@ -267,7 +267,7 @@ public static void registerAllExtensions(
       "google.firestore.v1beta1.StructuredQuery" +
       "H\000B\014\n\nquery_typeB\r\n\013target_typeB\r\n\013resum" +
       "e_type\"\257\002\n\014TargetChange\022S\n\022target_change" +
-      "_type\030\001 \001(\01627.google.firestore.v1beta1.T" +
+      "_type\030\001 \001(\01627.google.firestore.v1beta1.T",
       "argetChange.TargetChangeType\022\022\n\ntarget_i" +
       "ds\030\002 \003(\005\022!\n\005cause\030\003 \001(\0132\022.google.rpc.Sta" +
       "tus\022\024\n\014resume_token\030\004 \001(\014\022-\n\tread_time\030\006" +
@@ -277,7 +277,7 @@ public static void registerAllExtensions(
       "CollectionIdsRequest\022\016\n\006parent\030\001 \001(\t\022\021\n\t" +
       "page_size\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\"L\n\031L" +
       "istCollectionIdsResponse\022\026\n\016collection_i" +
-      "ds\030\001 \003(\t\022\027\n\017next_page_token\030\002 \001(\t2\310\023\n\tFi" +
+      "ds\030\001 \003(\t\022\027\n\017next_page_token\030\002 \001(\t2\310\023\n\tFi",
       "restore\022\236\001\n\013GetDocument\022,.google.firesto" +
       "re.v1beta1.GetDocumentRequest\032\".google.f" +
       "irestore.v1beta1.Document\"=\202\323\344\223\0027\0225/v1be" +
@@ -287,7 +287,7 @@ public static void registerAllExtensions(
       "gle.firestore.v1beta1.ListDocumentsRespo" +
       "nse\"O\202\323\344\223\002I\022G/v1beta1/{parent=projects/*" +
       "/databases/*/documents/*/**}/{collection" +
-      "_id}\022\276\001\n\016CreateDocument\022/.google.firesto" +
+      "_id}\022\276\001\n\016CreateDocument\022/.google.firesto",
       "re.v1beta1.CreateDocumentRequest\032\".googl" +
       "e.firestore.v1beta1.Document\"W\202\323\344\223\002Q\"E/v" +
       "1beta1/{parent=projects/*/databases/*/do" +
@@ -297,7 +297,7 @@ public static void registerAllExtensions(
       "tore.v1beta1.Document\"P\202\323\344\223\002J2>/v1beta1/" +
       "{document.name=projects/*/databases/*/do" +
       "cuments/*/**}:\010document\022\230\001\n\016DeleteDocume" +
-      "nt\022/.google.firestore.v1beta1.DeleteDocu" +
+      "nt\022/.google.firestore.v1beta1.DeleteDocu",
       "mentRequest\032\026.google.protobuf.Empty\"=\202\323\344" +
       "\223\0027*5/v1beta1/{name=projects/*/databases" +
       "/*/documents/*/**}\022\310\001\n\021BatchGetDocuments" +
@@ -307,7 +307,7 @@ public static void registerAllExtensions(
       "ta1/{database=projects/*/databases/*}/do" +
       "cuments:batchGet:\001*0\001\022\313\001\n\020BeginTransacti" +
       "on\0221.google.firestore.v1beta1.BeginTrans" +
-      "actionRequest\0322.google.firestore.v1beta1" +
+      "actionRequest\0322.google.firestore.v1beta1",
       ".BeginTransactionResponse\"P\202\323\344\223\002J\"E/v1be" +
       "ta1/{database=projects/*/databases/*}/do" +
       "cuments:beginTransaction:\001*\022\243\001\n\006Commit\022\'" +
@@ -317,7 +317,7 @@ public static void registerAllExtensions(
       "/databases/*}/documents:commit:\001*\022\227\001\n\010Ro" +
       "llback\022).google.firestore.v1beta1.Rollba" +
       "ckRequest\032\026.google.protobuf.Empty\"H\202\323\344\223\002" +
-      "B\"=/v1beta1/{database=projects/*/databas" +
+      "B\"=/v1beta1/{database=projects/*/databas",
       "es/*}/documents:rollback:\001*\022\364\001\n\010RunQuery" +
       "\022).google.firestore.v1beta1.RunQueryRequ" +
       "est\032*.google.firestore.v1beta1.RunQueryR" +
@@ -327,7 +327,7 @@ public static void registerAllExtensions(
       "es/*/documents/*/**}:runQuery:\001*0\001\022\243\001\n\005W" +
       "rite\022&.google.firestore.v1beta1.WriteReq" +
       "uest\032\'.google.firestore.v1beta1.WriteRes" +
-      "ponse\"E\202\323\344\223\002?\":/v1beta1/{database=projec" +
+      "ponse\"E\202\323\344\223\002?\":/v1beta1/{database=projec",
       "ts/*/databases/*}/documents:write:\001*(\0010\001" +
       "\022\247\001\n\006Listen\022\'.google.firestore.v1beta1.L" +
       "istenRequest\032(.google.firestore.v1beta1." +
@@ -337,7 +337,7 @@ public static void registerAllExtensions(
       "e.firestore.v1beta1.ListCollectionIdsReq" +
       "uest\0323.google.firestore.v1beta1.ListColl" +
       "ectionIdsResponse\"\240\001\202\323\344\223\002\231\001\"D/v1beta1/{p" +
-      "arent=projects/*/databases/*/documents}:" +
+      "arent=projects/*/databases/*/documents}:",
       "listCollectionIds:\001*ZN\"I/v1beta1/{parent" +
       "=projects/*/databases/*/documents/*/**}:" +
       "listCollectionIds:\001*B\274\001\n\034com.google.fire" +
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/GetDocumentRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/GetDocumentRequest.java
index 6580b70383d1..0aa951e92ee9 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/GetDocumentRequest.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/GetDocumentRequest.java
@@ -33,9 +33,6 @@ private GetDocumentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private GetDocumentRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -85,13 +89,6 @@ private GetDocumentRequest(
             consistencySelectorCase_ = 5;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -109,7 +106,6 @@ private GetDocumentRequest(
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_GetDocumentRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_GetDocumentRequest_fieldAccessorTable
@@ -295,7 +291,6 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -305,7 +300,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -324,7 +318,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -488,7 +481,6 @@ public static com.google.firestore.v1beta1.GetDocumentRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -496,7 +488,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.GetDocumentRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -524,7 +515,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_GetDocumentRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_GetDocumentRequest_fieldAccessorTable
@@ -547,7 +537,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -563,18 +552,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_GetDocumentRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.GetDocumentRequest getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.GetDocumentRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.GetDocumentRequest build() {
       com.google.firestore.v1beta1.GetDocumentRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -583,7 +569,6 @@ public com.google.firestore.v1beta1.GetDocumentRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.GetDocumentRequest buildPartial() {
       com.google.firestore.v1beta1.GetDocumentRequest result = new com.google.firestore.v1beta1.GetDocumentRequest(this);
       result.name_ = name_;
@@ -607,39 +592,32 @@ public com.google.firestore.v1beta1.GetDocumentRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.GetDocumentRequest) {
         return mergeFrom((com.google.firestore.v1beta1.GetDocumentRequest)other);
@@ -676,12 +654,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.GetDocumentRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1205,13 +1181,11 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
       onChanged();;
       return readTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1233,12 +1207,11 @@ public static com.google.firestore.v1beta1.GetDocumentRequest getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetDocumentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetDocumentRequest(input, extensionRegistry);
+        return new GetDocumentRequest(input, extensionRegistry);
     }
   };
 
@@ -1251,7 +1224,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.GetDocumentRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListCollectionIdsRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListCollectionIdsRequest.java
index 1f7a1fe5517d..14dc747ac894 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListCollectionIdsRequest.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListCollectionIdsRequest.java
@@ -35,9 +35,6 @@ private ListCollectionIdsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListCollectionIdsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ListCollectionIdsRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListCollectionIdsRequest(
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_ListCollectionIdsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_ListCollectionIdsRequest_fieldAccessorTable
@@ -204,7 +200,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -214,7 +209,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -229,7 +223,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -359,7 +352,6 @@ public static com.google.firestore.v1beta1.ListCollectionIdsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -367,7 +359,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.ListCollectionIdsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -395,7 +386,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_ListCollectionIdsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_ListCollectionIdsRequest_fieldAccessorTable
@@ -418,7 +408,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -430,18 +419,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_ListCollectionIdsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.ListCollectionIdsRequest getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.ListCollectionIdsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.ListCollectionIdsRequest build() {
       com.google.firestore.v1beta1.ListCollectionIdsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -450,7 +436,6 @@ public com.google.firestore.v1beta1.ListCollectionIdsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.ListCollectionIdsRequest buildPartial() {
       com.google.firestore.v1beta1.ListCollectionIdsRequest result = new com.google.firestore.v1beta1.ListCollectionIdsRequest(this);
       result.parent_ = parent_;
@@ -460,39 +445,32 @@ public com.google.firestore.v1beta1.ListCollectionIdsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.ListCollectionIdsRequest) {
         return mergeFrom((com.google.firestore.v1beta1.ListCollectionIdsRequest)other);
@@ -520,12 +498,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.ListCollectionIdsRequest o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -779,13 +755,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -807,12 +781,11 @@ public static com.google.firestore.v1beta1.ListCollectionIdsRequest getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListCollectionIdsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListCollectionIdsRequest(input, extensionRegistry);
+        return new ListCollectionIdsRequest(input, extensionRegistry);
     }
   };
 
@@ -825,7 +798,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.ListCollectionIdsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListCollectionIdsResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListCollectionIdsResponse.java
index e7abac23e279..7d8b84f67f8a 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListCollectionIdsResponse.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListCollectionIdsResponse.java
@@ -34,9 +34,6 @@ private ListCollectionIdsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListCollectionIdsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -63,13 +67,6 @@ private ListCollectionIdsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListCollectionIdsResponse(
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_ListCollectionIdsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_ListCollectionIdsResponse_fieldAccessorTable
@@ -187,7 +183,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -197,7 +192,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < collectionIds_.size(); i++) {
@@ -209,7 +203,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -338,7 +331,6 @@ public static com.google.firestore.v1beta1.ListCollectionIdsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -346,7 +338,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.ListCollectionIdsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -374,7 +365,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_ListCollectionIdsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_ListCollectionIdsResponse_fieldAccessorTable
@@ -397,7 +387,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       collectionIds_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -407,18 +396,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_ListCollectionIdsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.ListCollectionIdsResponse getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.ListCollectionIdsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.ListCollectionIdsResponse build() {
       com.google.firestore.v1beta1.ListCollectionIdsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -427,7 +413,6 @@ public com.google.firestore.v1beta1.ListCollectionIdsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.ListCollectionIdsResponse buildPartial() {
       com.google.firestore.v1beta1.ListCollectionIdsResponse result = new com.google.firestore.v1beta1.ListCollectionIdsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -443,39 +428,32 @@ public com.google.firestore.v1beta1.ListCollectionIdsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.ListCollectionIdsResponse) {
         return mergeFrom((com.google.firestore.v1beta1.ListCollectionIdsResponse)other);
@@ -506,12 +484,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.ListCollectionIdsResponse
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -749,13 +725,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -777,12 +751,11 @@ public static com.google.firestore.v1beta1.ListCollectionIdsResponse getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListCollectionIdsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListCollectionIdsResponse(input, extensionRegistry);
+        return new ListCollectionIdsResponse(input, extensionRegistry);
     }
   };
 
@@ -795,7 +768,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.ListCollectionIdsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListDocumentsRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListDocumentsRequest.java
index 0c381e207a3c..4f2b30947b8b 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListDocumentsRequest.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListDocumentsRequest.java
@@ -38,9 +38,6 @@ private ListDocumentsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private ListDocumentsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -118,13 +122,6 @@ private ListDocumentsRequest(
             showMissing_ = input.readBool();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -142,7 +139,6 @@ private ListDocumentsRequest(
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_ListDocumentsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_ListDocumentsRequest_fieldAccessorTable
@@ -495,7 +491,6 @@ public boolean getShowMissing() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -505,7 +500,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -539,7 +533,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -741,7 +734,6 @@ public static com.google.firestore.v1beta1.ListDocumentsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -749,7 +741,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.ListDocumentsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -777,7 +768,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_ListDocumentsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_ListDocumentsRequest_fieldAccessorTable
@@ -800,7 +790,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -826,18 +815,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_ListDocumentsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.ListDocumentsRequest getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.ListDocumentsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.ListDocumentsRequest build() {
       com.google.firestore.v1beta1.ListDocumentsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -846,7 +832,6 @@ public com.google.firestore.v1beta1.ListDocumentsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.ListDocumentsRequest buildPartial() {
       com.google.firestore.v1beta1.ListDocumentsRequest result = new com.google.firestore.v1beta1.ListDocumentsRequest(this);
       result.parent_ = parent_;
@@ -875,39 +860,32 @@ public com.google.firestore.v1beta1.ListDocumentsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.ListDocumentsRequest) {
         return mergeFrom((com.google.firestore.v1beta1.ListDocumentsRequest)other);
@@ -962,12 +940,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.ListDocumentsRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1874,13 +1850,11 @@ public Builder clearShowMissing() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1902,12 +1876,11 @@ public static com.google.firestore.v1beta1.ListDocumentsRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListDocumentsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDocumentsRequest(input, extensionRegistry);
+        return new ListDocumentsRequest(input, extensionRegistry);
     }
   };
 
@@ -1920,7 +1893,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.ListDocumentsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListDocumentsResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListDocumentsResponse.java
index 71957177c0e8..83b12e212b57 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListDocumentsResponse.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListDocumentsResponse.java
@@ -34,9 +34,6 @@ private ListDocumentsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListDocumentsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               documents_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListDocumentsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListDocumentsResponse(
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_ListDocumentsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_ListDocumentsResponse_fieldAccessorTable
@@ -197,7 +193,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -207,7 +202,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < documents_.size(); i++) {
@@ -219,7 +213,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -344,7 +337,6 @@ public static com.google.firestore.v1beta1.ListDocumentsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -352,7 +344,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.ListDocumentsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -380,7 +371,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_ListDocumentsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_ListDocumentsResponse_fieldAccessorTable
@@ -404,7 +394,6 @@ private void maybeForceBuilderInitialization() {
         getDocumentsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (documentsBuilder_ == null) {
@@ -418,18 +407,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_ListDocumentsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.ListDocumentsResponse getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.ListDocumentsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.ListDocumentsResponse build() {
       com.google.firestore.v1beta1.ListDocumentsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -438,7 +424,6 @@ public com.google.firestore.v1beta1.ListDocumentsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.ListDocumentsResponse buildPartial() {
       com.google.firestore.v1beta1.ListDocumentsResponse result = new com.google.firestore.v1beta1.ListDocumentsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -458,39 +443,32 @@ public com.google.firestore.v1beta1.ListDocumentsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.ListDocumentsResponse) {
         return mergeFrom((com.google.firestore.v1beta1.ListDocumentsResponse)other);
@@ -537,12 +515,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.ListDocumentsResponse othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -962,13 +938,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -990,12 +964,11 @@ public static com.google.firestore.v1beta1.ListDocumentsResponse getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListDocumentsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDocumentsResponse(input, extensionRegistry);
+        return new ListDocumentsResponse(input, extensionRegistry);
     }
   };
 
@@ -1008,7 +981,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.ListDocumentsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListenRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListenRequest.java
index 63d01abd06cd..8bdd48e47c12 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListenRequest.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListenRequest.java
@@ -33,9 +33,6 @@ private ListenRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ListenRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -85,13 +89,6 @@ private ListenRequest(
                 labels__.getKey(), labels__.getValue());
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -110,7 +107,6 @@ private ListenRequest(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -121,7 +117,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_ListenRequest_fieldAccessorTable
@@ -358,7 +353,6 @@ public java.lang.String getLabelsOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -368,7 +362,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getDatabaseBytes().isEmpty()) {
@@ -390,7 +383,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -557,7 +549,6 @@ public static com.google.firestore.v1beta1.ListenRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -565,7 +556,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.ListenRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -615,7 +605,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_ListenRequest_fieldAccessorTable
@@ -638,7 +627,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       database_ = "";
@@ -649,18 +637,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_ListenRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.ListenRequest getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.ListenRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.ListenRequest build() {
       com.google.firestore.v1beta1.ListenRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -669,7 +654,6 @@ public com.google.firestore.v1beta1.ListenRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.ListenRequest buildPartial() {
       com.google.firestore.v1beta1.ListenRequest result = new com.google.firestore.v1beta1.ListenRequest(this);
       int from_bitField0_ = bitField0_;
@@ -693,39 +677,32 @@ public com.google.firestore.v1beta1.ListenRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.ListenRequest) {
         return mergeFrom((com.google.firestore.v1beta1.ListenRequest)other);
@@ -761,12 +738,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.ListenRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1259,13 +1234,11 @@ public Builder putAllLabels(
           .putAll(values);
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1287,12 +1260,11 @@ public static com.google.firestore.v1beta1.ListenRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListenRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListenRequest(input, extensionRegistry);
+        return new ListenRequest(input, extensionRegistry);
     }
   };
 
@@ -1305,7 +1277,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.ListenRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListenResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListenResponse.java
index 9e44bdc95380..da062a1df055 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListenResponse.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListenResponse.java
@@ -32,9 +32,6 @@ private ListenResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private ListenResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             com.google.firestore.v1beta1.TargetChange.Builder subBuilder = null;
             if (responseTypeCase_ == 2) {
@@ -116,13 +120,6 @@ private ListenResponse(
             responseTypeCase_ = 6;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -140,7 +137,6 @@ private ListenResponse(
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_ListenResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_ListenResponse_fieldAccessorTable
@@ -395,7 +391,6 @@ public com.google.firestore.v1beta1.ExistenceFilterOrBuilder getFilterOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -405,7 +400,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (responseTypeCase_ == 2) {
@@ -426,7 +420,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -605,7 +598,6 @@ public static com.google.firestore.v1beta1.ListenResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -613,7 +605,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.ListenResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -641,7 +632,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_ListenResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_ListenResponse_fieldAccessorTable
@@ -664,7 +654,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       responseTypeCase_ = 0;
@@ -672,18 +661,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_ListenResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.ListenResponse getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.ListenResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.ListenResponse build() {
       com.google.firestore.v1beta1.ListenResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -692,7 +678,6 @@ public com.google.firestore.v1beta1.ListenResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.ListenResponse buildPartial() {
       com.google.firestore.v1beta1.ListenResponse result = new com.google.firestore.v1beta1.ListenResponse(this);
       if (responseTypeCase_ == 2) {
@@ -735,39 +720,32 @@ public com.google.firestore.v1beta1.ListenResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.ListenResponse) {
         return mergeFrom((com.google.firestore.v1beta1.ListenResponse)other);
@@ -809,12 +787,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.ListenResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1743,13 +1719,11 @@ public com.google.firestore.v1beta1.ExistenceFilterOrBuilder getFilterOrBuilder(
       onChanged();;
       return filterBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1771,12 +1745,11 @@ public static com.google.firestore.v1beta1.ListenResponse getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListenResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListenResponse(input, extensionRegistry);
+        return new ListenResponse(input, extensionRegistry);
     }
   };
 
@@ -1789,7 +1762,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.ListenResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/MapValue.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/MapValue.java
index 07188041e1f4..4def1a170016 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/MapValue.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/MapValue.java
@@ -32,9 +32,6 @@ private MapValue(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private MapValue(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               fields_ = com.google.protobuf.MapField.newMapField(
@@ -59,13 +63,6 @@ private MapValue(
                 fields__.getKey(), fields__.getValue());
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private MapValue(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -95,7 +91,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.DocumentProto.internal_static_google_firestore_v1beta1_MapValue_fieldAccessorTable
@@ -212,7 +207,6 @@ public com.google.firestore.v1beta1.Value getFieldsOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -222,7 +216,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     com.google.protobuf.GeneratedMessageV3
@@ -234,7 +227,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -358,7 +350,6 @@ public static com.google.firestore.v1beta1.MapValue parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -366,7 +357,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.MapValue prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -416,7 +406,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.DocumentProto.internal_static_google_firestore_v1beta1_MapValue_fieldAccessorTable
@@ -439,25 +428,21 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       internalGetMutableFields().clear();
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.DocumentProto.internal_static_google_firestore_v1beta1_MapValue_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.MapValue getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.MapValue.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.MapValue build() {
       com.google.firestore.v1beta1.MapValue result = buildPartial();
       if (!result.isInitialized()) {
@@ -466,7 +451,6 @@ public com.google.firestore.v1beta1.MapValue build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.MapValue buildPartial() {
       com.google.firestore.v1beta1.MapValue result = new com.google.firestore.v1beta1.MapValue(this);
       int from_bitField0_ = bitField0_;
@@ -476,39 +460,32 @@ public com.google.firestore.v1beta1.MapValue buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.MapValue) {
         return mergeFrom((com.google.firestore.v1beta1.MapValue)other);
@@ -527,12 +504,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.MapValue other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -730,13 +705,11 @@ public Builder putAllFields(
           .putAll(values);
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -758,12 +731,11 @@ public static com.google.firestore.v1beta1.MapValue getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public MapValue parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new MapValue(input, extensionRegistry);
+        return new MapValue(input, extensionRegistry);
     }
   };
 
@@ -776,7 +748,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.MapValue getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Precondition.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Precondition.java
index c38a5bd4295a..1b737936bb7b 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Precondition.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Precondition.java
@@ -32,9 +32,6 @@ private Precondition(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private Precondition(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             conditionTypeCase_ = 1;
             conditionType_ = input.readBool();
@@ -65,13 +69,6 @@ private Precondition(
             conditionTypeCase_ = 2;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -89,7 +86,6 @@ private Precondition(
     return com.google.firestore.v1beta1.CommonProto.internal_static_google_firestore_v1beta1_Precondition_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.CommonProto.internal_static_google_firestore_v1beta1_Precondition_fieldAccessorTable
@@ -193,7 +189,6 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -203,7 +198,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (conditionTypeCase_ == 1) {
@@ -216,7 +210,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -361,7 +354,6 @@ public static com.google.firestore.v1beta1.Precondition parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -369,7 +361,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.Precondition prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -397,7 +388,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.CommonProto.internal_static_google_firestore_v1beta1_Precondition_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.CommonProto.internal_static_google_firestore_v1beta1_Precondition_fieldAccessorTable
@@ -420,7 +410,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       conditionTypeCase_ = 0;
@@ -428,18 +417,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.CommonProto.internal_static_google_firestore_v1beta1_Precondition_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.Precondition getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.Precondition.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.Precondition build() {
       com.google.firestore.v1beta1.Precondition result = buildPartial();
       if (!result.isInitialized()) {
@@ -448,7 +434,6 @@ public com.google.firestore.v1beta1.Precondition build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.Precondition buildPartial() {
       com.google.firestore.v1beta1.Precondition result = new com.google.firestore.v1beta1.Precondition(this);
       if (conditionTypeCase_ == 1) {
@@ -466,39 +451,32 @@ public com.google.firestore.v1beta1.Precondition buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.Precondition) {
         return mergeFrom((com.google.firestore.v1beta1.Precondition)other);
@@ -528,12 +506,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.Precondition other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -792,13 +768,11 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
       onChanged();;
       return updateTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -820,12 +794,11 @@ public static com.google.firestore.v1beta1.Precondition getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Precondition parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Precondition(input, extensionRegistry);
+        return new Precondition(input, extensionRegistry);
     }
   };
 
@@ -838,7 +811,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.Precondition getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/QueryProto.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/QueryProto.java
index 91fee5618495..35b6f16289f0 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/QueryProto.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/QueryProto.java
@@ -82,7 +82,7 @@ public static void registerAllExtensions(
       "dQuery.Projection\022J\n\004from\030\002 \003(\0132<.google" +
       ".firestore.v1beta1.StructuredQuery.Colle" +
       "ctionSelector\022?\n\005where\030\003 \001(\01320.google.fi" +
-      "restore.v1beta1.StructuredQuery.Filter\022A" +
+      "restore.v1beta1.StructuredQuery.Filter\022A",
       "\n\010order_by\030\004 \003(\0132/.google.firestore.v1be" +
       "ta1.StructuredQuery.Order\0222\n\010start_at\030\007 " +
       "\001(\0132 .google.firestore.v1beta1.Cursor\0220\n" +
@@ -92,7 +92,7 @@ public static void registerAllExtensions(
       "nSelector\022\025\n\rcollection_id\030\002 \001(\t\022\027\n\017all_" +
       "descendants\030\003 \001(\010\032\214\002\n\006Filter\022U\n\020composit" +
       "e_filter\030\001 \001(\01329.google.firestore.v1beta" +
-      "1.StructuredQuery.CompositeFilterH\000\022M\n\014f" +
+      "1.StructuredQuery.CompositeFilterH\000\022M\n\014f",
       "ield_filter\030\002 \001(\01325.google.firestore.v1b" +
       "eta1.StructuredQuery.FieldFilterH\000\022M\n\014un" +
       "ary_filter\030\003 \001(\01325.google.firestore.v1be" +
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "ery.CompositeFilter.Operator\022A\n\007filters\030" +
       "\002 \003(\01320.google.firestore.v1beta1.Structu" +
       "redQuery.Filter\"-\n\010Operator\022\030\n\024OPERATOR_" +
-      "UNSPECIFIED\020\000\022\007\n\003AND\020\001\032\354\002\n\013FieldFilter\022G" +
+      "UNSPECIFIED\020\000\022\007\n\003AND\020\001\032\354\002\n\013FieldFilter\022G",
       "\n\005field\030\001 \001(\01328.google.firestore.v1beta1" +
       ".StructuredQuery.FieldReference\022J\n\002op\030\002 " +
       "\001(\0162>.google.firestore.v1beta1.Structure" +
@@ -112,7 +112,7 @@ public static void registerAllExtensions(
       "SS_THAN\020\001\022\026\n\022LESS_THAN_OR_EQUAL\020\002\022\020\n\014GRE" +
       "ATER_THAN\020\003\022\031\n\025GREATER_THAN_OR_EQUAL\020\004\022\t" +
       "\n\005EQUAL\020\005\022\022\n\016ARRAY_CONTAINS\020\007\032\363\001\n\013UnaryF" +
-      "ilter\022J\n\002op\030\001 \001(\0162>.google.firestore.v1b" +
+      "ilter\022J\n\002op\030\001 \001(\0162>.google.firestore.v1b",
       "eta1.StructuredQuery.UnaryFilter.Operato" +
       "r\022I\n\005field\030\002 \001(\01328.google.firestore.v1be" +
       "ta1.StructuredQuery.FieldReferenceH\000\"=\n\010" +
@@ -122,7 +122,7 @@ public static void registerAllExtensions(
       "v1beta1.StructuredQuery.FieldReference\022F" +
       "\n\tdirection\030\002 \001(\01623.google.firestore.v1b" +
       "eta1.StructuredQuery.Direction\032$\n\016FieldR" +
-      "eference\022\022\n\nfield_path\030\002 \001(\t\032V\n\nProjecti" +
+      "eference\022\022\n\nfield_path\030\002 \001(\t\032V\n\nProjecti",
       "on\022H\n\006fields\030\002 \003(\01328.google.firestore.v1" +
       "beta1.StructuredQuery.FieldReference\"E\n\t" +
       "Direction\022\031\n\025DIRECTION_UNSPECIFIED\020\000\022\r\n\t" +
@@ -132,7 +132,7 @@ public static void registerAllExtensions(
       "restore.v1beta1B\nQueryProtoP\001ZAgoogle.go" +
       "lang.org/genproto/googleapis/firestore/v" +
       "1beta1;firestore\242\002\004GCFS\252\002\036Google.Cloud.F" +
-      "irestore.V1Beta1\312\002\036Google\\Cloud\\Firestor" +
+      "irestore.V1Beta1\312\002\036Google\\Cloud\\Firestor",
       "e\\V1beta1b\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RollbackRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RollbackRequest.java
index cfa53cb24150..3876f05aae5e 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RollbackRequest.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RollbackRequest.java
@@ -34,9 +34,6 @@ private RollbackRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private RollbackRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -59,13 +63,6 @@ private RollbackRequest(
             transaction_ = input.readBytes();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private RollbackRequest(
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_RollbackRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_RollbackRequest_fieldAccessorTable
@@ -149,7 +145,6 @@ public com.google.protobuf.ByteString getTransaction() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -159,7 +154,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getDatabaseBytes().isEmpty()) {
@@ -171,7 +165,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -294,7 +287,6 @@ public static com.google.firestore.v1beta1.RollbackRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -302,7 +294,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.RollbackRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -330,7 +321,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_RollbackRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_RollbackRequest_fieldAccessorTable
@@ -353,7 +343,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       database_ = "";
@@ -363,18 +352,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_RollbackRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.RollbackRequest getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.RollbackRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.RollbackRequest build() {
       com.google.firestore.v1beta1.RollbackRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -383,7 +369,6 @@ public com.google.firestore.v1beta1.RollbackRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.RollbackRequest buildPartial() {
       com.google.firestore.v1beta1.RollbackRequest result = new com.google.firestore.v1beta1.RollbackRequest(this);
       result.database_ = database_;
@@ -392,39 +377,32 @@ public com.google.firestore.v1beta1.RollbackRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.RollbackRequest) {
         return mergeFrom((com.google.firestore.v1beta1.RollbackRequest)other);
@@ -448,12 +426,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.RollbackRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -606,13 +582,11 @@ public Builder clearTransaction() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -634,12 +608,11 @@ public static com.google.firestore.v1beta1.RollbackRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RollbackRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RollbackRequest(input, extensionRegistry);
+        return new RollbackRequest(input, extensionRegistry);
     }
   };
 
@@ -652,7 +625,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.RollbackRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RunQueryRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RunQueryRequest.java
index cd851616523b..8f39c0205ae0 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RunQueryRequest.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RunQueryRequest.java
@@ -33,9 +33,6 @@ private RunQueryRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private RunQueryRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -100,13 +104,6 @@ private RunQueryRequest(
             consistencySelectorCase_ = 7;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -124,7 +121,6 @@ private RunQueryRequest(
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_RunQueryRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_RunQueryRequest_fieldAccessorTable
@@ -402,7 +398,6 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -412,7 +407,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -434,7 +428,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -620,7 +613,6 @@ public static com.google.firestore.v1beta1.RunQueryRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -628,7 +620,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.RunQueryRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -656,7 +647,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_RunQueryRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_RunQueryRequest_fieldAccessorTable
@@ -679,7 +669,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -691,18 +680,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_RunQueryRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.RunQueryRequest getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.RunQueryRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.RunQueryRequest build() {
       com.google.firestore.v1beta1.RunQueryRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -711,7 +697,6 @@ public com.google.firestore.v1beta1.RunQueryRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.RunQueryRequest buildPartial() {
       com.google.firestore.v1beta1.RunQueryRequest result = new com.google.firestore.v1beta1.RunQueryRequest(this);
       result.parent_ = parent_;
@@ -745,39 +730,32 @@ public com.google.firestore.v1beta1.RunQueryRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.RunQueryRequest) {
         return mergeFrom((com.google.firestore.v1beta1.RunQueryRequest)other);
@@ -824,12 +802,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.RunQueryRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1588,13 +1564,11 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
       onChanged();;
       return readTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1616,12 +1590,11 @@ public static com.google.firestore.v1beta1.RunQueryRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RunQueryRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RunQueryRequest(input, extensionRegistry);
+        return new RunQueryRequest(input, extensionRegistry);
     }
   };
 
@@ -1634,7 +1607,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.RunQueryRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RunQueryResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RunQueryResponse.java
index f03e2b5c4e8b..e77a719cbca9 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RunQueryResponse.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RunQueryResponse.java
@@ -34,9 +34,6 @@ private RunQueryResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private RunQueryResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.firestore.v1beta1.Document.Builder subBuilder = null;
             if (document_ != null) {
@@ -84,13 +88,6 @@ private RunQueryResponse(
             skippedResults_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -108,7 +105,6 @@ private RunQueryResponse(
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_RunQueryResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_RunQueryResponse_fieldAccessorTable
@@ -231,7 +227,6 @@ public int getSkippedResults() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -241,7 +236,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (document_ != null) {
@@ -259,7 +253,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -409,7 +402,6 @@ public static com.google.firestore.v1beta1.RunQueryResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -417,7 +409,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.RunQueryResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -445,7 +436,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_RunQueryResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_RunQueryResponse_fieldAccessorTable
@@ -468,7 +458,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       transaction_ = com.google.protobuf.ByteString.EMPTY;
@@ -490,18 +479,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_RunQueryResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.RunQueryResponse getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.RunQueryResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.RunQueryResponse build() {
       com.google.firestore.v1beta1.RunQueryResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -510,7 +496,6 @@ public com.google.firestore.v1beta1.RunQueryResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.RunQueryResponse buildPartial() {
       com.google.firestore.v1beta1.RunQueryResponse result = new com.google.firestore.v1beta1.RunQueryResponse(this);
       result.transaction_ = transaction_;
@@ -529,39 +514,32 @@ public com.google.firestore.v1beta1.RunQueryResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.RunQueryResponse) {
         return mergeFrom((com.google.firestore.v1beta1.RunQueryResponse)other);
@@ -590,12 +568,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.RunQueryResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1064,13 +1040,11 @@ public Builder clearSkippedResults() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1092,12 +1066,11 @@ public static com.google.firestore.v1beta1.RunQueryResponse getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RunQueryResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RunQueryResponse(input, extensionRegistry);
+        return new RunQueryResponse(input, extensionRegistry);
     }
   };
 
@@ -1110,7 +1083,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.RunQueryResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/StructuredQuery.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/StructuredQuery.java
index 10e4b990672b..4d9e9148957b 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/StructuredQuery.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/StructuredQuery.java
@@ -35,9 +35,6 @@ private StructuredQuery(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private StructuredQuery(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.firestore.v1beta1.StructuredQuery.Projection.Builder subBuilder = null;
             if (select_ != null) {
@@ -137,13 +141,6 @@ private StructuredQuery(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -167,7 +164,6 @@ private StructuredQuery(
     return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_fieldAccessorTable
@@ -376,9 +372,6 @@ private CollectionSelector(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -390,6 +383,13 @@ private CollectionSelector(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 18: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -401,13 +401,6 @@ private CollectionSelector(
               allDescendants_ = input.readBool();
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -425,7 +418,6 @@ private CollectionSelector(
       return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_CollectionSelector_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_CollectionSelector_fieldAccessorTable
@@ -493,7 +485,6 @@ public boolean getAllDescendants() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -503,7 +494,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getCollectionIdBytes().isEmpty()) {
@@ -515,7 +505,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -639,7 +628,6 @@ public static com.google.firestore.v1beta1.StructuredQuery.CollectionSelector pa
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -647,7 +635,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.firestore.v1beta1.StructuredQuery.CollectionSelector prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -675,7 +662,6 @@ public static final class Builder extends
         return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_CollectionSelector_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_CollectionSelector_fieldAccessorTable
@@ -698,7 +684,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         collectionId_ = "";
@@ -708,18 +693,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_CollectionSelector_descriptor;
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.StructuredQuery.CollectionSelector getDefaultInstanceForType() {
         return com.google.firestore.v1beta1.StructuredQuery.CollectionSelector.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.StructuredQuery.CollectionSelector build() {
         com.google.firestore.v1beta1.StructuredQuery.CollectionSelector result = buildPartial();
         if (!result.isInitialized()) {
@@ -728,7 +710,6 @@ public com.google.firestore.v1beta1.StructuredQuery.CollectionSelector build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.StructuredQuery.CollectionSelector buildPartial() {
         com.google.firestore.v1beta1.StructuredQuery.CollectionSelector result = new com.google.firestore.v1beta1.StructuredQuery.CollectionSelector(this);
         result.collectionId_ = collectionId_;
@@ -737,39 +718,32 @@ public com.google.firestore.v1beta1.StructuredQuery.CollectionSelector buildPart
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.firestore.v1beta1.StructuredQuery.CollectionSelector) {
           return mergeFrom((com.google.firestore.v1beta1.StructuredQuery.CollectionSelector)other);
@@ -793,12 +767,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.StructuredQuery.Collection
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -954,13 +926,11 @@ public Builder clearAllDescendants() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -982,12 +952,11 @@ public static com.google.firestore.v1beta1.StructuredQuery.CollectionSelector ge
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public CollectionSelector parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new CollectionSelector(input, extensionRegistry);
+          return new CollectionSelector(input, extensionRegistry);
       }
     };
 
@@ -1000,7 +969,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.StructuredQuery.CollectionSelector getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1117,9 +1085,6 @@ private Filter(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1131,6 +1096,13 @@ private Filter(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               com.google.firestore.v1beta1.StructuredQuery.CompositeFilter.Builder subBuilder = null;
               if (filterTypeCase_ == 1) {
@@ -1173,13 +1145,6 @@ private Filter(
               filterTypeCase_ = 3;
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1197,7 +1162,6 @@ private Filter(
       return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_Filter_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_Filter_fieldAccessorTable
@@ -1360,7 +1324,6 @@ public com.google.firestore.v1beta1.StructuredQuery.UnaryFilterOrBuilder getUnar
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1370,7 +1333,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (filterTypeCase_ == 1) {
@@ -1385,7 +1347,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -1540,7 +1501,6 @@ public static com.google.firestore.v1beta1.StructuredQuery.Filter parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -1548,7 +1508,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.firestore.v1beta1.StructuredQuery.Filter prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -1576,7 +1535,6 @@ public static final class Builder extends
         return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_Filter_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_Filter_fieldAccessorTable
@@ -1599,7 +1557,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         filterTypeCase_ = 0;
@@ -1607,18 +1564,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_Filter_descriptor;
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.StructuredQuery.Filter getDefaultInstanceForType() {
         return com.google.firestore.v1beta1.StructuredQuery.Filter.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.StructuredQuery.Filter build() {
         com.google.firestore.v1beta1.StructuredQuery.Filter result = buildPartial();
         if (!result.isInitialized()) {
@@ -1627,7 +1581,6 @@ public com.google.firestore.v1beta1.StructuredQuery.Filter build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.StructuredQuery.Filter buildPartial() {
         com.google.firestore.v1beta1.StructuredQuery.Filter result = new com.google.firestore.v1beta1.StructuredQuery.Filter(this);
         if (filterTypeCase_ == 1) {
@@ -1656,39 +1609,32 @@ public com.google.firestore.v1beta1.StructuredQuery.Filter buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.firestore.v1beta1.StructuredQuery.Filter) {
           return mergeFrom((com.google.firestore.v1beta1.StructuredQuery.Filter)other);
@@ -1722,12 +1668,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.StructuredQuery.Filter oth
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2276,13 +2220,11 @@ public com.google.firestore.v1beta1.StructuredQuery.UnaryFilterOrBuilder getUnar
         onChanged();;
         return unaryFilterBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -2304,12 +2246,11 @@ public static com.google.firestore.v1beta1.StructuredQuery.Filter getDefaultInst
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Filter parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Filter(input, extensionRegistry);
+          return new Filter(input, extensionRegistry);
       }
     };
 
@@ -2322,7 +2263,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.StructuredQuery.Filter getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -2430,9 +2370,6 @@ private CompositeFilter(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2444,6 +2381,13 @@ private CompositeFilter(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 8: {
               int rawValue = input.readEnum();
 
@@ -2459,13 +2403,6 @@ private CompositeFilter(
                   input.readMessage(com.google.firestore.v1beta1.StructuredQuery.Filter.parser(), extensionRegistry));
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -2486,7 +2423,6 @@ private CompositeFilter(
       return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_CompositeFilter_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_CompositeFilter_fieldAccessorTable
@@ -2633,7 +2569,6 @@ public int getOpValue() {
      * .google.firestore.v1beta1.StructuredQuery.CompositeFilter.Operator op = 1;
      */
     public com.google.firestore.v1beta1.StructuredQuery.CompositeFilter.Operator getOp() {
-      @SuppressWarnings("deprecation")
       com.google.firestore.v1beta1.StructuredQuery.CompositeFilter.Operator result = com.google.firestore.v1beta1.StructuredQuery.CompositeFilter.Operator.valueOf(op_);
       return result == null ? com.google.firestore.v1beta1.StructuredQuery.CompositeFilter.Operator.UNRECOGNIZED : result;
     }
@@ -2699,7 +2634,6 @@ public com.google.firestore.v1beta1.StructuredQuery.FilterOrBuilder getFiltersOr
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -2709,7 +2643,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (op_ != com.google.firestore.v1beta1.StructuredQuery.CompositeFilter.Operator.OPERATOR_UNSPECIFIED.getNumber()) {
@@ -2721,7 +2654,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -2846,7 +2778,6 @@ public static com.google.firestore.v1beta1.StructuredQuery.CompositeFilter parse
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -2854,7 +2785,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.firestore.v1beta1.StructuredQuery.CompositeFilter prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -2882,7 +2812,6 @@ public static final class Builder extends
         return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_CompositeFilter_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_CompositeFilter_fieldAccessorTable
@@ -2906,7 +2835,6 @@ private void maybeForceBuilderInitialization() {
           getFiltersFieldBuilder();
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         op_ = 0;
@@ -2920,18 +2848,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_CompositeFilter_descriptor;
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.StructuredQuery.CompositeFilter getDefaultInstanceForType() {
         return com.google.firestore.v1beta1.StructuredQuery.CompositeFilter.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.StructuredQuery.CompositeFilter build() {
         com.google.firestore.v1beta1.StructuredQuery.CompositeFilter result = buildPartial();
         if (!result.isInitialized()) {
@@ -2940,7 +2865,6 @@ public com.google.firestore.v1beta1.StructuredQuery.CompositeFilter build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.StructuredQuery.CompositeFilter buildPartial() {
         com.google.firestore.v1beta1.StructuredQuery.CompositeFilter result = new com.google.firestore.v1beta1.StructuredQuery.CompositeFilter(this);
         int from_bitField0_ = bitField0_;
@@ -2960,39 +2884,32 @@ public com.google.firestore.v1beta1.StructuredQuery.CompositeFilter buildPartial
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.firestore.v1beta1.StructuredQuery.CompositeFilter) {
           return mergeFrom((com.google.firestore.v1beta1.StructuredQuery.CompositeFilter)other);
@@ -3038,12 +2955,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.StructuredQuery.CompositeF
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3094,7 +3009,6 @@ public Builder setOpValue(int value) {
        * .google.firestore.v1beta1.StructuredQuery.CompositeFilter.Operator op = 1;
        */
       public com.google.firestore.v1beta1.StructuredQuery.CompositeFilter.Operator getOp() {
-        @SuppressWarnings("deprecation")
         com.google.firestore.v1beta1.StructuredQuery.CompositeFilter.Operator result = com.google.firestore.v1beta1.StructuredQuery.CompositeFilter.Operator.valueOf(op_);
         return result == null ? com.google.firestore.v1beta1.StructuredQuery.CompositeFilter.Operator.UNRECOGNIZED : result;
       }
@@ -3457,13 +3371,11 @@ public com.google.firestore.v1beta1.StructuredQuery.Filter.Builder addFiltersBui
         }
         return filtersBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -3485,12 +3397,11 @@ public static com.google.firestore.v1beta1.StructuredQuery.CompositeFilter getDe
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public CompositeFilter parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new CompositeFilter(input, extensionRegistry);
+          return new CompositeFilter(input, extensionRegistry);
       }
     };
 
@@ -3503,7 +3414,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.StructuredQuery.CompositeFilter getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -3611,9 +3521,6 @@ private FieldFilter(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3625,6 +3532,13 @@ private FieldFilter(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               com.google.firestore.v1beta1.StructuredQuery.FieldReference.Builder subBuilder = null;
               if (field_ != null) {
@@ -3657,13 +3571,6 @@ private FieldFilter(
 
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -3681,7 +3588,6 @@ private FieldFilter(
       return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_FieldFilter_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_FieldFilter_fieldAccessorTable
@@ -3947,7 +3853,6 @@ public int getOpValue() {
      * .google.firestore.v1beta1.StructuredQuery.FieldFilter.Operator op = 2;
      */
     public com.google.firestore.v1beta1.StructuredQuery.FieldFilter.Operator getOp() {
-      @SuppressWarnings("deprecation")
       com.google.firestore.v1beta1.StructuredQuery.FieldFilter.Operator result = com.google.firestore.v1beta1.StructuredQuery.FieldFilter.Operator.valueOf(op_);
       return result == null ? com.google.firestore.v1beta1.StructuredQuery.FieldFilter.Operator.UNRECOGNIZED : result;
     }
@@ -3986,7 +3891,6 @@ public com.google.firestore.v1beta1.ValueOrBuilder getValueOrBuilder() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -3996,7 +3900,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (field_ != null) {
@@ -4011,7 +3914,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -4152,7 +4054,6 @@ public static com.google.firestore.v1beta1.StructuredQuery.FieldFilter parseFrom
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -4160,7 +4061,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.firestore.v1beta1.StructuredQuery.FieldFilter prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -4188,7 +4088,6 @@ public static final class Builder extends
         return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_FieldFilter_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_FieldFilter_fieldAccessorTable
@@ -4211,7 +4110,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         if (fieldBuilder_ == null) {
@@ -4231,18 +4129,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_FieldFilter_descriptor;
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.StructuredQuery.FieldFilter getDefaultInstanceForType() {
         return com.google.firestore.v1beta1.StructuredQuery.FieldFilter.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.StructuredQuery.FieldFilter build() {
         com.google.firestore.v1beta1.StructuredQuery.FieldFilter result = buildPartial();
         if (!result.isInitialized()) {
@@ -4251,7 +4146,6 @@ public com.google.firestore.v1beta1.StructuredQuery.FieldFilter build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.StructuredQuery.FieldFilter buildPartial() {
         com.google.firestore.v1beta1.StructuredQuery.FieldFilter result = new com.google.firestore.v1beta1.StructuredQuery.FieldFilter(this);
         if (fieldBuilder_ == null) {
@@ -4269,39 +4163,32 @@ public com.google.firestore.v1beta1.StructuredQuery.FieldFilter buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.firestore.v1beta1.StructuredQuery.FieldFilter) {
           return mergeFrom((com.google.firestore.v1beta1.StructuredQuery.FieldFilter)other);
@@ -4327,12 +4214,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.StructuredQuery.FieldFilte
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4535,7 +4420,6 @@ public Builder setOpValue(int value) {
        * .google.firestore.v1beta1.StructuredQuery.FieldFilter.Operator op = 2;
        */
       public com.google.firestore.v1beta1.StructuredQuery.FieldFilter.Operator getOp() {
-        @SuppressWarnings("deprecation")
         com.google.firestore.v1beta1.StructuredQuery.FieldFilter.Operator result = com.google.firestore.v1beta1.StructuredQuery.FieldFilter.Operator.valueOf(op_);
         return result == null ? com.google.firestore.v1beta1.StructuredQuery.FieldFilter.Operator.UNRECOGNIZED : result;
       }
@@ -4721,13 +4605,11 @@ public com.google.firestore.v1beta1.ValueOrBuilder getValueOrBuilder() {
         }
         return valueBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -4749,12 +4631,11 @@ public static com.google.firestore.v1beta1.StructuredQuery.FieldFilter getDefaul
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public FieldFilter parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new FieldFilter(input, extensionRegistry);
+          return new FieldFilter(input, extensionRegistry);
       }
     };
 
@@ -4767,7 +4648,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.StructuredQuery.FieldFilter getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -4852,9 +4732,6 @@ private UnaryFilter(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -4866,6 +4743,13 @@ private UnaryFilter(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 8: {
               int rawValue = input.readEnum();
 
@@ -4886,13 +4770,6 @@ private UnaryFilter(
               operandTypeCase_ = 2;
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -4910,7 +4787,6 @@ private UnaryFilter(
       return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_UnaryFilter_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_UnaryFilter_fieldAccessorTable
@@ -5109,7 +4985,6 @@ public int getOpValue() {
      * .google.firestore.v1beta1.StructuredQuery.UnaryFilter.Operator op = 1;
      */
     public com.google.firestore.v1beta1.StructuredQuery.UnaryFilter.Operator getOp() {
-      @SuppressWarnings("deprecation")
       com.google.firestore.v1beta1.StructuredQuery.UnaryFilter.Operator result = com.google.firestore.v1beta1.StructuredQuery.UnaryFilter.Operator.valueOf(op_);
       return result == null ? com.google.firestore.v1beta1.StructuredQuery.UnaryFilter.Operator.UNRECOGNIZED : result;
     }
@@ -5153,7 +5028,6 @@ public com.google.firestore.v1beta1.StructuredQuery.FieldReferenceOrBuilder getF
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -5163,7 +5037,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (op_ != com.google.firestore.v1beta1.StructuredQuery.UnaryFilter.Operator.OPERATOR_UNSPECIFIED.getNumber()) {
@@ -5175,7 +5048,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -5313,7 +5185,6 @@ public static com.google.firestore.v1beta1.StructuredQuery.UnaryFilter parseFrom
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -5321,7 +5192,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.firestore.v1beta1.StructuredQuery.UnaryFilter prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -5349,7 +5219,6 @@ public static final class Builder extends
         return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_UnaryFilter_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_UnaryFilter_fieldAccessorTable
@@ -5372,7 +5241,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         op_ = 0;
@@ -5382,18 +5250,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_UnaryFilter_descriptor;
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.StructuredQuery.UnaryFilter getDefaultInstanceForType() {
         return com.google.firestore.v1beta1.StructuredQuery.UnaryFilter.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.StructuredQuery.UnaryFilter build() {
         com.google.firestore.v1beta1.StructuredQuery.UnaryFilter result = buildPartial();
         if (!result.isInitialized()) {
@@ -5402,7 +5267,6 @@ public com.google.firestore.v1beta1.StructuredQuery.UnaryFilter build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.StructuredQuery.UnaryFilter buildPartial() {
         com.google.firestore.v1beta1.StructuredQuery.UnaryFilter result = new com.google.firestore.v1beta1.StructuredQuery.UnaryFilter(this);
         result.op_ = op_;
@@ -5418,39 +5282,32 @@ public com.google.firestore.v1beta1.StructuredQuery.UnaryFilter buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.firestore.v1beta1.StructuredQuery.UnaryFilter) {
           return mergeFrom((com.google.firestore.v1beta1.StructuredQuery.UnaryFilter)other);
@@ -5479,12 +5336,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.StructuredQuery.UnaryFilte
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -5549,7 +5404,6 @@ public Builder setOpValue(int value) {
        * .google.firestore.v1beta1.StructuredQuery.UnaryFilter.Operator op = 1;
        */
       public com.google.firestore.v1beta1.StructuredQuery.UnaryFilter.Operator getOp() {
-        @SuppressWarnings("deprecation")
         com.google.firestore.v1beta1.StructuredQuery.UnaryFilter.Operator result = com.google.firestore.v1beta1.StructuredQuery.UnaryFilter.Operator.valueOf(op_);
         return result == null ? com.google.firestore.v1beta1.StructuredQuery.UnaryFilter.Operator.UNRECOGNIZED : result;
       }
@@ -5754,13 +5608,11 @@ public com.google.firestore.v1beta1.StructuredQuery.FieldReferenceOrBuilder getF
         onChanged();;
         return fieldBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -5782,12 +5634,11 @@ public static com.google.firestore.v1beta1.StructuredQuery.UnaryFilter getDefaul
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public UnaryFilter parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new UnaryFilter(input, extensionRegistry);
+          return new UnaryFilter(input, extensionRegistry);
       }
     };
 
@@ -5800,7 +5651,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.StructuredQuery.UnaryFilter getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -5883,9 +5733,6 @@ private Order(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -5897,6 +5744,13 @@ private Order(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               com.google.firestore.v1beta1.StructuredQuery.FieldReference.Builder subBuilder = null;
               if (field_ != null) {
@@ -5916,13 +5770,6 @@ private Order(
               direction_ = rawValue;
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -5940,7 +5787,6 @@ private Order(
       return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_Order_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_Order_fieldAccessorTable
@@ -6001,13 +5847,11 @@ public int getDirectionValue() {
      * .google.firestore.v1beta1.StructuredQuery.Direction direction = 2;
      */
     public com.google.firestore.v1beta1.StructuredQuery.Direction getDirection() {
-      @SuppressWarnings("deprecation")
       com.google.firestore.v1beta1.StructuredQuery.Direction result = com.google.firestore.v1beta1.StructuredQuery.Direction.valueOf(direction_);
       return result == null ? com.google.firestore.v1beta1.StructuredQuery.Direction.UNRECOGNIZED : result;
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -6017,7 +5861,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (field_ != null) {
@@ -6029,7 +5872,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -6157,7 +5999,6 @@ public static com.google.firestore.v1beta1.StructuredQuery.Order parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -6165,7 +6006,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.firestore.v1beta1.StructuredQuery.Order prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -6193,7 +6033,6 @@ public static final class Builder extends
         return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_Order_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_Order_fieldAccessorTable
@@ -6216,7 +6055,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         if (fieldBuilder_ == null) {
@@ -6230,18 +6068,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_Order_descriptor;
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.StructuredQuery.Order getDefaultInstanceForType() {
         return com.google.firestore.v1beta1.StructuredQuery.Order.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.StructuredQuery.Order build() {
         com.google.firestore.v1beta1.StructuredQuery.Order result = buildPartial();
         if (!result.isInitialized()) {
@@ -6250,7 +6085,6 @@ public com.google.firestore.v1beta1.StructuredQuery.Order build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.StructuredQuery.Order buildPartial() {
         com.google.firestore.v1beta1.StructuredQuery.Order result = new com.google.firestore.v1beta1.StructuredQuery.Order(this);
         if (fieldBuilder_ == null) {
@@ -6263,39 +6097,32 @@ public com.google.firestore.v1beta1.StructuredQuery.Order buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.firestore.v1beta1.StructuredQuery.Order) {
           return mergeFrom((com.google.firestore.v1beta1.StructuredQuery.Order)other);
@@ -6318,12 +6145,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.StructuredQuery.Order othe
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -6526,7 +6351,6 @@ public Builder setDirectionValue(int value) {
        * .google.firestore.v1beta1.StructuredQuery.Direction direction = 2;
        */
       public com.google.firestore.v1beta1.StructuredQuery.Direction getDirection() {
-        @SuppressWarnings("deprecation")
         com.google.firestore.v1beta1.StructuredQuery.Direction result = com.google.firestore.v1beta1.StructuredQuery.Direction.valueOf(direction_);
         return result == null ? com.google.firestore.v1beta1.StructuredQuery.Direction.UNRECOGNIZED : result;
       }
@@ -6559,13 +6383,11 @@ public Builder clearDirection() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -6587,12 +6409,11 @@ public static com.google.firestore.v1beta1.StructuredQuery.Order getDefaultInsta
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Order parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Order(input, extensionRegistry);
+          return new Order(input, extensionRegistry);
       }
     };
 
@@ -6605,7 +6426,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.StructuredQuery.Order getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -6656,9 +6476,6 @@ private FieldReference(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -6670,12 +6487,6 @@ private FieldReference(
             case 0:
               done = true;
               break;
-            case 18: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              fieldPath_ = s;
-              break;
-            }
             default: {
               if (!parseUnknownFieldProto3(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -6683,6 +6494,12 @@ private FieldReference(
               }
               break;
             }
+            case 18: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              fieldPath_ = s;
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -6700,7 +6517,6 @@ private FieldReference(
       return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_FieldReference_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_FieldReference_fieldAccessorTable
@@ -6743,7 +6559,6 @@ public java.lang.String getFieldPath() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -6753,7 +6568,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getFieldPathBytes().isEmpty()) {
@@ -6762,7 +6576,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -6877,7 +6690,6 @@ public static com.google.firestore.v1beta1.StructuredQuery.FieldReference parseF
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -6885,7 +6697,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.firestore.v1beta1.StructuredQuery.FieldReference prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -6913,7 +6724,6 @@ public static final class Builder extends
         return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_FieldReference_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_FieldReference_fieldAccessorTable
@@ -6936,7 +6746,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         fieldPath_ = "";
@@ -6944,18 +6753,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_FieldReference_descriptor;
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.StructuredQuery.FieldReference getDefaultInstanceForType() {
         return com.google.firestore.v1beta1.StructuredQuery.FieldReference.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.StructuredQuery.FieldReference build() {
         com.google.firestore.v1beta1.StructuredQuery.FieldReference result = buildPartial();
         if (!result.isInitialized()) {
@@ -6964,7 +6770,6 @@ public com.google.firestore.v1beta1.StructuredQuery.FieldReference build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.StructuredQuery.FieldReference buildPartial() {
         com.google.firestore.v1beta1.StructuredQuery.FieldReference result = new com.google.firestore.v1beta1.StructuredQuery.FieldReference(this);
         result.fieldPath_ = fieldPath_;
@@ -6972,39 +6777,32 @@ public com.google.firestore.v1beta1.StructuredQuery.FieldReference buildPartial(
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.firestore.v1beta1.StructuredQuery.FieldReference) {
           return mergeFrom((com.google.firestore.v1beta1.StructuredQuery.FieldReference)other);
@@ -7025,12 +6823,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.StructuredQuery.FieldRefer
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -7117,13 +6913,11 @@ public Builder setFieldPathBytes(
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -7145,12 +6939,11 @@ public static com.google.firestore.v1beta1.StructuredQuery.FieldReference getDef
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public FieldReference parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new FieldReference(input, extensionRegistry);
+          return new FieldReference(input, extensionRegistry);
       }
     };
 
@@ -7163,7 +6956,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.StructuredQuery.FieldReference getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -7258,9 +7050,6 @@ private Projection(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -7272,6 +7061,13 @@ private Projection(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 18: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
                 fields_ = new java.util.ArrayList();
@@ -7281,13 +7077,6 @@ private Projection(
                   input.readMessage(com.google.firestore.v1beta1.StructuredQuery.FieldReference.parser(), extensionRegistry));
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -7308,7 +7097,6 @@ private Projection(
       return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_Projection_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_Projection_fieldAccessorTable
@@ -7382,7 +7170,6 @@ public com.google.firestore.v1beta1.StructuredQuery.FieldReferenceOrBuilder getF
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -7392,7 +7179,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < fields_.size(); i++) {
@@ -7401,7 +7187,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -7519,7 +7304,6 @@ public static com.google.firestore.v1beta1.StructuredQuery.Projection parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -7527,7 +7311,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.firestore.v1beta1.StructuredQuery.Projection prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -7555,7 +7338,6 @@ public static final class Builder extends
         return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_Projection_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_Projection_fieldAccessorTable
@@ -7579,7 +7361,6 @@ private void maybeForceBuilderInitialization() {
           getFieldsFieldBuilder();
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         if (fieldsBuilder_ == null) {
@@ -7591,18 +7372,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_Projection_descriptor;
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.StructuredQuery.Projection getDefaultInstanceForType() {
         return com.google.firestore.v1beta1.StructuredQuery.Projection.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.StructuredQuery.Projection build() {
         com.google.firestore.v1beta1.StructuredQuery.Projection result = buildPartial();
         if (!result.isInitialized()) {
@@ -7611,7 +7389,6 @@ public com.google.firestore.v1beta1.StructuredQuery.Projection build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.StructuredQuery.Projection buildPartial() {
         com.google.firestore.v1beta1.StructuredQuery.Projection result = new com.google.firestore.v1beta1.StructuredQuery.Projection(this);
         int from_bitField0_ = bitField0_;
@@ -7628,39 +7405,32 @@ public com.google.firestore.v1beta1.StructuredQuery.Projection buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.firestore.v1beta1.StructuredQuery.Projection) {
           return mergeFrom((com.google.firestore.v1beta1.StructuredQuery.Projection)other);
@@ -7703,12 +7473,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.StructuredQuery.Projection
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -8075,13 +7843,11 @@ public com.google.firestore.v1beta1.StructuredQuery.FieldReference.Builder addFi
         }
         return fieldsBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -8103,12 +7869,11 @@ public static com.google.firestore.v1beta1.StructuredQuery.Projection getDefault
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Projection parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Projection(input, extensionRegistry);
+          return new Projection(input, extensionRegistry);
       }
     };
 
@@ -8121,7 +7886,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.StructuredQuery.Projection getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -8491,7 +8255,6 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -8501,7 +8264,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (select_ != null) {
@@ -8531,7 +8293,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -8732,7 +8493,6 @@ public static com.google.firestore.v1beta1.StructuredQuery parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -8740,7 +8500,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.StructuredQuery prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -8768,7 +8527,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_fieldAccessorTable
@@ -8793,7 +8551,6 @@ private void maybeForceBuilderInitialization() {
         getOrderByFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (selectBuilder_ == null) {
@@ -8843,18 +8600,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.QueryProto.internal_static_google_firestore_v1beta1_StructuredQuery_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.StructuredQuery getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.StructuredQuery.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.StructuredQuery build() {
       com.google.firestore.v1beta1.StructuredQuery result = buildPartial();
       if (!result.isInitialized()) {
@@ -8863,7 +8617,6 @@ public com.google.firestore.v1beta1.StructuredQuery build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.StructuredQuery buildPartial() {
       com.google.firestore.v1beta1.StructuredQuery result = new com.google.firestore.v1beta1.StructuredQuery(this);
       int from_bitField0_ = bitField0_;
@@ -8917,39 +8670,32 @@ public com.google.firestore.v1beta1.StructuredQuery buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.StructuredQuery) {
         return mergeFrom((com.google.firestore.v1beta1.StructuredQuery)other);
@@ -9036,12 +8782,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.StructuredQuery other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -10745,13 +10489,11 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() {
       }
       return limitBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -10773,12 +10515,11 @@ public static com.google.firestore.v1beta1.StructuredQuery getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public StructuredQuery parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StructuredQuery(input, extensionRegistry);
+        return new StructuredQuery(input, extensionRegistry);
     }
   };
 
@@ -10791,7 +10532,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.StructuredQuery getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Target.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Target.java
index 97f6a755c6aa..616ad6bfd49d 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Target.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Target.java
@@ -34,9 +34,6 @@ private Target(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private Target(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             com.google.firestore.v1beta1.Target.QueryTarget.Builder subBuilder = null;
             if (targetTypeCase_ == 2) {
@@ -105,13 +109,6 @@ private Target(
             resumeTypeCase_ = 11;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -129,7 +126,6 @@ private Target(
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_Target_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_Target_fieldAccessorTable
@@ -218,9 +214,6 @@ private DocumentsTarget(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -232,6 +225,13 @@ private DocumentsTarget(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 18: {
               java.lang.String s = input.readStringRequireUtf8();
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -241,13 +241,6 @@ private DocumentsTarget(
               documents_.add(s);
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -268,7 +261,6 @@ private DocumentsTarget(
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_Target_DocumentsTarget_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_Target_DocumentsTarget_fieldAccessorTable
@@ -334,7 +326,6 @@ public java.lang.String getDocuments(int index) {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -344,7 +335,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < documents_.size(); i++) {
@@ -353,7 +343,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -475,7 +464,6 @@ public static com.google.firestore.v1beta1.Target.DocumentsTarget parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -483,7 +471,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.firestore.v1beta1.Target.DocumentsTarget prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -511,7 +498,6 @@ public static final class Builder extends
         return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_Target_DocumentsTarget_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_Target_DocumentsTarget_fieldAccessorTable
@@ -534,7 +520,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         documents_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -542,18 +527,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_Target_DocumentsTarget_descriptor;
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.Target.DocumentsTarget getDefaultInstanceForType() {
         return com.google.firestore.v1beta1.Target.DocumentsTarget.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.Target.DocumentsTarget build() {
         com.google.firestore.v1beta1.Target.DocumentsTarget result = buildPartial();
         if (!result.isInitialized()) {
@@ -562,7 +544,6 @@ public com.google.firestore.v1beta1.Target.DocumentsTarget build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.Target.DocumentsTarget buildPartial() {
         com.google.firestore.v1beta1.Target.DocumentsTarget result = new com.google.firestore.v1beta1.Target.DocumentsTarget(this);
         int from_bitField0_ = bitField0_;
@@ -575,39 +556,32 @@ public com.google.firestore.v1beta1.Target.DocumentsTarget buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.firestore.v1beta1.Target.DocumentsTarget) {
           return mergeFrom((com.google.firestore.v1beta1.Target.DocumentsTarget)other);
@@ -634,12 +608,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.Target.DocumentsTarget oth
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -815,13 +787,11 @@ public Builder addDocumentsBytes(
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -843,12 +813,11 @@ public static com.google.firestore.v1beta1.Target.DocumentsTarget getDefaultInst
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public DocumentsTarget parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new DocumentsTarget(input, extensionRegistry);
+          return new DocumentsTarget(input, extensionRegistry);
       }
     };
 
@@ -861,7 +830,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.Target.DocumentsTarget getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -957,9 +925,6 @@ private QueryTarget(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -971,6 +936,13 @@ private QueryTarget(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -991,13 +963,6 @@ private QueryTarget(
               queryTypeCase_ = 2;
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1015,7 +980,6 @@ private QueryTarget(
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_Target_QueryTarget_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_Target_QueryTarget_fieldAccessorTable
@@ -1150,7 +1114,6 @@ public com.google.firestore.v1beta1.StructuredQueryOrBuilder getStructuredQueryO
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1160,7 +1123,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getParentBytes().isEmpty()) {
@@ -1172,7 +1134,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -1310,7 +1271,6 @@ public static com.google.firestore.v1beta1.Target.QueryTarget parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -1318,7 +1278,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.firestore.v1beta1.Target.QueryTarget prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -1346,7 +1305,6 @@ public static final class Builder extends
         return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_Target_QueryTarget_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_Target_QueryTarget_fieldAccessorTable
@@ -1369,7 +1327,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         parent_ = "";
@@ -1379,18 +1336,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_Target_QueryTarget_descriptor;
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.Target.QueryTarget getDefaultInstanceForType() {
         return com.google.firestore.v1beta1.Target.QueryTarget.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.Target.QueryTarget build() {
         com.google.firestore.v1beta1.Target.QueryTarget result = buildPartial();
         if (!result.isInitialized()) {
@@ -1399,7 +1353,6 @@ public com.google.firestore.v1beta1.Target.QueryTarget build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.Target.QueryTarget buildPartial() {
         com.google.firestore.v1beta1.Target.QueryTarget result = new com.google.firestore.v1beta1.Target.QueryTarget(this);
         result.parent_ = parent_;
@@ -1415,39 +1368,32 @@ public com.google.firestore.v1beta1.Target.QueryTarget buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.firestore.v1beta1.Target.QueryTarget) {
           return mergeFrom((com.google.firestore.v1beta1.Target.QueryTarget)other);
@@ -1477,12 +1423,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.Target.QueryTarget other)
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1801,13 +1745,11 @@ public com.google.firestore.v1beta1.StructuredQueryOrBuilder getStructuredQueryO
         onChanged();;
         return structuredQueryBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1829,12 +1771,11 @@ public static com.google.firestore.v1beta1.Target.QueryTarget getDefaultInstance
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public QueryTarget parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new QueryTarget(input, extensionRegistry);
+          return new QueryTarget(input, extensionRegistry);
       }
     };
 
@@ -1847,7 +1788,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.Target.QueryTarget getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -2095,7 +2035,6 @@ public boolean getOnce() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -2105,7 +2044,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (targetTypeCase_ == 2) {
@@ -2130,7 +2068,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -2326,7 +2263,6 @@ public static com.google.firestore.v1beta1.Target parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -2334,7 +2270,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.Target prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -2362,7 +2297,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_Target_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_Target_fieldAccessorTable
@@ -2385,7 +2319,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       targetId_ = 0;
@@ -2399,18 +2332,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_Target_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.Target getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.Target.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.Target build() {
       com.google.firestore.v1beta1.Target result = buildPartial();
       if (!result.isInitialized()) {
@@ -2419,7 +2349,6 @@ public com.google.firestore.v1beta1.Target build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.Target buildPartial() {
       com.google.firestore.v1beta1.Target result = new com.google.firestore.v1beta1.Target(this);
       if (targetTypeCase_ == 2) {
@@ -2454,39 +2383,32 @@ public com.google.firestore.v1beta1.Target buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.Target) {
         return mergeFrom((com.google.firestore.v1beta1.Target)other);
@@ -2535,12 +2457,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.Target other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3252,13 +3172,11 @@ public Builder clearOnce() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -3280,12 +3198,11 @@ public static com.google.firestore.v1beta1.Target getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Target parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Target(input, extensionRegistry);
+        return new Target(input, extensionRegistry);
     }
   };
 
@@ -3298,7 +3215,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.Target getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/TargetChange.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/TargetChange.java
index 3d04b19145bc..d6af6db1df98 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/TargetChange.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/TargetChange.java
@@ -35,9 +35,6 @@ private TargetChange(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private TargetChange(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -107,13 +111,6 @@ private TargetChange(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -134,7 +131,6 @@ private TargetChange(
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_TargetChange_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_TargetChange_fieldAccessorTable
@@ -348,7 +344,6 @@ public int getTargetChangeTypeValue() {
    * .google.firestore.v1beta1.TargetChange.TargetChangeType target_change_type = 1;
    */
   public com.google.firestore.v1beta1.TargetChange.TargetChangeType getTargetChangeType() {
-    @SuppressWarnings("deprecation")
     com.google.firestore.v1beta1.TargetChange.TargetChangeType result = com.google.firestore.v1beta1.TargetChange.TargetChangeType.valueOf(targetChangeType_);
     return result == null ? com.google.firestore.v1beta1.TargetChange.TargetChangeType.UNRECOGNIZED : result;
   }
@@ -506,7 +501,6 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -516,7 +510,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     getSerializedSize();
@@ -542,7 +535,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -711,7 +703,6 @@ public static com.google.firestore.v1beta1.TargetChange parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -719,7 +710,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.TargetChange prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -747,7 +737,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_TargetChange_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_TargetChange_fieldAccessorTable
@@ -770,7 +759,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       targetChangeType_ = 0;
@@ -794,18 +782,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_TargetChange_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.TargetChange getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.TargetChange.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.TargetChange build() {
       com.google.firestore.v1beta1.TargetChange result = buildPartial();
       if (!result.isInitialized()) {
@@ -814,7 +799,6 @@ public com.google.firestore.v1beta1.TargetChange build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.TargetChange buildPartial() {
       com.google.firestore.v1beta1.TargetChange result = new com.google.firestore.v1beta1.TargetChange(this);
       int from_bitField0_ = bitField0_;
@@ -841,39 +825,32 @@ public com.google.firestore.v1beta1.TargetChange buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.TargetChange) {
         return mergeFrom((com.google.firestore.v1beta1.TargetChange)other);
@@ -912,12 +889,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.TargetChange other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -968,7 +943,6 @@ public Builder setTargetChangeTypeValue(int value) {
      * .google.firestore.v1beta1.TargetChange.TargetChangeType target_change_type = 1;
      */
     public com.google.firestore.v1beta1.TargetChange.TargetChangeType getTargetChangeType() {
-      @SuppressWarnings("deprecation")
       com.google.firestore.v1beta1.TargetChange.TargetChangeType result = com.google.firestore.v1beta1.TargetChange.TargetChangeType.valueOf(targetChangeType_);
       return result == null ? com.google.firestore.v1beta1.TargetChange.TargetChangeType.UNRECOGNIZED : result;
     }
@@ -1546,13 +1520,11 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
       }
       return readTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1574,12 +1546,11 @@ public static com.google.firestore.v1beta1.TargetChange getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TargetChange parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TargetChange(input, extensionRegistry);
+        return new TargetChange(input, extensionRegistry);
     }
   };
 
@@ -1592,7 +1563,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.TargetChange getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/TransactionOptions.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/TransactionOptions.java
index 7e9749c0649a..a042411658c6 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/TransactionOptions.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/TransactionOptions.java
@@ -32,9 +32,6 @@ private TransactionOptions(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private TransactionOptions(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             com.google.firestore.v1beta1.TransactionOptions.ReadOnly.Builder subBuilder = null;
             if (modeCase_ == 2) {
@@ -74,13 +78,6 @@ private TransactionOptions(
             modeCase_ = 3;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -98,7 +95,6 @@ private TransactionOptions(
     return com.google.firestore.v1beta1.CommonProto.internal_static_google_firestore_v1beta1_TransactionOptions_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.CommonProto.internal_static_google_firestore_v1beta1_TransactionOptions_fieldAccessorTable
@@ -149,9 +145,6 @@ private ReadWrite(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -163,11 +156,6 @@ private ReadWrite(
             case 0:
               done = true;
               break;
-            case 10: {
-
-              retryTransaction_ = input.readBytes();
-              break;
-            }
             default: {
               if (!parseUnknownFieldProto3(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -175,6 +163,11 @@ private ReadWrite(
               }
               break;
             }
+            case 10: {
+
+              retryTransaction_ = input.readBytes();
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -192,7 +185,6 @@ private ReadWrite(
       return com.google.firestore.v1beta1.CommonProto.internal_static_google_firestore_v1beta1_TransactionOptions_ReadWrite_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.CommonProto.internal_static_google_firestore_v1beta1_TransactionOptions_ReadWrite_fieldAccessorTable
@@ -214,7 +206,6 @@ public com.google.protobuf.ByteString getRetryTransaction() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -224,7 +215,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!retryTransaction_.isEmpty()) {
@@ -233,7 +223,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -349,7 +338,6 @@ public static com.google.firestore.v1beta1.TransactionOptions.ReadWrite parseFro
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -357,7 +345,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.firestore.v1beta1.TransactionOptions.ReadWrite prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -385,7 +372,6 @@ public static final class Builder extends
         return com.google.firestore.v1beta1.CommonProto.internal_static_google_firestore_v1beta1_TransactionOptions_ReadWrite_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.firestore.v1beta1.CommonProto.internal_static_google_firestore_v1beta1_TransactionOptions_ReadWrite_fieldAccessorTable
@@ -408,7 +394,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         retryTransaction_ = com.google.protobuf.ByteString.EMPTY;
@@ -416,18 +401,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.firestore.v1beta1.CommonProto.internal_static_google_firestore_v1beta1_TransactionOptions_ReadWrite_descriptor;
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.TransactionOptions.ReadWrite getDefaultInstanceForType() {
         return com.google.firestore.v1beta1.TransactionOptions.ReadWrite.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.TransactionOptions.ReadWrite build() {
         com.google.firestore.v1beta1.TransactionOptions.ReadWrite result = buildPartial();
         if (!result.isInitialized()) {
@@ -436,7 +418,6 @@ public com.google.firestore.v1beta1.TransactionOptions.ReadWrite build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.TransactionOptions.ReadWrite buildPartial() {
         com.google.firestore.v1beta1.TransactionOptions.ReadWrite result = new com.google.firestore.v1beta1.TransactionOptions.ReadWrite(this);
         result.retryTransaction_ = retryTransaction_;
@@ -444,39 +425,32 @@ public com.google.firestore.v1beta1.TransactionOptions.ReadWrite buildPartial()
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.firestore.v1beta1.TransactionOptions.ReadWrite) {
           return mergeFrom((com.google.firestore.v1beta1.TransactionOptions.ReadWrite)other);
@@ -496,12 +470,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.TransactionOptions.ReadWri
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -560,13 +532,11 @@ public Builder clearRetryTransaction() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -588,12 +558,11 @@ public static com.google.firestore.v1beta1.TransactionOptions.ReadWrite getDefau
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public ReadWrite parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ReadWrite(input, extensionRegistry);
+          return new ReadWrite(input, extensionRegistry);
       }
     };
 
@@ -606,7 +575,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.TransactionOptions.ReadWrite getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -676,9 +644,6 @@ private ReadOnly(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -690,6 +655,13 @@ private ReadOnly(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 18: {
               com.google.protobuf.Timestamp.Builder subBuilder = null;
               if (consistencySelectorCase_ == 2) {
@@ -704,13 +676,6 @@ private ReadOnly(
               consistencySelectorCase_ = 2;
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -728,7 +693,6 @@ private ReadOnly(
       return com.google.firestore.v1beta1.CommonProto.internal_static_google_firestore_v1beta1_TransactionOptions_ReadOnly_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.CommonProto.internal_static_google_firestore_v1beta1_TransactionOptions_ReadOnly_fieldAccessorTable
@@ -814,7 +778,6 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -824,7 +787,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (consistencySelectorCase_ == 2) {
@@ -833,7 +795,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -964,7 +925,6 @@ public static com.google.firestore.v1beta1.TransactionOptions.ReadOnly parseFrom
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -972,7 +932,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.firestore.v1beta1.TransactionOptions.ReadOnly prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -1000,7 +959,6 @@ public static final class Builder extends
         return com.google.firestore.v1beta1.CommonProto.internal_static_google_firestore_v1beta1_TransactionOptions_ReadOnly_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.firestore.v1beta1.CommonProto.internal_static_google_firestore_v1beta1_TransactionOptions_ReadOnly_fieldAccessorTable
@@ -1023,7 +981,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         consistencySelectorCase_ = 0;
@@ -1031,18 +988,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.firestore.v1beta1.CommonProto.internal_static_google_firestore_v1beta1_TransactionOptions_ReadOnly_descriptor;
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.TransactionOptions.ReadOnly getDefaultInstanceForType() {
         return com.google.firestore.v1beta1.TransactionOptions.ReadOnly.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.TransactionOptions.ReadOnly build() {
         com.google.firestore.v1beta1.TransactionOptions.ReadOnly result = buildPartial();
         if (!result.isInitialized()) {
@@ -1051,7 +1005,6 @@ public com.google.firestore.v1beta1.TransactionOptions.ReadOnly build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.firestore.v1beta1.TransactionOptions.ReadOnly buildPartial() {
         com.google.firestore.v1beta1.TransactionOptions.ReadOnly result = new com.google.firestore.v1beta1.TransactionOptions.ReadOnly(this);
         if (consistencySelectorCase_ == 2) {
@@ -1066,39 +1019,32 @@ public com.google.firestore.v1beta1.TransactionOptions.ReadOnly buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.firestore.v1beta1.TransactionOptions.ReadOnly) {
           return mergeFrom((com.google.firestore.v1beta1.TransactionOptions.ReadOnly)other);
@@ -1124,12 +1070,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.TransactionOptions.ReadOnl
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1343,13 +1287,11 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() {
         onChanged();;
         return readTimeBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1371,12 +1313,11 @@ public static com.google.firestore.v1beta1.TransactionOptions.ReadOnly getDefaul
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public ReadOnly parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ReadOnly(input, extensionRegistry);
+          return new ReadOnly(input, extensionRegistry);
       }
     };
 
@@ -1389,7 +1330,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.TransactionOptions.ReadOnly getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1511,7 +1451,6 @@ public com.google.firestore.v1beta1.TransactionOptions.ReadWriteOrBuilder getRea
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1521,7 +1460,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (modeCase_ == 2) {
@@ -1533,7 +1471,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1676,7 +1613,6 @@ public static com.google.firestore.v1beta1.TransactionOptions parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1684,7 +1620,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.TransactionOptions prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1712,7 +1647,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.CommonProto.internal_static_google_firestore_v1beta1_TransactionOptions_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.CommonProto.internal_static_google_firestore_v1beta1_TransactionOptions_fieldAccessorTable
@@ -1735,7 +1669,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       modeCase_ = 0;
@@ -1743,18 +1676,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.CommonProto.internal_static_google_firestore_v1beta1_TransactionOptions_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.TransactionOptions getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.TransactionOptions.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.TransactionOptions build() {
       com.google.firestore.v1beta1.TransactionOptions result = buildPartial();
       if (!result.isInitialized()) {
@@ -1763,7 +1693,6 @@ public com.google.firestore.v1beta1.TransactionOptions build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.TransactionOptions buildPartial() {
       com.google.firestore.v1beta1.TransactionOptions result = new com.google.firestore.v1beta1.TransactionOptions(this);
       if (modeCase_ == 2) {
@@ -1785,39 +1714,32 @@ public com.google.firestore.v1beta1.TransactionOptions buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.TransactionOptions) {
         return mergeFrom((com.google.firestore.v1beta1.TransactionOptions)other);
@@ -1847,12 +1769,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.TransactionOptions other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2229,13 +2149,11 @@ public com.google.firestore.v1beta1.TransactionOptions.ReadWriteOrBuilder getRea
       onChanged();;
       return readWriteBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2257,12 +2175,11 @@ public static com.google.firestore.v1beta1.TransactionOptions getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TransactionOptions parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TransactionOptions(input, extensionRegistry);
+        return new TransactionOptions(input, extensionRegistry);
     }
   };
 
@@ -2275,7 +2192,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.TransactionOptions getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/UpdateDocumentRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/UpdateDocumentRequest.java
index 2670dd29969a..f02705d093ee 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/UpdateDocumentRequest.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/UpdateDocumentRequest.java
@@ -32,9 +32,6 @@ private UpdateDocumentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private UpdateDocumentRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.firestore.v1beta1.Document.Builder subBuilder = null;
             if (document_ != null) {
@@ -98,13 +102,6 @@ private UpdateDocumentRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -122,7 +119,6 @@ private UpdateDocumentRequest(
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_UpdateDocumentRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_UpdateDocumentRequest_fieldAccessorTable
@@ -290,7 +286,6 @@ public com.google.firestore.v1beta1.PreconditionOrBuilder getCurrentDocumentOrBu
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -300,7 +295,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (document_ != null) {
@@ -318,7 +312,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -478,7 +471,6 @@ public static com.google.firestore.v1beta1.UpdateDocumentRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -486,7 +478,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.UpdateDocumentRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -514,7 +505,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_UpdateDocumentRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_UpdateDocumentRequest_fieldAccessorTable
@@ -537,7 +527,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (documentBuilder_ == null) {
@@ -567,18 +556,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_UpdateDocumentRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.UpdateDocumentRequest getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.UpdateDocumentRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.UpdateDocumentRequest build() {
       com.google.firestore.v1beta1.UpdateDocumentRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -587,7 +573,6 @@ public com.google.firestore.v1beta1.UpdateDocumentRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.UpdateDocumentRequest buildPartial() {
       com.google.firestore.v1beta1.UpdateDocumentRequest result = new com.google.firestore.v1beta1.UpdateDocumentRequest(this);
       if (documentBuilder_ == null) {
@@ -614,39 +599,32 @@ public com.google.firestore.v1beta1.UpdateDocumentRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.UpdateDocumentRequest) {
         return mergeFrom((com.google.firestore.v1beta1.UpdateDocumentRequest)other);
@@ -675,12 +653,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.UpdateDocumentRequest othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1391,13 +1367,11 @@ public com.google.firestore.v1beta1.PreconditionOrBuilder getCurrentDocumentOrBu
       }
       return currentDocumentBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1419,12 +1393,11 @@ public static com.google.firestore.v1beta1.UpdateDocumentRequest getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateDocumentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateDocumentRequest(input, extensionRegistry);
+        return new UpdateDocumentRequest(input, extensionRegistry);
     }
   };
 
@@ -1437,7 +1410,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.UpdateDocumentRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Value.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Value.java
index 5e5f0b2efd61..0536f1c52547 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Value.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Value.java
@@ -32,9 +32,6 @@ private Value(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private Value(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             valueTypeCase_ = 1;
             valueType_ = input.readBool();
@@ -140,13 +144,6 @@ private Value(
             valueType_ = input.readBytes();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -164,7 +161,6 @@ private Value(
     return com.google.firestore.v1beta1.DocumentProto.internal_static_google_firestore_v1beta1_Value_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.DocumentProto.internal_static_google_firestore_v1beta1_Value_fieldAccessorTable
@@ -251,7 +247,6 @@ public int getNullValueValue() {
    */
   public com.google.protobuf.NullValue getNullValue() {
     if (valueTypeCase_ == 11) {
-      @SuppressWarnings("deprecation")
       com.google.protobuf.NullValue result = com.google.protobuf.NullValue.valueOf(
           (java.lang.Integer) valueType_);
       return result == null ? com.google.protobuf.NullValue.UNRECOGNIZED : result;
@@ -596,7 +591,6 @@ public com.google.firestore.v1beta1.MapValueOrBuilder getMapValueOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -606,7 +600,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (valueTypeCase_ == 1) {
@@ -649,7 +642,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -907,7 +899,6 @@ public static com.google.firestore.v1beta1.Value parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -915,7 +906,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.Value prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -943,7 +933,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.DocumentProto.internal_static_google_firestore_v1beta1_Value_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.DocumentProto.internal_static_google_firestore_v1beta1_Value_fieldAccessorTable
@@ -966,7 +955,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       valueTypeCase_ = 0;
@@ -974,18 +962,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.DocumentProto.internal_static_google_firestore_v1beta1_Value_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.Value getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.Value.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.Value build() {
       com.google.firestore.v1beta1.Value result = buildPartial();
       if (!result.isInitialized()) {
@@ -994,7 +979,6 @@ public com.google.firestore.v1beta1.Value build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.Value buildPartial() {
       com.google.firestore.v1beta1.Value result = new com.google.firestore.v1beta1.Value(this);
       if (valueTypeCase_ == 11) {
@@ -1051,39 +1035,32 @@ public com.google.firestore.v1beta1.Value buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.Value) {
         return mergeFrom((com.google.firestore.v1beta1.Value)other);
@@ -1153,12 +1130,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.Value other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1227,7 +1202,6 @@ public Builder setNullValueValue(int value) {
      */
     public com.google.protobuf.NullValue getNullValue() {
       if (valueTypeCase_ == 11) {
-        @SuppressWarnings("deprecation")
         com.google.protobuf.NullValue result = com.google.protobuf.NullValue.valueOf(
             (java.lang.Integer) valueType_);
         return result == null ? com.google.protobuf.NullValue.UNRECOGNIZED : result;
@@ -2386,13 +2360,11 @@ public com.google.firestore.v1beta1.MapValueOrBuilder getMapValueOrBuilder() {
       onChanged();;
       return mapValueBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2414,12 +2386,11 @@ public static com.google.firestore.v1beta1.Value getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Value parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Value(input, extensionRegistry);
+        return new Value(input, extensionRegistry);
     }
   };
 
@@ -2432,7 +2403,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.Value getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Write.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Write.java
index 124e4186174a..a85d8c6c04b8 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Write.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Write.java
@@ -32,9 +32,6 @@ private Write(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private Write(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.firestore.v1beta1.Document.Builder subBuilder = null;
             if (operationCase_ == 1) {
@@ -106,13 +110,6 @@ private Write(
             operationCase_ = 6;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -130,7 +127,6 @@ private Write(
     return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_Write_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_Write_fieldAccessorTable
@@ -410,7 +406,6 @@ public com.google.firestore.v1beta1.PreconditionOrBuilder getCurrentDocumentOrBu
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -420,7 +415,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (operationCase_ == 1) {
@@ -441,7 +435,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -621,7 +614,6 @@ public static com.google.firestore.v1beta1.Write parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -629,7 +621,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.Write prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -657,7 +648,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_Write_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_Write_fieldAccessorTable
@@ -680,7 +670,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (updateMaskBuilder_ == null) {
@@ -700,18 +689,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_Write_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.Write getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.Write.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.Write build() {
       com.google.firestore.v1beta1.Write result = buildPartial();
       if (!result.isInitialized()) {
@@ -720,7 +706,6 @@ public com.google.firestore.v1beta1.Write build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.Write buildPartial() {
       com.google.firestore.v1beta1.Write result = new com.google.firestore.v1beta1.Write(this);
       if (operationCase_ == 1) {
@@ -755,39 +740,32 @@ public com.google.firestore.v1beta1.Write buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.Write) {
         return mergeFrom((com.google.firestore.v1beta1.Write)other);
@@ -829,12 +807,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.Write other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1730,13 +1706,11 @@ public com.google.firestore.v1beta1.PreconditionOrBuilder getCurrentDocumentOrBu
       }
       return currentDocumentBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1758,12 +1732,11 @@ public static com.google.firestore.v1beta1.Write getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Write parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Write(input, extensionRegistry);
+        return new Write(input, extensionRegistry);
     }
   };
 
@@ -1776,7 +1749,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.Write getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteProto.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteProto.java
index c3995d62c01a..cff08c9cb475 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteProto.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteProto.java
@@ -72,7 +72,7 @@ public static void registerAllExtensions(
       "le.firestore.v1beta1.DocumentH\000\022\020\n\006delet" +
       "e\030\002 \001(\tH\000\022@\n\ttransform\030\006 \001(\0132+.google.fi" +
       "restore.v1beta1.DocumentTransformH\000\022;\n\013u" +
-      "pdate_mask\030\003 \001(\0132&.google.firestore.v1be" +
+      "pdate_mask\030\003 \001(\0132&.google.firestore.v1be",
       "ta1.DocumentMask\022@\n\020current_document\030\004 \001" +
       "(\0132&.google.firestore.v1beta1.Preconditi" +
       "onB\013\n\toperation\"\352\003\n\021DocumentTransform\022\020\n" +
@@ -82,7 +82,7 @@ public static void registerAllExtensions(
       "\022\022\n\nfield_path\030\001 \001(\t\022e\n\023set_to_server_va" +
       "lue\030\002 \001(\0162F.google.firestore.v1beta1.Doc" +
       "umentTransform.FieldTransform.ServerValu" +
-      "eH\000\022G\n\027append_missing_elements\030\006 \001(\0132$.g" +
+      "eH\000\022G\n\027append_missing_elements\030\006 \001(\0132$.g",
       "oogle.firestore.v1beta1.ArrayValueH\000\022E\n\025" +
       "remove_all_from_array\030\007 \001(\0132$.google.fir" +
       "estore.v1beta1.ArrayValueH\000\"=\n\013ServerVal" +
@@ -92,7 +92,7 @@ public static void registerAllExtensions(
       "uf.Timestamp\022:\n\021transform_results\030\002 \003(\0132" +
       "\037.google.firestore.v1beta1.Value\"v\n\016Docu" +
       "mentChange\0224\n\010document\030\001 \001(\0132\".google.fi" +
-      "restore.v1beta1.Document\022\022\n\ntarget_ids\030\005" +
+      "restore.v1beta1.Document\022\022\n\ntarget_ids\030\005",
       " \003(\005\022\032\n\022removed_target_ids\030\006 \003(\005\"m\n\016Docu" +
       "mentDelete\022\020\n\010document\030\001 \001(\t\022\032\n\022removed_" +
       "target_ids\030\006 \003(\005\022-\n\tread_time\030\004 \001(\0132\032.go" +
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "obuf.Timestamp\"3\n\017ExistenceFilter\022\021\n\ttar" +
       "get_id\030\001 \001(\005\022\r\n\005count\030\002 \001(\005B\270\001\n\034com.goog" +
       "le.firestore.v1beta1B\nWriteProtoP\001ZAgoog" +
-      "le.golang.org/genproto/googleapis/firest" +
+      "le.golang.org/genproto/googleapis/firest",
       "ore/v1beta1;firestore\242\002\004GCFS\252\002\036Google.Cl" +
       "oud.Firestore.V1Beta1\312\002\036Google\\Cloud\\Fir" +
       "estore\\V1beta1b\006proto3"
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteRequest.java
index 8c1bf932da15..b2747527772c 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteRequest.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteRequest.java
@@ -42,9 +42,6 @@ private WriteRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -56,6 +53,13 @@ private WriteRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -95,13 +99,6 @@ private WriteRequest(
                 labels__.getKey(), labels__.getValue());
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -123,7 +120,6 @@ private WriteRequest(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -134,7 +130,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_WriteRequest_fieldAccessorTable
@@ -425,7 +420,6 @@ public java.lang.String getLabelsOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -435,7 +429,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getDatabaseBytes().isEmpty()) {
@@ -459,7 +452,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -615,7 +607,6 @@ public static com.google.firestore.v1beta1.WriteRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -623,7 +614,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.WriteRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -679,7 +669,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_WriteRequest_fieldAccessorTable
@@ -703,7 +692,6 @@ private void maybeForceBuilderInitialization() {
         getWritesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       database_ = "";
@@ -722,18 +710,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_WriteRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.WriteRequest getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.WriteRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.WriteRequest build() {
       com.google.firestore.v1beta1.WriteRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -742,7 +727,6 @@ public com.google.firestore.v1beta1.WriteRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.WriteRequest buildPartial() {
       com.google.firestore.v1beta1.WriteRequest result = new com.google.firestore.v1beta1.WriteRequest(this);
       int from_bitField0_ = bitField0_;
@@ -766,39 +750,32 @@ public com.google.firestore.v1beta1.WriteRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.WriteRequest) {
         return mergeFrom((com.google.firestore.v1beta1.WriteRequest)other);
@@ -854,12 +831,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.WriteRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1679,13 +1654,11 @@ public Builder putAllLabels(
           .putAll(values);
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1707,12 +1680,11 @@ public static com.google.firestore.v1beta1.WriteRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public WriteRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WriteRequest(input, extensionRegistry);
+        return new WriteRequest(input, extensionRegistry);
     }
   };
 
@@ -1725,7 +1697,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.WriteRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteResponse.java
index d17f89980da6..a4c6c6b84670 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteResponse.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteResponse.java
@@ -35,9 +35,6 @@ private WriteResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private WriteResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -82,13 +86,6 @@ private WriteResponse(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -109,7 +106,6 @@ private WriteResponse(
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_WriteResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_WriteResponse_fieldAccessorTable
@@ -276,7 +272,6 @@ public com.google.protobuf.TimestampOrBuilder getCommitTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -286,7 +281,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getStreamIdBytes().isEmpty()) {
@@ -304,7 +298,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -450,7 +443,6 @@ public static com.google.firestore.v1beta1.WriteResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -458,7 +450,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.WriteResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -486,7 +477,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_WriteResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_WriteResponse_fieldAccessorTable
@@ -510,7 +500,6 @@ private void maybeForceBuilderInitialization() {
         getWriteResultsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       streamId_ = "";
@@ -532,18 +521,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.FirestoreProto.internal_static_google_firestore_v1beta1_WriteResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.WriteResponse getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.WriteResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.WriteResponse build() {
       com.google.firestore.v1beta1.WriteResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -552,7 +538,6 @@ public com.google.firestore.v1beta1.WriteResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.WriteResponse buildPartial() {
       com.google.firestore.v1beta1.WriteResponse result = new com.google.firestore.v1beta1.WriteResponse(this);
       int from_bitField0_ = bitField0_;
@@ -578,39 +563,32 @@ public com.google.firestore.v1beta1.WriteResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.WriteResponse) {
         return mergeFrom((com.google.firestore.v1beta1.WriteResponse)other);
@@ -663,12 +641,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.WriteResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1329,13 +1305,11 @@ public com.google.protobuf.TimestampOrBuilder getCommitTimeOrBuilder() {
       }
       return commitTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1357,12 +1331,11 @@ public static com.google.firestore.v1beta1.WriteResponse getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public WriteResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WriteResponse(input, extensionRegistry);
+        return new WriteResponse(input, extensionRegistry);
     }
   };
 
@@ -1375,7 +1348,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.WriteResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteResult.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteResult.java
index ef45a5fe3f55..b7ab7a382015 100644
--- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteResult.java
+++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteResult.java
@@ -33,9 +33,6 @@ private WriteResult(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private WriteResult(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.protobuf.Timestamp.Builder subBuilder = null;
             if (updateTime_ != null) {
@@ -69,13 +73,6 @@ private WriteResult(
                 input.readMessage(com.google.firestore.v1beta1.Value.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private WriteResult(
     return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_WriteResult_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_WriteResult_fieldAccessorTable
@@ -208,7 +204,6 @@ public com.google.firestore.v1beta1.ValueOrBuilder getTransformResultsOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -218,7 +213,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (updateTime_ != null) {
@@ -230,7 +224,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -361,7 +354,6 @@ public static com.google.firestore.v1beta1.WriteResult parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -369,7 +361,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.firestore.v1beta1.WriteResult prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -397,7 +388,6 @@ public static final class Builder extends
       return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_WriteResult_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_WriteResult_fieldAccessorTable
@@ -421,7 +411,6 @@ private void maybeForceBuilderInitialization() {
         getTransformResultsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (updateTimeBuilder_ == null) {
@@ -439,18 +428,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.firestore.v1beta1.WriteProto.internal_static_google_firestore_v1beta1_WriteResult_descriptor;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.WriteResult getDefaultInstanceForType() {
       return com.google.firestore.v1beta1.WriteResult.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.WriteResult build() {
       com.google.firestore.v1beta1.WriteResult result = buildPartial();
       if (!result.isInitialized()) {
@@ -459,7 +445,6 @@ public com.google.firestore.v1beta1.WriteResult build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.firestore.v1beta1.WriteResult buildPartial() {
       com.google.firestore.v1beta1.WriteResult result = new com.google.firestore.v1beta1.WriteResult(this);
       int from_bitField0_ = bitField0_;
@@ -483,39 +468,32 @@ public com.google.firestore.v1beta1.WriteResult buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.firestore.v1beta1.WriteResult) {
         return mergeFrom((com.google.firestore.v1beta1.WriteResult)other);
@@ -561,12 +539,10 @@ public Builder mergeFrom(com.google.firestore.v1beta1.WriteResult other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1095,13 +1071,11 @@ public com.google.firestore.v1beta1.Value.Builder addTransformResultsBuilder(
       }
       return transformResultsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1123,12 +1097,11 @@ public static com.google.firestore.v1beta1.WriteResult getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public WriteResult parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WriteResult(input, extensionRegistry);
+        return new WriteResult(input, extensionRegistry);
     }
   };
 
@@ -1141,7 +1114,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.firestore.v1beta1.WriteResult getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRegistryRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRegistryRequest.java
index 8fce1e6217dc..9a0517a2abfc 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRegistryRequest.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRegistryRequest.java
@@ -33,9 +33,6 @@ private CreateDeviceRegistryRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private CreateDeviceRegistryRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private CreateDeviceRegistryRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private CreateDeviceRegistryRequest(
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_CreateDeviceRegistryRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_CreateDeviceRegistryRequest_fieldAccessorTable
@@ -182,7 +178,6 @@ public com.google.cloud.iot.v1.DeviceRegistryOrBuilder getDeviceRegistryOrBuilde
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -192,7 +187,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -204,7 +198,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -332,7 +325,6 @@ public static com.google.cloud.iot.v1.CreateDeviceRegistryRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -340,7 +332,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.iot.v1.CreateDeviceRegistryRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -368,7 +359,6 @@ public static final class Builder extends
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_CreateDeviceRegistryRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_CreateDeviceRegistryRequest_fieldAccessorTable
@@ -391,7 +381,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -405,18 +394,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_CreateDeviceRegistryRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.CreateDeviceRegistryRequest getDefaultInstanceForType() {
       return com.google.cloud.iot.v1.CreateDeviceRegistryRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.CreateDeviceRegistryRequest build() {
       com.google.cloud.iot.v1.CreateDeviceRegistryRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -425,7 +411,6 @@ public com.google.cloud.iot.v1.CreateDeviceRegistryRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.CreateDeviceRegistryRequest buildPartial() {
       com.google.cloud.iot.v1.CreateDeviceRegistryRequest result = new com.google.cloud.iot.v1.CreateDeviceRegistryRequest(this);
       result.parent_ = parent_;
@@ -438,39 +423,32 @@ public com.google.cloud.iot.v1.CreateDeviceRegistryRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.iot.v1.CreateDeviceRegistryRequest) {
         return mergeFrom((com.google.cloud.iot.v1.CreateDeviceRegistryRequest)other);
@@ -494,12 +472,10 @@ public Builder mergeFrom(com.google.cloud.iot.v1.CreateDeviceRegistryRequest oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -782,13 +758,11 @@ public com.google.cloud.iot.v1.DeviceRegistryOrBuilder getDeviceRegistryOrBuilde
       }
       return deviceRegistryBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -810,12 +784,11 @@ public static com.google.cloud.iot.v1.CreateDeviceRegistryRequest getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateDeviceRegistryRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateDeviceRegistryRequest(input, extensionRegistry);
+        return new CreateDeviceRegistryRequest(input, extensionRegistry);
     }
   };
 
@@ -828,7 +801,6 @@ public com.google.protobuf.Parser getParserForType(
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.iot.v1.CreateDeviceRegistryRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRequest.java
index 92b769a93ea0..a2e9bdf19117 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRequest.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/CreateDeviceRequest.java
@@ -33,9 +33,6 @@ private CreateDeviceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private CreateDeviceRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private CreateDeviceRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private CreateDeviceRequest(
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_CreateDeviceRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_CreateDeviceRequest_fieldAccessorTable
@@ -184,7 +180,6 @@ public com.google.cloud.iot.v1.DeviceOrBuilder getDeviceOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -194,7 +189,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -206,7 +200,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -334,7 +327,6 @@ public static com.google.cloud.iot.v1.CreateDeviceRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -342,7 +334,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.iot.v1.CreateDeviceRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -370,7 +361,6 @@ public static final class Builder extends
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_CreateDeviceRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_CreateDeviceRequest_fieldAccessorTable
@@ -393,7 +383,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -407,18 +396,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_CreateDeviceRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.CreateDeviceRequest getDefaultInstanceForType() {
       return com.google.cloud.iot.v1.CreateDeviceRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.CreateDeviceRequest build() {
       com.google.cloud.iot.v1.CreateDeviceRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -427,7 +413,6 @@ public com.google.cloud.iot.v1.CreateDeviceRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.CreateDeviceRequest buildPartial() {
       com.google.cloud.iot.v1.CreateDeviceRequest result = new com.google.cloud.iot.v1.CreateDeviceRequest(this);
       result.parent_ = parent_;
@@ -440,39 +425,32 @@ public com.google.cloud.iot.v1.CreateDeviceRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.iot.v1.CreateDeviceRequest) {
         return mergeFrom((com.google.cloud.iot.v1.CreateDeviceRequest)other);
@@ -496,12 +474,10 @@ public Builder mergeFrom(com.google.cloud.iot.v1.CreateDeviceRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -789,13 +765,11 @@ public com.google.cloud.iot.v1.DeviceOrBuilder getDeviceOrBuilder() {
       }
       return deviceBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -817,12 +791,11 @@ public static com.google.cloud.iot.v1.CreateDeviceRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateDeviceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateDeviceRequest(input, extensionRegistry);
+        return new CreateDeviceRequest(input, extensionRegistry);
     }
   };
 
@@ -835,7 +808,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.iot.v1.CreateDeviceRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRegistryRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRegistryRequest.java
index d4914c304c7f..56d337b63d5f 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRegistryRequest.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRegistryRequest.java
@@ -33,9 +33,6 @@ private DeleteDeviceRegistryRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteDeviceRegistryRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteDeviceRegistryRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteDeviceRegistryRequest(
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_DeleteDeviceRegistryRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_DeleteDeviceRegistryRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.cloud.iot.v1.DeleteDeviceRegistryRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.iot.v1.DeleteDeviceRegistryRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_DeleteDeviceRegistryRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_DeleteDeviceRegistryRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_DeleteDeviceRegistryRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.DeleteDeviceRegistryRequest getDefaultInstanceForType() {
       return com.google.cloud.iot.v1.DeleteDeviceRegistryRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.DeleteDeviceRegistryRequest build() {
       com.google.cloud.iot.v1.DeleteDeviceRegistryRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.cloud.iot.v1.DeleteDeviceRegistryRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.DeleteDeviceRegistryRequest buildPartial() {
       com.google.cloud.iot.v1.DeleteDeviceRegistryRequest result = new com.google.cloud.iot.v1.DeleteDeviceRegistryRequest(this);
       result.name_ = name_;
@@ -359,39 +344,32 @@ public com.google.cloud.iot.v1.DeleteDeviceRegistryRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.iot.v1.DeleteDeviceRegistryRequest) {
         return mergeFrom((com.google.cloud.iot.v1.DeleteDeviceRegistryRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.cloud.iot.v1.DeleteDeviceRegistryRequest oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.cloud.iot.v1.DeleteDeviceRegistryRequest getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteDeviceRegistryRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteDeviceRegistryRequest(input, extensionRegistry);
+        return new DeleteDeviceRegistryRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType(
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.iot.v1.DeleteDeviceRegistryRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRequest.java
index efd831c84ecb..89fbe985830a 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRequest.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeleteDeviceRequest.java
@@ -33,9 +33,6 @@ private DeleteDeviceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteDeviceRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteDeviceRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteDeviceRequest(
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_DeleteDeviceRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_DeleteDeviceRequest_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.iot.v1.DeleteDeviceRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.iot.v1.DeleteDeviceRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_DeleteDeviceRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_DeleteDeviceRequest_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_DeleteDeviceRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.DeleteDeviceRequest getDefaultInstanceForType() {
       return com.google.cloud.iot.v1.DeleteDeviceRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.DeleteDeviceRequest build() {
       com.google.cloud.iot.v1.DeleteDeviceRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.iot.v1.DeleteDeviceRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.DeleteDeviceRequest buildPartial() {
       com.google.cloud.iot.v1.DeleteDeviceRequest result = new com.google.cloud.iot.v1.DeleteDeviceRequest(this);
       result.name_ = name_;
@@ -361,39 +346,32 @@ public com.google.cloud.iot.v1.DeleteDeviceRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.iot.v1.DeleteDeviceRequest) {
         return mergeFrom((com.google.cloud.iot.v1.DeleteDeviceRequest)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.iot.v1.DeleteDeviceRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.iot.v1.DeleteDeviceRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteDeviceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteDeviceRequest(input, extensionRegistry);
+        return new DeleteDeviceRequest(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.iot.v1.DeleteDeviceRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/Device.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/Device.java
index f27ba26726bd..7e9e02be127f 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/Device.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/Device.java
@@ -37,9 +37,6 @@ private Device(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private Device(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -212,13 +216,6 @@ private Device(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -240,7 +237,6 @@ private Device(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -251,7 +247,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_Device_fieldAccessorTable
@@ -951,7 +946,6 @@ public java.lang.String getMetadataOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -961,7 +955,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getIdBytes().isEmpty()) {
@@ -1015,7 +1008,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1298,7 +1290,6 @@ public static com.google.cloud.iot.v1.Device parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1306,7 +1297,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.iot.v1.Device prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1356,7 +1346,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_Device_fieldAccessorTable
@@ -1380,7 +1369,6 @@ private void maybeForceBuilderInitialization() {
         getCredentialsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       id_ = "";
@@ -1455,18 +1443,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_Device_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.Device getDefaultInstanceForType() {
       return com.google.cloud.iot.v1.Device.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.Device build() {
       com.google.cloud.iot.v1.Device result = buildPartial();
       if (!result.isInitialized()) {
@@ -1475,7 +1460,6 @@ public com.google.cloud.iot.v1.Device build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.Device buildPartial() {
       com.google.cloud.iot.v1.Device result = new com.google.cloud.iot.v1.Device(this);
       int from_bitField0_ = bitField0_;
@@ -1545,39 +1529,32 @@ public com.google.cloud.iot.v1.Device buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.iot.v1.Device) {
         return mergeFrom((com.google.cloud.iot.v1.Device)other);
@@ -1663,12 +1640,10 @@ public Builder mergeFrom(com.google.cloud.iot.v1.Device other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4159,13 +4134,11 @@ public Builder putAllMetadata(
           .putAll(values);
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -4187,12 +4160,11 @@ public static com.google.cloud.iot.v1.Device getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Device parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Device(input, extensionRegistry);
+        return new Device(input, extensionRegistry);
     }
   };
 
@@ -4205,7 +4177,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.iot.v1.Device getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceConfig.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceConfig.java
index ca814d6e2a99..71ff144e373b 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceConfig.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceConfig.java
@@ -34,9 +34,6 @@ private DeviceConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private DeviceConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
 
             version_ = input.readInt64();
@@ -84,13 +88,6 @@ private DeviceConfig(
             binaryData_ = input.readBytes();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -108,7 +105,6 @@ private DeviceConfig(
     return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceConfig_fieldAccessorTable
@@ -239,7 +235,6 @@ public com.google.protobuf.ByteString getBinaryData() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -249,7 +244,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (version_ != 0L) {
@@ -267,7 +261,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -418,7 +411,6 @@ public static com.google.cloud.iot.v1.DeviceConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -426,7 +418,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.iot.v1.DeviceConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -454,7 +445,6 @@ public static final class Builder extends
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceConfig_fieldAccessorTable
@@ -477,7 +467,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       version_ = 0L;
@@ -499,18 +488,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.DeviceConfig getDefaultInstanceForType() {
       return com.google.cloud.iot.v1.DeviceConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.DeviceConfig build() {
       com.google.cloud.iot.v1.DeviceConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -519,7 +505,6 @@ public com.google.cloud.iot.v1.DeviceConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.DeviceConfig buildPartial() {
       com.google.cloud.iot.v1.DeviceConfig result = new com.google.cloud.iot.v1.DeviceConfig(this);
       result.version_ = version_;
@@ -538,39 +523,32 @@ public com.google.cloud.iot.v1.DeviceConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.iot.v1.DeviceConfig) {
         return mergeFrom((com.google.cloud.iot.v1.DeviceConfig)other);
@@ -599,12 +577,10 @@ public Builder mergeFrom(com.google.cloud.iot.v1.DeviceConfig other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1097,13 +1073,11 @@ public Builder clearBinaryData() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1125,12 +1099,11 @@ public static com.google.cloud.iot.v1.DeviceConfig getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeviceConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeviceConfig(input, extensionRegistry);
+        return new DeviceConfig(input, extensionRegistry);
     }
   };
 
@@ -1143,7 +1116,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.iot.v1.DeviceConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceCredential.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceCredential.java
index ea062b161db3..799723d455ea 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceCredential.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceCredential.java
@@ -32,9 +32,6 @@ private DeviceCredential(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private DeviceCredential(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             com.google.cloud.iot.v1.PublicKeyCredential.Builder subBuilder = null;
             if (credentialCase_ == 2) {
@@ -73,13 +77,6 @@ private DeviceCredential(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private DeviceCredential(
     return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceCredential_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceCredential_fieldAccessorTable
@@ -249,7 +245,6 @@ public com.google.protobuf.TimestampOrBuilder getExpirationTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -259,7 +254,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (credentialCase_ == 2) {
@@ -271,7 +265,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -415,7 +408,6 @@ public static com.google.cloud.iot.v1.DeviceCredential parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -423,7 +415,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.iot.v1.DeviceCredential prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -451,7 +442,6 @@ public static final class Builder extends
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceCredential_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceCredential_fieldAccessorTable
@@ -474,7 +464,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (expirationTimeBuilder_ == null) {
@@ -488,18 +477,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceCredential_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.DeviceCredential getDefaultInstanceForType() {
       return com.google.cloud.iot.v1.DeviceCredential.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.DeviceCredential build() {
       com.google.cloud.iot.v1.DeviceCredential result = buildPartial();
       if (!result.isInitialized()) {
@@ -508,7 +494,6 @@ public com.google.cloud.iot.v1.DeviceCredential build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.DeviceCredential buildPartial() {
       com.google.cloud.iot.v1.DeviceCredential result = new com.google.cloud.iot.v1.DeviceCredential(this);
       if (credentialCase_ == 2) {
@@ -528,39 +513,32 @@ public com.google.cloud.iot.v1.DeviceCredential buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.iot.v1.DeviceCredential) {
         return mergeFrom((com.google.cloud.iot.v1.DeviceCredential)other);
@@ -589,12 +567,10 @@ public Builder mergeFrom(com.google.cloud.iot.v1.DeviceCredential other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1060,13 +1036,11 @@ public com.google.protobuf.TimestampOrBuilder getExpirationTimeOrBuilder() {
       }
       return expirationTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1088,12 +1062,11 @@ public static com.google.cloud.iot.v1.DeviceCredential getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeviceCredential parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeviceCredential(input, extensionRegistry);
+        return new DeviceCredential(input, extensionRegistry);
     }
   };
 
@@ -1106,7 +1079,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.iot.v1.DeviceCredential getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceManagerProto.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceManagerProto.java
index 8091d15e9121..b7ea5b0c2d46 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceManagerProto.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceManagerProto.java
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       "empty.proto\032 google/protobuf/field_mask." +
       "proto\032\037google/protobuf/timestamp.proto\"k" +
       "\n\033CreateDeviceRegistryRequest\022\016\n\006parent\030" +
-      "\001 \001(\t\022<\n\017device_registry\030\002 \001(\0132#.google." +
+      "\001 \001(\t\022<\n\017device_registry\030\002 \001(\0132#.google.",
       "cloud.iot.v1.DeviceRegistry\"(\n\030GetDevice" +
       "RegistryRequest\022\014\n\004name\030\001 \001(\t\"+\n\033DeleteD" +
       "eviceRegistryRequest\022\014\n\004name\030\001 \001(\t\"\214\001\n\033U" +
@@ -127,7 +127,7 @@ public static void registerAllExtensions(
       "rotobuf.FieldMask\"T\n\033ListDeviceRegistrie" +
       "sRequest\022\016\n\006parent\030\001 \001(\t\022\021\n\tpage_size\030\002 " +
       "\001(\005\022\022\n\npage_token\030\003 \001(\t\"w\n\034ListDeviceReg" +
-      "istriesResponse\022>\n\021device_registries\030\001 \003" +
+      "istriesResponse\022>\n\021device_registries\030\001 \003",
       "(\0132#.google.cloud.iot.v1.DeviceRegistry\022" +
       "\027\n\017next_page_token\030\002 \001(\t\"R\n\023CreateDevice" +
       "Request\022\016\n\006parent\030\001 \001(\t\022+\n\006device\030\002 \001(\0132" +
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       "DeviceRequest\022+\n\006device\030\002 \001(\0132\033.google.c" +
       "loud.iot.v1.Device\022/\n\013update_mask\030\003 \001(\0132" +
       "\032.google.protobuf.FieldMask\"#\n\023DeleteDev" +
-      "iceRequest\022\014\n\004name\030\001 \001(\t\"\247\001\n\022ListDevices" +
+      "iceRequest\022\014\n\004name\030\001 \001(\t\"\247\001\n\022ListDevices",
       "Request\022\016\n\006parent\030\001 \001(\t\022\026\n\016device_num_id" +
       "s\030\002 \003(\004\022\022\n\ndevice_ids\030\003 \003(\t\022.\n\nfield_mas" +
       "k\030\004 \001(\0132\032.google.protobuf.FieldMask\022\021\n\tp" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "en\030\002 \001(\t\"`\n ModifyCloudToDeviceConfigReq" +
       "uest\022\014\n\004name\030\001 \001(\t\022\031\n\021version_to_update\030" +
       "\002 \001(\003\022\023\n\013binary_data\030\003 \001(\014\"E\n\037ListDevice" +
-      "ConfigVersionsRequest\022\014\n\004name\030\001 \001(\t\022\024\n\014n" +
+      "ConfigVersionsRequest\022\014\n\004name\030\001 \001(\t\022\024\n\014n",
       "um_versions\030\002 \001(\005\"]\n ListDeviceConfigVer" +
       "sionsResponse\0229\n\016device_configs\030\001 \003(\0132!." +
       "google.cloud.iot.v1.DeviceConfig\";\n\027List" +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       "iot.v1.DeviceState2\223\034\n\rDeviceManager\022\266\001\n" +
       "\024CreateDeviceRegistry\0220.google.cloud.iot" +
       ".v1.CreateDeviceRegistryRequest\032#.google" +
-      ".cloud.iot.v1.DeviceRegistry\"G\202\323\344\223\002A\"./v" +
+      ".cloud.iot.v1.DeviceRegistry\"G\202\323\344\223\002A\"./v",
       "1/{parent=projects/*/locations/*}/regist" +
       "ries:\017device_registry\022\237\001\n\021GetDeviceRegis" +
       "try\022-.google.cloud.iot.v1.GetDeviceRegis" +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       "Registry\0220.google.cloud.iot.v1.UpdateDev" +
       "iceRegistryRequest\032#.google.cloud.iot.v1" +
       ".DeviceRegistry\"W\202\323\344\223\002Q2>/v1/{device_reg" +
-      "istry.name=projects/*/locations/*/regist" +
+      "istry.name=projects/*/locations/*/regist",
       "ries/*}:\017device_registry\022\230\001\n\024DeleteDevic" +
       "eRegistry\0220.google.cloud.iot.v1.DeleteDe" +
       "viceRegistryRequest\032\026.google.protobuf.Em" +
@@ -177,7 +177,7 @@ public static void registerAllExtensions(
       "istriesRequest\0321.google.cloud.iot.v1.Lis" +
       "tDeviceRegistriesResponse\"6\202\323\344\223\0020\022./v1/{" +
       "parent=projects/*/locations/*}/registrie" +
-      "s\022\237\001\n\014CreateDevice\022(.google.cloud.iot.v1" +
+      "s\022\237\001\n\014CreateDevice\022(.google.cloud.iot.v1",
       ".CreateDeviceRequest\032\033.google.cloud.iot." +
       "v1.Device\"H\202\323\344\223\002B\"8/v1/{parent=projects/" +
       "*/locations/*/registries/*}/devices:\006dev" +
@@ -187,7 +187,7 @@ public static void registerAllExtensions(
       "ations/*/registries/*/devices/*}ZC\022A/v1/" +
       "{name=projects/*/locations/*/registries/" +
       "*/groups/*/devices/*}\022\374\001\n\014UpdateDevice\022(" +
-      ".google.cloud.iot.v1.UpdateDeviceRequest" +
+      ".google.cloud.iot.v1.UpdateDeviceRequest",
       "\032\033.google.cloud.iot.v1.Device\"\244\001\202\323\344\223\002\235\0012" +
       "?/v1/{device.name=projects/*/locations/*" +
       "/registries/*/devices/*}:\006deviceZR2H/v1/" +
@@ -197,7 +197,7 @@ public static void registerAllExtensions(
       "teDeviceRequest\032\026.google.protobuf.Empty\"" +
       "\205\001\202\323\344\223\002\177*8/v1/{name=projects/*/locations" +
       "/*/registries/*/devices/*}ZC*A/v1/{name=" +
-      "projects/*/locations/*/registries/*/grou" +
+      "projects/*/locations/*/registries/*/grou",
       "ps/*/devices/*}\022\332\001\n\013ListDevices\022\'.google" +
       ".cloud.iot.v1.ListDevicesRequest\032(.googl" +
       "e.cloud.iot.v1.ListDevicesResponse\"x\202\323\344\223" +
@@ -207,7 +207,7 @@ public static void registerAllExtensions(
       "\031ModifyCloudToDeviceConfig\0225.google.clou" +
       "d.iot.v1.ModifyCloudToDeviceConfigReques" +
       "t\032!.google.cloud.iot.v1.DeviceConfig\"\300\001\202" +
-      "\323\344\223\002\271\001\"R/v1/{name=projects/*/locations/*" +
+      "\323\344\223\002\271\001\"R/v1/{name=projects/*/locations/*",
       "/registries/*/devices/*}:modifyCloudToDe" +
       "viceConfig:\001*Z`\"[/v1/{name=projects/*/lo" +
       "cations/*/registries/*/groups/*/devices/" +
@@ -217,7 +217,7 @@ public static void registerAllExtensions(
       "gle.cloud.iot.v1.ListDeviceConfigVersion" +
       "sResponse\"\244\001\202\323\344\223\002\235\001\022G/v1/{name=projects/" +
       "*/locations/*/registries/*/devices/*}/co" +
-      "nfigVersionsZR\022P/v1/{name=projects/*/loc" +
+      "nfigVersionsZR\022P/v1/{name=projects/*/loc",
       "ations/*/registries/*/groups/*/devices/*" +
       "}/configVersions\022\206\002\n\020ListDeviceStates\022,." +
       "google.cloud.iot.v1.ListDeviceStatesRequ" +
@@ -227,7 +227,7 @@ public static void registerAllExtensions(
       "tatesZJ\022H/v1/{name=projects/*/locations/" +
       "*/registries/*/groups/*/devices/*}/state" +
       "s\022\346\001\n\014SetIamPolicy\022\".google.iam.v1.SetIa" +
-      "mPolicyRequest\032\025.google.iam.v1.Policy\"\232\001" +
+      "mPolicyRequest\032\025.google.iam.v1.Policy\"\232\001",
       "\202\323\344\223\002\223\001\"?/v1/{resource=projects/*/locati" +
       "ons/*/registries/*}:setIamPolicy:\001*ZM\"H/" +
       "v1/{resource=projects/*/locations/*/regi" +
@@ -237,7 +237,7 @@ public static void registerAllExtensions(
       "\"?/v1/{resource=projects/*/locations/*/r" +
       "egistries/*}:getIamPolicy:\001*ZM\"H/v1/{res" +
       "ource=projects/*/locations/*/registries/" +
-      "*/groups/*}:getIamPolicy:\001*\022\222\002\n\022TestIamP" +
+      "*/groups/*}:getIamPolicy:\001*\022\222\002\n\022TestIamP",
       "ermissions\022(.google.iam.v1.TestIamPermis" +
       "sionsRequest\032).google.iam.v1.TestIamPerm" +
       "issionsResponse\"\246\001\202\323\344\223\002\237\001\"E/v1/{resource" +
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceRegistry.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceRegistry.java
index baf9d226b8c4..fbe453b35764 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceRegistry.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceRegistry.java
@@ -36,9 +36,6 @@ private DeviceRegistry(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private DeviceRegistry(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -119,13 +123,6 @@ private DeviceRegistry(
                 input.readMessage(com.google.cloud.iot.v1.EventNotificationConfig.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -149,7 +146,6 @@ private DeviceRegistry(
     return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceRegistry_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceRegistry_fieldAccessorTable
@@ -554,7 +550,6 @@ public com.google.cloud.iot.v1.RegistryCredentialOrBuilder getCredentialsOrBuild
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -564,7 +559,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getIdBytes().isEmpty()) {
@@ -591,7 +585,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -772,7 +765,6 @@ public static com.google.cloud.iot.v1.DeviceRegistry parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -780,7 +772,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.iot.v1.DeviceRegistry prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -808,7 +799,6 @@ public static final class Builder extends
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceRegistry_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceRegistry_fieldAccessorTable
@@ -833,7 +823,6 @@ private void maybeForceBuilderInitialization() {
         getCredentialsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       id_ = "";
@@ -873,18 +862,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceRegistry_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.DeviceRegistry getDefaultInstanceForType() {
       return com.google.cloud.iot.v1.DeviceRegistry.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.DeviceRegistry build() {
       com.google.cloud.iot.v1.DeviceRegistry result = buildPartial();
       if (!result.isInitialized()) {
@@ -893,7 +879,6 @@ public com.google.cloud.iot.v1.DeviceRegistry build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.DeviceRegistry buildPartial() {
       com.google.cloud.iot.v1.DeviceRegistry result = new com.google.cloud.iot.v1.DeviceRegistry(this);
       int from_bitField0_ = bitField0_;
@@ -938,39 +923,32 @@ public com.google.cloud.iot.v1.DeviceRegistry buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.iot.v1.DeviceRegistry) {
         return mergeFrom((com.google.cloud.iot.v1.DeviceRegistry)other);
@@ -1056,12 +1034,10 @@ public Builder mergeFrom(com.google.cloud.iot.v1.DeviceRegistry other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2697,13 +2673,11 @@ public com.google.cloud.iot.v1.RegistryCredential.Builder addCredentialsBuilder(
       }
       return credentialsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2725,12 +2699,11 @@ public static com.google.cloud.iot.v1.DeviceRegistry getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeviceRegistry parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeviceRegistry(input, extensionRegistry);
+        return new DeviceRegistry(input, extensionRegistry);
     }
   };
 
@@ -2743,7 +2716,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.iot.v1.DeviceRegistry getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceState.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceState.java
index 07f84beb3b67..2cf58dec58fb 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceState.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/DeviceState.java
@@ -33,9 +33,6 @@ private DeviceState(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private DeviceState(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.protobuf.Timestamp.Builder subBuilder = null;
             if (updateTime_ != null) {
@@ -65,13 +69,6 @@ private DeviceState(
             binaryData_ = input.readBytes();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -89,7 +86,6 @@ private DeviceState(
     return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceState_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceState_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.protobuf.ByteString getBinaryData() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (updateTime_ != null) {
@@ -169,7 +163,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -298,7 +291,6 @@ public static com.google.cloud.iot.v1.DeviceState parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -306,7 +298,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.iot.v1.DeviceState prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -334,7 +325,6 @@ public static final class Builder extends
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceState_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceState_fieldAccessorTable
@@ -357,7 +347,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (updateTimeBuilder_ == null) {
@@ -371,18 +360,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_DeviceState_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.DeviceState getDefaultInstanceForType() {
       return com.google.cloud.iot.v1.DeviceState.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.DeviceState build() {
       com.google.cloud.iot.v1.DeviceState result = buildPartial();
       if (!result.isInitialized()) {
@@ -391,7 +377,6 @@ public com.google.cloud.iot.v1.DeviceState build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.DeviceState buildPartial() {
       com.google.cloud.iot.v1.DeviceState result = new com.google.cloud.iot.v1.DeviceState(this);
       if (updateTimeBuilder_ == null) {
@@ -404,39 +389,32 @@ public com.google.cloud.iot.v1.DeviceState buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.iot.v1.DeviceState) {
         return mergeFrom((com.google.cloud.iot.v1.DeviceState)other);
@@ -459,12 +437,10 @@ public Builder mergeFrom(com.google.cloud.iot.v1.DeviceState other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -685,13 +661,11 @@ public Builder clearBinaryData() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -713,12 +687,11 @@ public static com.google.cloud.iot.v1.DeviceState getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeviceState parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeviceState(input, extensionRegistry);
+        return new DeviceState(input, extensionRegistry);
     }
   };
 
@@ -731,7 +704,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.iot.v1.DeviceState getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/EventNotificationConfig.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/EventNotificationConfig.java
index ca3e74c789df..c9889747bc71 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/EventNotificationConfig.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/EventNotificationConfig.java
@@ -34,9 +34,6 @@ private EventNotificationConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private EventNotificationConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private EventNotificationConfig(
             subfolderMatches_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private EventNotificationConfig(
     return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_EventNotificationConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_EventNotificationConfig_fieldAccessorTable
@@ -185,7 +181,6 @@ public java.lang.String getPubsubTopicName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -195,7 +190,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getPubsubTopicNameBytes().isEmpty()) {
@@ -207,7 +201,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -329,7 +322,6 @@ public static com.google.cloud.iot.v1.EventNotificationConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -337,7 +329,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.iot.v1.EventNotificationConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -365,7 +356,6 @@ public static final class Builder extends
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_EventNotificationConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_EventNotificationConfig_fieldAccessorTable
@@ -388,7 +378,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       subfolderMatches_ = "";
@@ -398,18 +387,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_EventNotificationConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.EventNotificationConfig getDefaultInstanceForType() {
       return com.google.cloud.iot.v1.EventNotificationConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.EventNotificationConfig build() {
       com.google.cloud.iot.v1.EventNotificationConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -418,7 +404,6 @@ public com.google.cloud.iot.v1.EventNotificationConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.EventNotificationConfig buildPartial() {
       com.google.cloud.iot.v1.EventNotificationConfig result = new com.google.cloud.iot.v1.EventNotificationConfig(this);
       result.subfolderMatches_ = subfolderMatches_;
@@ -427,39 +412,32 @@ public com.google.cloud.iot.v1.EventNotificationConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.iot.v1.EventNotificationConfig) {
         return mergeFrom((com.google.cloud.iot.v1.EventNotificationConfig)other);
@@ -484,12 +462,10 @@ public Builder mergeFrom(com.google.cloud.iot.v1.EventNotificationConfig other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -705,13 +681,11 @@ public Builder setPubsubTopicNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -733,12 +707,11 @@ public static com.google.cloud.iot.v1.EventNotificationConfig getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public EventNotificationConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new EventNotificationConfig(input, extensionRegistry);
+        return new EventNotificationConfig(input, extensionRegistry);
     }
   };
 
@@ -751,7 +724,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.iot.v1.EventNotificationConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRegistryRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRegistryRequest.java
index c2aa5d8c4188..4ec6ea7f0f95 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRegistryRequest.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRegistryRequest.java
@@ -33,9 +33,6 @@ private GetDeviceRegistryRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetDeviceRegistryRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetDeviceRegistryRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetDeviceRegistryRequest(
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_GetDeviceRegistryRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_GetDeviceRegistryRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.cloud.iot.v1.GetDeviceRegistryRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.iot.v1.GetDeviceRegistryRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_GetDeviceRegistryRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_GetDeviceRegistryRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_GetDeviceRegistryRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.GetDeviceRegistryRequest getDefaultInstanceForType() {
       return com.google.cloud.iot.v1.GetDeviceRegistryRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.GetDeviceRegistryRequest build() {
       com.google.cloud.iot.v1.GetDeviceRegistryRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.cloud.iot.v1.GetDeviceRegistryRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.GetDeviceRegistryRequest buildPartial() {
       com.google.cloud.iot.v1.GetDeviceRegistryRequest result = new com.google.cloud.iot.v1.GetDeviceRegistryRequest(this);
       result.name_ = name_;
@@ -359,39 +344,32 @@ public com.google.cloud.iot.v1.GetDeviceRegistryRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.iot.v1.GetDeviceRegistryRequest) {
         return mergeFrom((com.google.cloud.iot.v1.GetDeviceRegistryRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.cloud.iot.v1.GetDeviceRegistryRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.cloud.iot.v1.GetDeviceRegistryRequest getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetDeviceRegistryRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetDeviceRegistryRequest(input, extensionRegistry);
+        return new GetDeviceRegistryRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.iot.v1.GetDeviceRegistryRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRequest.java
index a8efd4093df8..fffd75593df5 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRequest.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/GetDeviceRequest.java
@@ -33,9 +33,6 @@ private GetDeviceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private GetDeviceRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private GetDeviceRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private GetDeviceRequest(
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_GetDeviceRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_GetDeviceRequest_fieldAccessorTable
@@ -181,7 +177,6 @@ public com.google.protobuf.FieldMaskOrBuilder getFieldMaskOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -191,7 +186,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -203,7 +197,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -331,7 +324,6 @@ public static com.google.cloud.iot.v1.GetDeviceRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -339,7 +331,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.iot.v1.GetDeviceRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -367,7 +358,6 @@ public static final class Builder extends
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_GetDeviceRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_GetDeviceRequest_fieldAccessorTable
@@ -390,7 +380,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -404,18 +393,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_GetDeviceRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.GetDeviceRequest getDefaultInstanceForType() {
       return com.google.cloud.iot.v1.GetDeviceRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.GetDeviceRequest build() {
       com.google.cloud.iot.v1.GetDeviceRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -424,7 +410,6 @@ public com.google.cloud.iot.v1.GetDeviceRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.GetDeviceRequest buildPartial() {
       com.google.cloud.iot.v1.GetDeviceRequest result = new com.google.cloud.iot.v1.GetDeviceRequest(this);
       result.name_ = name_;
@@ -437,39 +422,32 @@ public com.google.cloud.iot.v1.GetDeviceRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.iot.v1.GetDeviceRequest) {
         return mergeFrom((com.google.cloud.iot.v1.GetDeviceRequest)other);
@@ -493,12 +471,10 @@ public Builder mergeFrom(com.google.cloud.iot.v1.GetDeviceRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -777,13 +753,11 @@ public com.google.protobuf.FieldMaskOrBuilder getFieldMaskOrBuilder() {
       }
       return fieldMaskBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -805,12 +779,11 @@ public static com.google.cloud.iot.v1.GetDeviceRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetDeviceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetDeviceRequest(input, extensionRegistry);
+        return new GetDeviceRequest(input, extensionRegistry);
     }
   };
 
@@ -823,7 +796,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.iot.v1.GetDeviceRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/HttpConfig.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/HttpConfig.java
index 5069a73a1eef..63c4d5ccf5fd 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/HttpConfig.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/HttpConfig.java
@@ -33,9 +33,6 @@ private HttpConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private HttpConfig(
           case 0:
             done = true;
             break;
-          case 8: {
-            int rawValue = input.readEnum();
-
-            httpEnabledState_ = rawValue;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private HttpConfig(
             }
             break;
           }
+          case 8: {
+            int rawValue = input.readEnum();
+
+            httpEnabledState_ = rawValue;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private HttpConfig(
     return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_HttpConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_HttpConfig_fieldAccessorTable
@@ -107,13 +103,11 @@ public int getHttpEnabledStateValue() {
    * .google.cloud.iot.v1.HttpState http_enabled_state = 1;
    */
   public com.google.cloud.iot.v1.HttpState getHttpEnabledState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.iot.v1.HttpState result = com.google.cloud.iot.v1.HttpState.valueOf(httpEnabledState_);
     return result == null ? com.google.cloud.iot.v1.HttpState.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -123,7 +117,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (httpEnabledState_ != com.google.cloud.iot.v1.HttpState.HTTP_STATE_UNSPECIFIED.getNumber()) {
@@ -132,7 +125,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -247,7 +239,6 @@ public static com.google.cloud.iot.v1.HttpConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -255,7 +246,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.iot.v1.HttpConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -283,7 +273,6 @@ public static final class Builder extends
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_HttpConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_HttpConfig_fieldAccessorTable
@@ -306,7 +295,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       httpEnabledState_ = 0;
@@ -314,18 +302,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_HttpConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.HttpConfig getDefaultInstanceForType() {
       return com.google.cloud.iot.v1.HttpConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.HttpConfig build() {
       com.google.cloud.iot.v1.HttpConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -334,7 +319,6 @@ public com.google.cloud.iot.v1.HttpConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.HttpConfig buildPartial() {
       com.google.cloud.iot.v1.HttpConfig result = new com.google.cloud.iot.v1.HttpConfig(this);
       result.httpEnabledState_ = httpEnabledState_;
@@ -342,39 +326,32 @@ public com.google.cloud.iot.v1.HttpConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.iot.v1.HttpConfig) {
         return mergeFrom((com.google.cloud.iot.v1.HttpConfig)other);
@@ -394,12 +371,10 @@ public Builder mergeFrom(com.google.cloud.iot.v1.HttpConfig other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -452,7 +427,6 @@ public Builder setHttpEnabledStateValue(int value) {
      * .google.cloud.iot.v1.HttpState http_enabled_state = 1;
      */
     public com.google.cloud.iot.v1.HttpState getHttpEnabledState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.iot.v1.HttpState result = com.google.cloud.iot.v1.HttpState.valueOf(httpEnabledState_);
       return result == null ? com.google.cloud.iot.v1.HttpState.UNRECOGNIZED : result;
     }
@@ -487,13 +461,11 @@ public Builder clearHttpEnabledState() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -515,12 +487,11 @@ public static com.google.cloud.iot.v1.HttpConfig getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public HttpConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new HttpConfig(input, extensionRegistry);
+        return new HttpConfig(input, extensionRegistry);
     }
   };
 
@@ -533,7 +504,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.iot.v1.HttpConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsRequest.java
index ba2eafacf35e..787816cb797d 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsRequest.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsRequest.java
@@ -34,9 +34,6 @@ private ListDeviceConfigVersionsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListDeviceConfigVersionsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -59,13 +63,6 @@ private ListDeviceConfigVersionsRequest(
             numVersions_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private ListDeviceConfigVersionsRequest(
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceConfigVersionsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceConfigVersionsRequest_fieldAccessorTable
@@ -153,7 +149,6 @@ public int getNumVersions() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -163,7 +158,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -175,7 +169,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -298,7 +291,6 @@ public static com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -306,7 +298,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -334,7 +325,6 @@ public static final class Builder extends
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceConfigVersionsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceConfigVersionsRequest_fieldAccessorTable
@@ -357,7 +347,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -367,18 +356,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceConfigVersionsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest getDefaultInstanceForType() {
       return com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest build() {
       com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -387,7 +373,6 @@ public com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest buildPartial() {
       com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest result = new com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest(this);
       result.name_ = name_;
@@ -396,39 +381,32 @@ public com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest) {
         return mergeFrom((com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest)other);
@@ -452,12 +430,10 @@ public Builder mergeFrom(com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -618,13 +594,11 @@ public Builder clearNumVersions() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -646,12 +620,11 @@ public static com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest getDefault
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListDeviceConfigVersionsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDeviceConfigVersionsRequest(input, extensionRegistry);
+        return new ListDeviceConfigVersionsRequest(input, extensionRegistry);
     }
   };
 
@@ -664,7 +637,6 @@ public com.google.protobuf.Parser getParserForT
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.iot.v1.ListDeviceConfigVersionsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsResponse.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsResponse.java
index c129509f5164..accee11e2e76 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsResponse.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceConfigVersionsResponse.java
@@ -33,9 +33,6 @@ private ListDeviceConfigVersionsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ListDeviceConfigVersionsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               deviceConfigs_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private ListDeviceConfigVersionsResponse(
                 input.readMessage(com.google.cloud.iot.v1.DeviceConfig.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private ListDeviceConfigVersionsResponse(
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceConfigVersionsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceConfigVersionsResponse_fieldAccessorTable
@@ -152,7 +148,6 @@ public com.google.cloud.iot.v1.DeviceConfigOrBuilder getDeviceConfigsOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -162,7 +157,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < deviceConfigs_.size(); i++) {
@@ -171,7 +165,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -289,7 +282,6 @@ public static com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse parseFrom
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -297,7 +289,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -325,7 +316,6 @@ public static final class Builder extends
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceConfigVersionsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceConfigVersionsResponse_fieldAccessorTable
@@ -349,7 +339,6 @@ private void maybeForceBuilderInitialization() {
         getDeviceConfigsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (deviceConfigsBuilder_ == null) {
@@ -361,18 +350,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceConfigVersionsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse getDefaultInstanceForType() {
       return com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse build() {
       com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -381,7 +367,6 @@ public com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse buildPartial() {
       com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse result = new com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -398,39 +383,32 @@ public com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse) {
         return mergeFrom((com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse)other);
@@ -473,12 +451,10 @@ public Builder mergeFrom(com.google.cloud.iot.v1.ListDeviceConfigVersionsRespons
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -827,13 +803,11 @@ public com.google.cloud.iot.v1.DeviceConfig.Builder addDeviceConfigsBuilder(
       }
       return deviceConfigsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -855,12 +829,11 @@ public static com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse getDefaul
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListDeviceConfigVersionsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDeviceConfigVersionsResponse(input, extensionRegistry);
+        return new ListDeviceConfigVersionsResponse(input, extensionRegistry);
     }
   };
 
@@ -873,7 +846,6 @@ public com.google.protobuf.Parser getParserFor
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.iot.v1.ListDeviceConfigVersionsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesRequest.java
index 2c56c7757f6a..e2cfc8803a7f 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesRequest.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesRequest.java
@@ -35,9 +35,6 @@ private ListDeviceRegistriesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListDeviceRegistriesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ListDeviceRegistriesRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListDeviceRegistriesRequest(
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceRegistriesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceRegistriesRequest_fieldAccessorTable
@@ -205,7 +201,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -215,7 +210,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -230,7 +224,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -360,7 +353,6 @@ public static com.google.cloud.iot.v1.ListDeviceRegistriesRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -368,7 +360,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.iot.v1.ListDeviceRegistriesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -396,7 +387,6 @@ public static final class Builder extends
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceRegistriesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceRegistriesRequest_fieldAccessorTable
@@ -419,7 +409,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -431,18 +420,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceRegistriesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.ListDeviceRegistriesRequest getDefaultInstanceForType() {
       return com.google.cloud.iot.v1.ListDeviceRegistriesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.ListDeviceRegistriesRequest build() {
       com.google.cloud.iot.v1.ListDeviceRegistriesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -451,7 +437,6 @@ public com.google.cloud.iot.v1.ListDeviceRegistriesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.ListDeviceRegistriesRequest buildPartial() {
       com.google.cloud.iot.v1.ListDeviceRegistriesRequest result = new com.google.cloud.iot.v1.ListDeviceRegistriesRequest(this);
       result.parent_ = parent_;
@@ -461,39 +446,32 @@ public com.google.cloud.iot.v1.ListDeviceRegistriesRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.iot.v1.ListDeviceRegistriesRequest) {
         return mergeFrom((com.google.cloud.iot.v1.ListDeviceRegistriesRequest)other);
@@ -521,12 +499,10 @@ public Builder mergeFrom(com.google.cloud.iot.v1.ListDeviceRegistriesRequest oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -784,13 +760,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -812,12 +786,11 @@ public static com.google.cloud.iot.v1.ListDeviceRegistriesRequest getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListDeviceRegistriesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDeviceRegistriesRequest(input, extensionRegistry);
+        return new ListDeviceRegistriesRequest(input, extensionRegistry);
     }
   };
 
@@ -830,7 +803,6 @@ public com.google.protobuf.Parser getParserForType(
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.iot.v1.ListDeviceRegistriesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesResponse.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesResponse.java
index 6117f6d9cd4b..c9260ad41684 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesResponse.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceRegistriesResponse.java
@@ -34,9 +34,6 @@ private ListDeviceRegistriesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListDeviceRegistriesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               deviceRegistries_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListDeviceRegistriesResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListDeviceRegistriesResponse(
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceRegistriesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceRegistriesResponse_fieldAccessorTable
@@ -201,7 +197,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -211,7 +206,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < deviceRegistries_.size(); i++) {
@@ -223,7 +217,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.cloud.iot.v1.ListDeviceRegistriesResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.iot.v1.ListDeviceRegistriesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceRegistriesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceRegistriesResponse_fieldAccessorTable
@@ -408,7 +398,6 @@ private void maybeForceBuilderInitialization() {
         getDeviceRegistriesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (deviceRegistriesBuilder_ == null) {
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceRegistriesResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.ListDeviceRegistriesResponse getDefaultInstanceForType() {
       return com.google.cloud.iot.v1.ListDeviceRegistriesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.ListDeviceRegistriesResponse build() {
       com.google.cloud.iot.v1.ListDeviceRegistriesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public com.google.cloud.iot.v1.ListDeviceRegistriesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.ListDeviceRegistriesResponse buildPartial() {
       com.google.cloud.iot.v1.ListDeviceRegistriesResponse result = new com.google.cloud.iot.v1.ListDeviceRegistriesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -462,39 +447,32 @@ public com.google.cloud.iot.v1.ListDeviceRegistriesResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.iot.v1.ListDeviceRegistriesResponse) {
         return mergeFrom((com.google.cloud.iot.v1.ListDeviceRegistriesResponse)other);
@@ -541,12 +519,10 @@ public Builder mergeFrom(com.google.cloud.iot.v1.ListDeviceRegistriesResponse ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -976,13 +952,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1004,12 +978,11 @@ public static com.google.cloud.iot.v1.ListDeviceRegistriesResponse getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListDeviceRegistriesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDeviceRegistriesResponse(input, extensionRegistry);
+        return new ListDeviceRegistriesResponse(input, extensionRegistry);
     }
   };
 
@@ -1022,7 +995,6 @@ public com.google.protobuf.Parser getParserForType
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.iot.v1.ListDeviceRegistriesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesRequest.java
index 40ab95965226..8cf3acbf78d7 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesRequest.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesRequest.java
@@ -34,9 +34,6 @@ private ListDeviceStatesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListDeviceStatesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -59,13 +63,6 @@ private ListDeviceStatesRequest(
             numStates_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private ListDeviceStatesRequest(
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceStatesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceStatesRequest_fieldAccessorTable
@@ -153,7 +149,6 @@ public int getNumStates() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -163,7 +158,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -175,7 +169,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -298,7 +291,6 @@ public static com.google.cloud.iot.v1.ListDeviceStatesRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -306,7 +298,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.iot.v1.ListDeviceStatesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -334,7 +325,6 @@ public static final class Builder extends
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceStatesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceStatesRequest_fieldAccessorTable
@@ -357,7 +347,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -367,18 +356,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceStatesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.ListDeviceStatesRequest getDefaultInstanceForType() {
       return com.google.cloud.iot.v1.ListDeviceStatesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.ListDeviceStatesRequest build() {
       com.google.cloud.iot.v1.ListDeviceStatesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -387,7 +373,6 @@ public com.google.cloud.iot.v1.ListDeviceStatesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.ListDeviceStatesRequest buildPartial() {
       com.google.cloud.iot.v1.ListDeviceStatesRequest result = new com.google.cloud.iot.v1.ListDeviceStatesRequest(this);
       result.name_ = name_;
@@ -396,39 +381,32 @@ public com.google.cloud.iot.v1.ListDeviceStatesRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.iot.v1.ListDeviceStatesRequest) {
         return mergeFrom((com.google.cloud.iot.v1.ListDeviceStatesRequest)other);
@@ -452,12 +430,10 @@ public Builder mergeFrom(com.google.cloud.iot.v1.ListDeviceStatesRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -618,13 +594,11 @@ public Builder clearNumStates() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -646,12 +620,11 @@ public static com.google.cloud.iot.v1.ListDeviceStatesRequest getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListDeviceStatesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDeviceStatesRequest(input, extensionRegistry);
+        return new ListDeviceStatesRequest(input, extensionRegistry);
     }
   };
 
@@ -664,7 +637,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.iot.v1.ListDeviceStatesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesResponse.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesResponse.java
index e9f255d4ead3..7c2f2e25f56a 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesResponse.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDeviceStatesResponse.java
@@ -33,9 +33,6 @@ private ListDeviceStatesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ListDeviceStatesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               deviceStates_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private ListDeviceStatesResponse(
                 input.readMessage(com.google.cloud.iot.v1.DeviceState.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private ListDeviceStatesResponse(
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceStatesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceStatesResponse_fieldAccessorTable
@@ -152,7 +148,6 @@ public com.google.cloud.iot.v1.DeviceStateOrBuilder getDeviceStatesOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -162,7 +157,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < deviceStates_.size(); i++) {
@@ -171,7 +165,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -289,7 +282,6 @@ public static com.google.cloud.iot.v1.ListDeviceStatesResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -297,7 +289,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.iot.v1.ListDeviceStatesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -325,7 +316,6 @@ public static final class Builder extends
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceStatesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceStatesResponse_fieldAccessorTable
@@ -349,7 +339,6 @@ private void maybeForceBuilderInitialization() {
         getDeviceStatesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (deviceStatesBuilder_ == null) {
@@ -361,18 +350,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDeviceStatesResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.ListDeviceStatesResponse getDefaultInstanceForType() {
       return com.google.cloud.iot.v1.ListDeviceStatesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.ListDeviceStatesResponse build() {
       com.google.cloud.iot.v1.ListDeviceStatesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -381,7 +367,6 @@ public com.google.cloud.iot.v1.ListDeviceStatesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.ListDeviceStatesResponse buildPartial() {
       com.google.cloud.iot.v1.ListDeviceStatesResponse result = new com.google.cloud.iot.v1.ListDeviceStatesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -398,39 +383,32 @@ public com.google.cloud.iot.v1.ListDeviceStatesResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.iot.v1.ListDeviceStatesResponse) {
         return mergeFrom((com.google.cloud.iot.v1.ListDeviceStatesResponse)other);
@@ -473,12 +451,10 @@ public Builder mergeFrom(com.google.cloud.iot.v1.ListDeviceStatesResponse other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -827,13 +803,11 @@ public com.google.cloud.iot.v1.DeviceState.Builder addDeviceStatesBuilder(
       }
       return deviceStatesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -855,12 +829,11 @@ public static com.google.cloud.iot.v1.ListDeviceStatesResponse getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListDeviceStatesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDeviceStatesResponse(input, extensionRegistry);
+        return new ListDeviceStatesResponse(input, extensionRegistry);
     }
   };
 
@@ -873,7 +846,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.iot.v1.ListDeviceStatesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesRequest.java
index a16367428cd0..54311b33531a 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesRequest.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesRequest.java
@@ -37,9 +37,6 @@ private ListDevicesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private ListDevicesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -111,13 +115,6 @@ private ListDevicesRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -141,7 +138,6 @@ private ListDevicesRequest(
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDevicesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDevicesRequest_fieldAccessorTable
@@ -387,7 +383,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -397,7 +392,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     getSerializedSize();
@@ -426,7 +420,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -603,7 +596,6 @@ public static com.google.cloud.iot.v1.ListDevicesRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -611,7 +603,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.iot.v1.ListDevicesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -639,7 +630,6 @@ public static final class Builder extends
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDevicesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDevicesRequest_fieldAccessorTable
@@ -662,7 +652,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -684,18 +673,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDevicesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.ListDevicesRequest getDefaultInstanceForType() {
       return com.google.cloud.iot.v1.ListDevicesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.ListDevicesRequest build() {
       com.google.cloud.iot.v1.ListDevicesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -704,7 +690,6 @@ public com.google.cloud.iot.v1.ListDevicesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.ListDevicesRequest buildPartial() {
       com.google.cloud.iot.v1.ListDevicesRequest result = new com.google.cloud.iot.v1.ListDevicesRequest(this);
       int from_bitField0_ = bitField0_;
@@ -732,39 +717,32 @@ public com.google.cloud.iot.v1.ListDevicesRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.iot.v1.ListDevicesRequest) {
         return mergeFrom((com.google.cloud.iot.v1.ListDevicesRequest)other);
@@ -815,12 +793,10 @@ public Builder mergeFrom(com.google.cloud.iot.v1.ListDevicesRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1499,13 +1475,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1527,12 +1501,11 @@ public static com.google.cloud.iot.v1.ListDevicesRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListDevicesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDevicesRequest(input, extensionRegistry);
+        return new ListDevicesRequest(input, extensionRegistry);
     }
   };
 
@@ -1545,7 +1518,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.iot.v1.ListDevicesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesResponse.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesResponse.java
index 0a9496324bc4..e99e8bc61dd6 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesResponse.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ListDevicesResponse.java
@@ -34,9 +34,6 @@ private ListDevicesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListDevicesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               devices_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListDevicesResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListDevicesResponse(
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDevicesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDevicesResponse_fieldAccessorTable
@@ -199,7 +195,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -209,7 +204,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < devices_.size(); i++) {
@@ -221,7 +215,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -346,7 +339,6 @@ public static com.google.cloud.iot.v1.ListDevicesResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -354,7 +346,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.iot.v1.ListDevicesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -382,7 +373,6 @@ public static final class Builder extends
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDevicesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDevicesResponse_fieldAccessorTable
@@ -406,7 +396,6 @@ private void maybeForceBuilderInitialization() {
         getDevicesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (devicesBuilder_ == null) {
@@ -420,18 +409,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ListDevicesResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.ListDevicesResponse getDefaultInstanceForType() {
       return com.google.cloud.iot.v1.ListDevicesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.ListDevicesResponse build() {
       com.google.cloud.iot.v1.ListDevicesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -440,7 +426,6 @@ public com.google.cloud.iot.v1.ListDevicesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.ListDevicesResponse buildPartial() {
       com.google.cloud.iot.v1.ListDevicesResponse result = new com.google.cloud.iot.v1.ListDevicesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -460,39 +445,32 @@ public com.google.cloud.iot.v1.ListDevicesResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.iot.v1.ListDevicesResponse) {
         return mergeFrom((com.google.cloud.iot.v1.ListDevicesResponse)other);
@@ -539,12 +517,10 @@ public Builder mergeFrom(com.google.cloud.iot.v1.ListDevicesResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -969,13 +945,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -997,12 +971,11 @@ public static com.google.cloud.iot.v1.ListDevicesResponse getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListDevicesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDevicesResponse(input, extensionRegistry);
+        return new ListDevicesResponse(input, extensionRegistry);
     }
   };
 
@@ -1015,7 +988,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.iot.v1.ListDevicesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ModifyCloudToDeviceConfigRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ModifyCloudToDeviceConfigRequest.java
index e2fab1be1594..43c17341a105 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ModifyCloudToDeviceConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ModifyCloudToDeviceConfigRequest.java
@@ -35,9 +35,6 @@ private ModifyCloudToDeviceConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ModifyCloudToDeviceConfigRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -65,13 +69,6 @@ private ModifyCloudToDeviceConfigRequest(
             binaryData_ = input.readBytes();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -89,7 +86,6 @@ private ModifyCloudToDeviceConfigRequest(
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ModifyCloudToDeviceConfigRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ModifyCloudToDeviceConfigRequest_fieldAccessorTable
@@ -174,7 +170,6 @@ public com.google.protobuf.ByteString getBinaryData() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -184,7 +179,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -199,7 +193,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -331,7 +324,6 @@ public static com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest parseFrom
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -339,7 +331,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -367,7 +358,6 @@ public static final class Builder extends
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ModifyCloudToDeviceConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ModifyCloudToDeviceConfigRequest_fieldAccessorTable
@@ -390,7 +380,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -402,18 +391,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_ModifyCloudToDeviceConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest getDefaultInstanceForType() {
       return com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest build() {
       com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -422,7 +408,6 @@ public com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest buildPartial() {
       com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest result = new com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest(this);
       result.name_ = name_;
@@ -432,39 +417,32 @@ public com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest) {
         return mergeFrom((com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest)other);
@@ -491,12 +469,10 @@ public Builder mergeFrom(com.google.cloud.iot.v1.ModifyCloudToDeviceConfigReques
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -704,13 +680,11 @@ public Builder clearBinaryData() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -732,12 +706,11 @@ public static com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest getDefaul
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ModifyCloudToDeviceConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ModifyCloudToDeviceConfigRequest(input, extensionRegistry);
+        return new ModifyCloudToDeviceConfigRequest(input, extensionRegistry);
     }
   };
 
@@ -750,7 +723,6 @@ public com.google.protobuf.Parser getParserFor
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.iot.v1.ModifyCloudToDeviceConfigRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/MqttConfig.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/MqttConfig.java
index 2302000df5fa..c5115b17099f 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/MqttConfig.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/MqttConfig.java
@@ -33,9 +33,6 @@ private MqttConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private MqttConfig(
           case 0:
             done = true;
             break;
-          case 8: {
-            int rawValue = input.readEnum();
-
-            mqttEnabledState_ = rawValue;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private MqttConfig(
             }
             break;
           }
+          case 8: {
+            int rawValue = input.readEnum();
+
+            mqttEnabledState_ = rawValue;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private MqttConfig(
     return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_MqttConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_MqttConfig_fieldAccessorTable
@@ -107,13 +103,11 @@ public int getMqttEnabledStateValue() {
    * .google.cloud.iot.v1.MqttState mqtt_enabled_state = 1;
    */
   public com.google.cloud.iot.v1.MqttState getMqttEnabledState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.iot.v1.MqttState result = com.google.cloud.iot.v1.MqttState.valueOf(mqttEnabledState_);
     return result == null ? com.google.cloud.iot.v1.MqttState.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -123,7 +117,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (mqttEnabledState_ != com.google.cloud.iot.v1.MqttState.MQTT_STATE_UNSPECIFIED.getNumber()) {
@@ -132,7 +125,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -247,7 +239,6 @@ public static com.google.cloud.iot.v1.MqttConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -255,7 +246,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.iot.v1.MqttConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -283,7 +273,6 @@ public static final class Builder extends
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_MqttConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_MqttConfig_fieldAccessorTable
@@ -306,7 +295,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       mqttEnabledState_ = 0;
@@ -314,18 +302,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_MqttConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.MqttConfig getDefaultInstanceForType() {
       return com.google.cloud.iot.v1.MqttConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.MqttConfig build() {
       com.google.cloud.iot.v1.MqttConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -334,7 +319,6 @@ public com.google.cloud.iot.v1.MqttConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.MqttConfig buildPartial() {
       com.google.cloud.iot.v1.MqttConfig result = new com.google.cloud.iot.v1.MqttConfig(this);
       result.mqttEnabledState_ = mqttEnabledState_;
@@ -342,39 +326,32 @@ public com.google.cloud.iot.v1.MqttConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.iot.v1.MqttConfig) {
         return mergeFrom((com.google.cloud.iot.v1.MqttConfig)other);
@@ -394,12 +371,10 @@ public Builder mergeFrom(com.google.cloud.iot.v1.MqttConfig other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -452,7 +427,6 @@ public Builder setMqttEnabledStateValue(int value) {
      * .google.cloud.iot.v1.MqttState mqtt_enabled_state = 1;
      */
     public com.google.cloud.iot.v1.MqttState getMqttEnabledState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.iot.v1.MqttState result = com.google.cloud.iot.v1.MqttState.valueOf(mqttEnabledState_);
       return result == null ? com.google.cloud.iot.v1.MqttState.UNRECOGNIZED : result;
     }
@@ -487,13 +461,11 @@ public Builder clearMqttEnabledState() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -515,12 +487,11 @@ public static com.google.cloud.iot.v1.MqttConfig getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public MqttConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new MqttConfig(input, extensionRegistry);
+        return new MqttConfig(input, extensionRegistry);
     }
   };
 
@@ -533,7 +504,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.iot.v1.MqttConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificate.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificate.java
index 8ab3bb24bd31..089609a5f795 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificate.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCertificate.java
@@ -34,9 +34,6 @@ private PublicKeyCertificate(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private PublicKeyCertificate(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -73,13 +77,6 @@ private PublicKeyCertificate(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private PublicKeyCertificate(
     return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_PublicKeyCertificate_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_PublicKeyCertificate_fieldAccessorTable
@@ -125,7 +121,6 @@ public int getFormatValue() {
    * .google.cloud.iot.v1.PublicKeyCertificateFormat format = 1;
    */
   public com.google.cloud.iot.v1.PublicKeyCertificateFormat getFormat() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.iot.v1.PublicKeyCertificateFormat result = com.google.cloud.iot.v1.PublicKeyCertificateFormat.valueOf(format_);
     return result == null ? com.google.cloud.iot.v1.PublicKeyCertificateFormat.UNRECOGNIZED : result;
   }
@@ -206,7 +201,6 @@ public com.google.cloud.iot.v1.X509CertificateDetailsOrBuilder getX509DetailsOrB
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -216,7 +210,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (format_ != com.google.cloud.iot.v1.PublicKeyCertificateFormat.UNSPECIFIED_PUBLIC_KEY_CERTIFICATE_FORMAT.getNumber()) {
@@ -231,7 +224,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -366,7 +358,6 @@ public static com.google.cloud.iot.v1.PublicKeyCertificate parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -374,7 +365,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.iot.v1.PublicKeyCertificate prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -402,7 +392,6 @@ public static final class Builder extends
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_PublicKeyCertificate_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_PublicKeyCertificate_fieldAccessorTable
@@ -425,7 +414,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       format_ = 0;
@@ -441,18 +429,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_PublicKeyCertificate_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.PublicKeyCertificate getDefaultInstanceForType() {
       return com.google.cloud.iot.v1.PublicKeyCertificate.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.PublicKeyCertificate build() {
       com.google.cloud.iot.v1.PublicKeyCertificate result = buildPartial();
       if (!result.isInitialized()) {
@@ -461,7 +446,6 @@ public com.google.cloud.iot.v1.PublicKeyCertificate build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.PublicKeyCertificate buildPartial() {
       com.google.cloud.iot.v1.PublicKeyCertificate result = new com.google.cloud.iot.v1.PublicKeyCertificate(this);
       result.format_ = format_;
@@ -475,39 +459,32 @@ public com.google.cloud.iot.v1.PublicKeyCertificate buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.iot.v1.PublicKeyCertificate) {
         return mergeFrom((com.google.cloud.iot.v1.PublicKeyCertificate)other);
@@ -534,12 +511,10 @@ public Builder mergeFrom(com.google.cloud.iot.v1.PublicKeyCertificate other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -589,7 +564,6 @@ public Builder setFormatValue(int value) {
      * .google.cloud.iot.v1.PublicKeyCertificateFormat format = 1;
      */
     public com.google.cloud.iot.v1.PublicKeyCertificateFormat getFormat() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.iot.v1.PublicKeyCertificateFormat result = com.google.cloud.iot.v1.PublicKeyCertificateFormat.valueOf(format_);
       return result == null ? com.google.cloud.iot.v1.PublicKeyCertificateFormat.UNRECOGNIZED : result;
     }
@@ -864,13 +838,11 @@ public com.google.cloud.iot.v1.X509CertificateDetailsOrBuilder getX509DetailsOrB
       }
       return x509DetailsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -892,12 +864,11 @@ public static com.google.cloud.iot.v1.PublicKeyCertificate getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PublicKeyCertificate parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PublicKeyCertificate(input, extensionRegistry);
+        return new PublicKeyCertificate(input, extensionRegistry);
     }
   };
 
@@ -910,7 +881,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.iot.v1.PublicKeyCertificate getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCredential.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCredential.java
index 81356447e909..771896e377c4 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCredential.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/PublicKeyCredential.java
@@ -34,9 +34,6 @@ private PublicKeyCredential(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private PublicKeyCredential(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -60,13 +64,6 @@ private PublicKeyCredential(
             key_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private PublicKeyCredential(
     return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_PublicKeyCredential_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_PublicKeyCredential_fieldAccessorTable
@@ -112,7 +108,6 @@ public int getFormatValue() {
    * .google.cloud.iot.v1.PublicKeyFormat format = 1;
    */
   public com.google.cloud.iot.v1.PublicKeyFormat getFormat() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.iot.v1.PublicKeyFormat result = com.google.cloud.iot.v1.PublicKeyFormat.valueOf(format_);
     return result == null ? com.google.cloud.iot.v1.PublicKeyFormat.UNRECOGNIZED : result;
   }
@@ -160,7 +155,6 @@ public java.lang.String getKey() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -170,7 +164,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (format_ != com.google.cloud.iot.v1.PublicKeyFormat.UNSPECIFIED_PUBLIC_KEY_FORMAT.getNumber()) {
@@ -182,7 +175,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -304,7 +296,6 @@ public static com.google.cloud.iot.v1.PublicKeyCredential parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -312,7 +303,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.iot.v1.PublicKeyCredential prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -340,7 +330,6 @@ public static final class Builder extends
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_PublicKeyCredential_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_PublicKeyCredential_fieldAccessorTable
@@ -363,7 +352,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       format_ = 0;
@@ -373,18 +361,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_PublicKeyCredential_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.PublicKeyCredential getDefaultInstanceForType() {
       return com.google.cloud.iot.v1.PublicKeyCredential.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.PublicKeyCredential build() {
       com.google.cloud.iot.v1.PublicKeyCredential result = buildPartial();
       if (!result.isInitialized()) {
@@ -393,7 +378,6 @@ public com.google.cloud.iot.v1.PublicKeyCredential build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.PublicKeyCredential buildPartial() {
       com.google.cloud.iot.v1.PublicKeyCredential result = new com.google.cloud.iot.v1.PublicKeyCredential(this);
       result.format_ = format_;
@@ -402,39 +386,32 @@ public com.google.cloud.iot.v1.PublicKeyCredential buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.iot.v1.PublicKeyCredential) {
         return mergeFrom((com.google.cloud.iot.v1.PublicKeyCredential)other);
@@ -458,12 +435,10 @@ public Builder mergeFrom(com.google.cloud.iot.v1.PublicKeyCredential other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -513,7 +488,6 @@ public Builder setFormatValue(int value) {
      * .google.cloud.iot.v1.PublicKeyFormat format = 1;
      */
     public com.google.cloud.iot.v1.PublicKeyFormat getFormat() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.iot.v1.PublicKeyFormat result = com.google.cloud.iot.v1.PublicKeyFormat.valueOf(format_);
       return result == null ? com.google.cloud.iot.v1.PublicKeyFormat.UNRECOGNIZED : result;
     }
@@ -635,13 +609,11 @@ public Builder setKeyBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -663,12 +635,11 @@ public static com.google.cloud.iot.v1.PublicKeyCredential getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PublicKeyCredential parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PublicKeyCredential(input, extensionRegistry);
+        return new PublicKeyCredential(input, extensionRegistry);
     }
   };
 
@@ -681,7 +652,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.iot.v1.PublicKeyCredential getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/RegistryCredential.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/RegistryCredential.java
index d2be5029c83a..d64845011e2e 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/RegistryCredential.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/RegistryCredential.java
@@ -32,9 +32,6 @@ private RegistryCredential(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private RegistryCredential(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.iot.v1.PublicKeyCertificate.Builder subBuilder = null;
             if (credentialCase_ == 1) {
@@ -60,13 +64,6 @@ private RegistryCredential(
             credentialCase_ = 1;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private RegistryCredential(
     return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_RegistryCredential_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_RegistryCredential_fieldAccessorTable
@@ -167,7 +163,6 @@ public com.google.cloud.iot.v1.PublicKeyCertificateOrBuilder getPublicKeyCertifi
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -177,7 +172,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (credentialCase_ == 1) {
@@ -186,7 +180,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -317,7 +310,6 @@ public static com.google.cloud.iot.v1.RegistryCredential parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -325,7 +317,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.iot.v1.RegistryCredential prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -353,7 +344,6 @@ public static final class Builder extends
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_RegistryCredential_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_RegistryCredential_fieldAccessorTable
@@ -376,7 +366,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       credentialCase_ = 0;
@@ -384,18 +373,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_RegistryCredential_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.RegistryCredential getDefaultInstanceForType() {
       return com.google.cloud.iot.v1.RegistryCredential.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.RegistryCredential build() {
       com.google.cloud.iot.v1.RegistryCredential result = buildPartial();
       if (!result.isInitialized()) {
@@ -404,7 +390,6 @@ public com.google.cloud.iot.v1.RegistryCredential build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.RegistryCredential buildPartial() {
       com.google.cloud.iot.v1.RegistryCredential result = new com.google.cloud.iot.v1.RegistryCredential(this);
       if (credentialCase_ == 1) {
@@ -419,39 +404,32 @@ public com.google.cloud.iot.v1.RegistryCredential buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.iot.v1.RegistryCredential) {
         return mergeFrom((com.google.cloud.iot.v1.RegistryCredential)other);
@@ -477,12 +455,10 @@ public Builder mergeFrom(com.google.cloud.iot.v1.RegistryCredential other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -687,13 +663,11 @@ public com.google.cloud.iot.v1.PublicKeyCertificateOrBuilder getPublicKeyCertifi
       onChanged();;
       return publicKeyCertificateBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -715,12 +689,11 @@ public static com.google.cloud.iot.v1.RegistryCredential getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RegistryCredential parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RegistryCredential(input, extensionRegistry);
+        return new RegistryCredential(input, extensionRegistry);
     }
   };
 
@@ -733,7 +706,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.iot.v1.RegistryCredential getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ResourcesProto.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ResourcesProto.java
index 97b5949d3561..f23fa82c6ddc 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ResourcesProto.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/ResourcesProto.java
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "v1.DeviceCredential\0227\n\023last_heartbeat_ti" +
       "me\030\007 \001(\0132\032.google.protobuf.Timestamp\0223\n\017" +
       "last_event_time\030\010 \001(\0132\032.google.protobuf." +
-      "Timestamp\0223\n\017last_state_time\030\024 \001(\0132\032.goo" +
+      "Timestamp\0223\n\017last_state_time\030\024 \001(\0132\032.goo",
       "gle.protobuf.Timestamp\0228\n\024last_config_ac" +
       "k_time\030\016 \001(\0132\032.google.protobuf.Timestamp" +
       "\0229\n\025last_config_send_time\030\022 \001(\0132\032.google" +
@@ -112,7 +112,7 @@ public static void registerAllExtensions(
       "oogle.rpc.Status\0221\n\006config\030\r \001(\0132!.googl" +
       "e.cloud.iot.v1.DeviceConfig\022/\n\005state\030\020 \001" +
       "(\0132 .google.cloud.iot.v1.DeviceState\022;\n\010" +
-      "metadata\030\021 \003(\0132).google.cloud.iot.v1.Dev" +
+      "metadata\030\021 \003(\0132).google.cloud.iot.v1.Dev",
       "ice.MetadataEntry\032/\n\rMetadataEntry\022\013\n\003ke" +
       "y\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\367\002\n\016DeviceReg" +
       "istry\022\n\n\002id\030\001 \001(\t\022\014\n\004name\030\002 \001(\t\022P\n\032event" +
@@ -122,7 +122,7 @@ public static void registerAllExtensions(
       "oud.iot.v1.StateNotificationConfig\0224\n\013mq" +
       "tt_config\030\004 \001(\0132\037.google.cloud.iot.v1.Mq" +
       "ttConfig\0224\n\013http_config\030\t \001(\0132\037.google.c" +
-      "loud.iot.v1.HttpConfig\022<\n\013credentials\030\010 " +
+      "loud.iot.v1.HttpConfig\022<\n\013credentials\030\010 ",
       "\003(\0132\'.google.cloud.iot.v1.RegistryCreden" +
       "tial\"H\n\nMqttConfig\022:\n\022mqtt_enabled_state" +
       "\030\001 \001(\0162\036.google.cloud.iot.v1.MqttState\"H" +
@@ -132,7 +132,7 @@ public static void registerAllExtensions(
       "\030\002 \001(\t\022\031\n\021pubsub_topic_name\030\001 \001(\t\"4\n\027Sta" +
       "teNotificationConfig\022\031\n\021pubsub_topic_nam" +
       "e\030\001 \001(\t\"o\n\022RegistryCredential\022K\n\026public_" +
-      "key_certificate\030\001 \001(\0132).google.cloud.iot" +
+      "key_certificate\030\001 \001(\0132).google.cloud.iot",
       ".v1.PublicKeyCertificateH\000B\014\n\ncredential" +
       "\"\320\001\n\026X509CertificateDetails\022\016\n\006issuer\030\001 " +
       "\001(\t\022\017\n\007subject\030\002 \001(\t\022.\n\nstart_time\030\003 \001(\013" +
@@ -142,7 +142,7 @@ public static void registerAllExtensions(
       "_type\030\006 \001(\t\"\257\001\n\024PublicKeyCertificate\022?\n\006" +
       "format\030\001 \001(\0162/.google.cloud.iot.v1.Publi" +
       "cKeyCertificateFormat\022\023\n\013certificate\030\002 \001" +
-      "(\t\022A\n\014x509_details\030\003 \001(\0132+.google.cloud." +
+      "(\t\022A\n\014x509_details\030\003 \001(\0132+.google.cloud.",
       "iot.v1.X509CertificateDetails\"\225\001\n\020Device" +
       "Credential\022>\n\npublic_key\030\002 \001(\0132(.google." +
       "cloud.iot.v1.PublicKeyCredentialH\000\0223\n\017ex" +
@@ -152,7 +152,7 @@ public static void registerAllExtensions(
       "v1.PublicKeyFormat\022\013\n\003key\030\002 \001(\t\"\240\001\n\014Devi" +
       "ceConfig\022\017\n\007version\030\001 \001(\003\0225\n\021cloud_updat" +
       "e_time\030\002 \001(\0132\032.google.protobuf.Timestamp" +
-      "\0223\n\017device_ack_time\030\003 \001(\0132\032.google.proto" +
+      "\0223\n\017device_ack_time\030\003 \001(\0132\032.google.proto",
       "buf.Timestamp\022\023\n\013binary_data\030\004 \001(\014\"S\n\013De" +
       "viceState\022/\n\013update_time\030\001 \001(\0132\032.google." +
       "protobuf.Timestamp\022\023\n\013binary_data\030\002 \001(\014*" +
@@ -162,7 +162,7 @@ public static void registerAllExtensions(
       "\n\014HTTP_ENABLED\020\001\022\021\n\rHTTP_DISABLED\020\002*e\n\032P" +
       "ublicKeyCertificateFormat\022-\n)UNSPECIFIED" +
       "_PUBLIC_KEY_CERTIFICATE_FORMAT\020\000\022\030\n\024X509" +
-      "_CERTIFICATE_PEM\020\001*v\n\017PublicKeyFormat\022!\n" +
+      "_CERTIFICATE_PEM\020\001*v\n\017PublicKeyFormat\022!\n",
       "\035UNSPECIFIED_PUBLIC_KEY_FORMAT\020\000\022\013\n\007RSA_" +
       "PEM\020\003\022\020\n\014RSA_X509_PEM\020\001\022\r\n\tES256_PEM\020\002\022\022" +
       "\n\016ES256_X509_PEM\020\004Bf\n\027com.google.cloud.i" +
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/StateNotificationConfig.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/StateNotificationConfig.java
index 80d097de7427..9cc7aed6afeb 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/StateNotificationConfig.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/StateNotificationConfig.java
@@ -33,9 +33,6 @@ private StateNotificationConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private StateNotificationConfig(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            pubsubTopicName_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private StateNotificationConfig(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            pubsubTopicName_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private StateNotificationConfig(
     return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_StateNotificationConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_StateNotificationConfig_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getPubsubTopicName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getPubsubTopicNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.cloud.iot.v1.StateNotificationConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.iot.v1.StateNotificationConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_StateNotificationConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_StateNotificationConfig_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       pubsubTopicName_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_StateNotificationConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.StateNotificationConfig getDefaultInstanceForType() {
       return com.google.cloud.iot.v1.StateNotificationConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.StateNotificationConfig build() {
       com.google.cloud.iot.v1.StateNotificationConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.cloud.iot.v1.StateNotificationConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.StateNotificationConfig buildPartial() {
       com.google.cloud.iot.v1.StateNotificationConfig result = new com.google.cloud.iot.v1.StateNotificationConfig(this);
       result.pubsubTopicName_ = pubsubTopicName_;
@@ -359,39 +344,32 @@ public com.google.cloud.iot.v1.StateNotificationConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.iot.v1.StateNotificationConfig) {
         return mergeFrom((com.google.cloud.iot.v1.StateNotificationConfig)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.cloud.iot.v1.StateNotificationConfig other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setPubsubTopicNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.cloud.iot.v1.StateNotificationConfig getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public StateNotificationConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StateNotificationConfig(input, extensionRegistry);
+        return new StateNotificationConfig(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.iot.v1.StateNotificationConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRegistryRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRegistryRequest.java
index 3b810588b945..b035e1e3c466 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRegistryRequest.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRegistryRequest.java
@@ -32,9 +32,6 @@ private UpdateDeviceRegistryRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private UpdateDeviceRegistryRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.iot.v1.DeviceRegistry.Builder subBuilder = null;
             if (deviceRegistry_ != null) {
@@ -72,13 +76,6 @@ private UpdateDeviceRegistryRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private UpdateDeviceRegistryRequest(
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_UpdateDeviceRegistryRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_UpdateDeviceRegistryRequest_fieldAccessorTable
@@ -189,7 +185,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -199,7 +194,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (deviceRegistry_ != null) {
@@ -211,7 +205,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -345,7 +338,6 @@ public static com.google.cloud.iot.v1.UpdateDeviceRegistryRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -353,7 +345,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.iot.v1.UpdateDeviceRegistryRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -381,7 +372,6 @@ public static final class Builder extends
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_UpdateDeviceRegistryRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_UpdateDeviceRegistryRequest_fieldAccessorTable
@@ -404,7 +394,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (deviceRegistryBuilder_ == null) {
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_UpdateDeviceRegistryRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.UpdateDeviceRegistryRequest getDefaultInstanceForType() {
       return com.google.cloud.iot.v1.UpdateDeviceRegistryRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.UpdateDeviceRegistryRequest build() {
       com.google.cloud.iot.v1.UpdateDeviceRegistryRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public com.google.cloud.iot.v1.UpdateDeviceRegistryRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.UpdateDeviceRegistryRequest buildPartial() {
       com.google.cloud.iot.v1.UpdateDeviceRegistryRequest result = new com.google.cloud.iot.v1.UpdateDeviceRegistryRequest(this);
       if (deviceRegistryBuilder_ == null) {
@@ -459,39 +444,32 @@ public com.google.cloud.iot.v1.UpdateDeviceRegistryRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.iot.v1.UpdateDeviceRegistryRequest) {
         return mergeFrom((com.google.cloud.iot.v1.UpdateDeviceRegistryRequest)other);
@@ -514,12 +492,10 @@ public Builder mergeFrom(com.google.cloud.iot.v1.UpdateDeviceRegistryRequest oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -897,13 +873,11 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
       }
       return updateMaskBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -925,12 +899,11 @@ public static com.google.cloud.iot.v1.UpdateDeviceRegistryRequest getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateDeviceRegistryRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateDeviceRegistryRequest(input, extensionRegistry);
+        return new UpdateDeviceRegistryRequest(input, extensionRegistry);
     }
   };
 
@@ -943,7 +916,6 @@ public com.google.protobuf.Parser getParserForType(
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.iot.v1.UpdateDeviceRegistryRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRequest.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRequest.java
index 9e5d9c797b6b..89dd3d532993 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRequest.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/UpdateDeviceRequest.java
@@ -32,9 +32,6 @@ private UpdateDeviceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private UpdateDeviceRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             com.google.cloud.iot.v1.Device.Builder subBuilder = null;
             if (device_ != null) {
@@ -72,13 +76,6 @@ private UpdateDeviceRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private UpdateDeviceRequest(
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_UpdateDeviceRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_UpdateDeviceRequest_fieldAccessorTable
@@ -189,7 +185,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -199,7 +194,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (device_ != null) {
@@ -211,7 +205,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -345,7 +338,6 @@ public static com.google.cloud.iot.v1.UpdateDeviceRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -353,7 +345,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.iot.v1.UpdateDeviceRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -381,7 +372,6 @@ public static final class Builder extends
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_UpdateDeviceRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_UpdateDeviceRequest_fieldAccessorTable
@@ -404,7 +394,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (deviceBuilder_ == null) {
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.iot.v1.DeviceManagerProto.internal_static_google_cloud_iot_v1_UpdateDeviceRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.UpdateDeviceRequest getDefaultInstanceForType() {
       return com.google.cloud.iot.v1.UpdateDeviceRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.UpdateDeviceRequest build() {
       com.google.cloud.iot.v1.UpdateDeviceRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public com.google.cloud.iot.v1.UpdateDeviceRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.UpdateDeviceRequest buildPartial() {
       com.google.cloud.iot.v1.UpdateDeviceRequest result = new com.google.cloud.iot.v1.UpdateDeviceRequest(this);
       if (deviceBuilder_ == null) {
@@ -459,39 +444,32 @@ public com.google.cloud.iot.v1.UpdateDeviceRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.iot.v1.UpdateDeviceRequest) {
         return mergeFrom((com.google.cloud.iot.v1.UpdateDeviceRequest)other);
@@ -514,12 +492,10 @@ public Builder mergeFrom(com.google.cloud.iot.v1.UpdateDeviceRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -897,13 +873,11 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
       }
       return updateMaskBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -925,12 +899,11 @@ public static com.google.cloud.iot.v1.UpdateDeviceRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateDeviceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateDeviceRequest(input, extensionRegistry);
+        return new UpdateDeviceRequest(input, extensionRegistry);
     }
   };
 
@@ -943,7 +916,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.iot.v1.UpdateDeviceRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/X509CertificateDetails.java b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/X509CertificateDetails.java
index 1dbb7dd79e16..f44db303a783 100644
--- a/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/X509CertificateDetails.java
+++ b/google-api-grpc/proto-google-cloud-iot-v1/src/main/java/com/google/cloud/iot/v1/X509CertificateDetails.java
@@ -36,9 +36,6 @@ private X509CertificateDetails(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private X509CertificateDetails(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -100,13 +104,6 @@ private X509CertificateDetails(
             publicKeyType_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -124,7 +121,6 @@ private X509CertificateDetails(
     return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_X509CertificateDetails_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_X509CertificateDetails_fieldAccessorTable
@@ -367,7 +363,6 @@ public java.lang.String getPublicKeyType() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -377,7 +372,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getIssuerBytes().isEmpty()) {
@@ -401,7 +395,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -563,7 +556,6 @@ public static com.google.cloud.iot.v1.X509CertificateDetails parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -571,7 +563,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.iot.v1.X509CertificateDetails prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -599,7 +590,6 @@ public static final class Builder extends
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_X509CertificateDetails_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_X509CertificateDetails_fieldAccessorTable
@@ -622,7 +612,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       issuer_ = "";
@@ -648,18 +637,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.iot.v1.ResourcesProto.internal_static_google_cloud_iot_v1_X509CertificateDetails_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.X509CertificateDetails getDefaultInstanceForType() {
       return com.google.cloud.iot.v1.X509CertificateDetails.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.X509CertificateDetails build() {
       com.google.cloud.iot.v1.X509CertificateDetails result = buildPartial();
       if (!result.isInitialized()) {
@@ -668,7 +654,6 @@ public com.google.cloud.iot.v1.X509CertificateDetails build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.iot.v1.X509CertificateDetails buildPartial() {
       com.google.cloud.iot.v1.X509CertificateDetails result = new com.google.cloud.iot.v1.X509CertificateDetails(this);
       result.issuer_ = issuer_;
@@ -689,39 +674,32 @@ public com.google.cloud.iot.v1.X509CertificateDetails buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.iot.v1.X509CertificateDetails) {
         return mergeFrom((com.google.cloud.iot.v1.X509CertificateDetails)other);
@@ -760,12 +738,10 @@ public Builder mergeFrom(com.google.cloud.iot.v1.X509CertificateDetails other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1445,13 +1421,11 @@ public Builder setPublicKeyTypeBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1473,12 +1447,11 @@ public static com.google.cloud.iot.v1.X509CertificateDetails getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public X509CertificateDetails parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new X509CertificateDetails(input, extensionRegistry);
+        return new X509CertificateDetails(input, extensionRegistry);
     }
   };
 
@@ -1491,7 +1464,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.iot.v1.X509CertificateDetails getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CreateCryptoKeyRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CreateCryptoKeyRequest.java
index 3ca9c44cd7ef..8ae15cea9661 100644
--- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CreateCryptoKeyRequest.java
+++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CreateCryptoKeyRequest.java
@@ -34,9 +34,6 @@ private CreateCryptoKeyRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private CreateCryptoKeyRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private CreateCryptoKeyRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private CreateCryptoKeyRequest(
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_CreateCryptoKeyRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_CreateCryptoKeyRequest_fieldAccessorTable
@@ -227,7 +223,6 @@ public com.google.cloud.kms.v1.CryptoKeyOrBuilder getCryptoKeyOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -237,7 +232,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -252,7 +246,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -387,7 +380,6 @@ public static com.google.cloud.kms.v1.CreateCryptoKeyRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -395,7 +387,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.kms.v1.CreateCryptoKeyRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -423,7 +414,6 @@ public static final class Builder extends
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_CreateCryptoKeyRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_CreateCryptoKeyRequest_fieldAccessorTable
@@ -446,7 +436,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -462,18 +451,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_CreateCryptoKeyRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.CreateCryptoKeyRequest getDefaultInstanceForType() {
       return com.google.cloud.kms.v1.CreateCryptoKeyRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.CreateCryptoKeyRequest build() {
       com.google.cloud.kms.v1.CreateCryptoKeyRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -482,7 +468,6 @@ public com.google.cloud.kms.v1.CreateCryptoKeyRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.CreateCryptoKeyRequest buildPartial() {
       com.google.cloud.kms.v1.CreateCryptoKeyRequest result = new com.google.cloud.kms.v1.CreateCryptoKeyRequest(this);
       result.parent_ = parent_;
@@ -496,39 +481,32 @@ public com.google.cloud.kms.v1.CreateCryptoKeyRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.kms.v1.CreateCryptoKeyRequest) {
         return mergeFrom((com.google.cloud.kms.v1.CreateCryptoKeyRequest)other);
@@ -556,12 +534,10 @@ public Builder mergeFrom(com.google.cloud.kms.v1.CreateCryptoKeyRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -920,13 +896,11 @@ public com.google.cloud.kms.v1.CryptoKeyOrBuilder getCryptoKeyOrBuilder() {
       }
       return cryptoKeyBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -948,12 +922,11 @@ public static com.google.cloud.kms.v1.CreateCryptoKeyRequest getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateCryptoKeyRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateCryptoKeyRequest(input, extensionRegistry);
+        return new CreateCryptoKeyRequest(input, extensionRegistry);
     }
   };
 
@@ -966,7 +939,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.kms.v1.CreateCryptoKeyRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CreateCryptoKeyVersionRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CreateCryptoKeyVersionRequest.java
index 4c0b8f03e5cd..fbd03a5b6644 100644
--- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CreateCryptoKeyVersionRequest.java
+++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CreateCryptoKeyVersionRequest.java
@@ -33,9 +33,6 @@ private CreateCryptoKeyVersionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private CreateCryptoKeyVersionRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private CreateCryptoKeyVersionRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private CreateCryptoKeyVersionRequest(
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_CreateCryptoKeyVersionRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_CreateCryptoKeyVersionRequest_fieldAccessorTable
@@ -176,7 +172,6 @@ public com.google.cloud.kms.v1.CryptoKeyVersionOrBuilder getCryptoKeyVersionOrBu
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -186,7 +181,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -198,7 +192,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -326,7 +319,6 @@ public static com.google.cloud.kms.v1.CreateCryptoKeyVersionRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -334,7 +326,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.kms.v1.CreateCryptoKeyVersionRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -362,7 +353,6 @@ public static final class Builder extends
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_CreateCryptoKeyVersionRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_CreateCryptoKeyVersionRequest_fieldAccessorTable
@@ -385,7 +375,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -399,18 +388,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_CreateCryptoKeyVersionRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.CreateCryptoKeyVersionRequest getDefaultInstanceForType() {
       return com.google.cloud.kms.v1.CreateCryptoKeyVersionRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.CreateCryptoKeyVersionRequest build() {
       com.google.cloud.kms.v1.CreateCryptoKeyVersionRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -419,7 +405,6 @@ public com.google.cloud.kms.v1.CreateCryptoKeyVersionRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.CreateCryptoKeyVersionRequest buildPartial() {
       com.google.cloud.kms.v1.CreateCryptoKeyVersionRequest result = new com.google.cloud.kms.v1.CreateCryptoKeyVersionRequest(this);
       result.parent_ = parent_;
@@ -432,39 +417,32 @@ public com.google.cloud.kms.v1.CreateCryptoKeyVersionRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.kms.v1.CreateCryptoKeyVersionRequest) {
         return mergeFrom((com.google.cloud.kms.v1.CreateCryptoKeyVersionRequest)other);
@@ -488,12 +466,10 @@ public Builder mergeFrom(com.google.cloud.kms.v1.CreateCryptoKeyVersionRequest o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -758,13 +734,11 @@ public com.google.cloud.kms.v1.CryptoKeyVersionOrBuilder getCryptoKeyVersionOrBu
       }
       return cryptoKeyVersionBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -786,12 +760,11 @@ public static com.google.cloud.kms.v1.CreateCryptoKeyVersionRequest getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateCryptoKeyVersionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateCryptoKeyVersionRequest(input, extensionRegistry);
+        return new CreateCryptoKeyVersionRequest(input, extensionRegistry);
     }
   };
 
@@ -804,7 +777,6 @@ public com.google.protobuf.Parser getParserForTyp
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.kms.v1.CreateCryptoKeyVersionRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CreateKeyRingRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CreateKeyRingRequest.java
index bf0fa708f260..1d5ecc966839 100644
--- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CreateKeyRingRequest.java
+++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CreateKeyRingRequest.java
@@ -34,9 +34,6 @@ private CreateKeyRingRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private CreateKeyRingRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private CreateKeyRingRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private CreateKeyRingRequest(
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_CreateKeyRingRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_CreateKeyRingRequest_fieldAccessorTable
@@ -227,7 +223,6 @@ public com.google.cloud.kms.v1.KeyRingOrBuilder getKeyRingOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -237,7 +232,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -252,7 +246,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -387,7 +380,6 @@ public static com.google.cloud.kms.v1.CreateKeyRingRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -395,7 +387,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.kms.v1.CreateKeyRingRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -423,7 +414,6 @@ public static final class Builder extends
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_CreateKeyRingRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_CreateKeyRingRequest_fieldAccessorTable
@@ -446,7 +436,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -462,18 +451,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_CreateKeyRingRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.CreateKeyRingRequest getDefaultInstanceForType() {
       return com.google.cloud.kms.v1.CreateKeyRingRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.CreateKeyRingRequest build() {
       com.google.cloud.kms.v1.CreateKeyRingRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -482,7 +468,6 @@ public com.google.cloud.kms.v1.CreateKeyRingRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.CreateKeyRingRequest buildPartial() {
       com.google.cloud.kms.v1.CreateKeyRingRequest result = new com.google.cloud.kms.v1.CreateKeyRingRequest(this);
       result.parent_ = parent_;
@@ -496,39 +481,32 @@ public com.google.cloud.kms.v1.CreateKeyRingRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.kms.v1.CreateKeyRingRequest) {
         return mergeFrom((com.google.cloud.kms.v1.CreateKeyRingRequest)other);
@@ -556,12 +534,10 @@ public Builder mergeFrom(com.google.cloud.kms.v1.CreateKeyRingRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -920,13 +896,11 @@ public com.google.cloud.kms.v1.KeyRingOrBuilder getKeyRingOrBuilder() {
       }
       return keyRingBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -948,12 +922,11 @@ public static com.google.cloud.kms.v1.CreateKeyRingRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateKeyRingRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateKeyRingRequest(input, extensionRegistry);
+        return new CreateKeyRingRequest(input, extensionRegistry);
     }
   };
 
@@ -966,7 +939,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.kms.v1.CreateKeyRingRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CryptoKey.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CryptoKey.java
index 794c14754e76..68cc73e14bdd 100644
--- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CryptoKey.java
+++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CryptoKey.java
@@ -37,9 +37,6 @@ private CryptoKey(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private CryptoKey(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -129,13 +133,6 @@ private CryptoKey(
                 labels__.getKey(), labels__.getValue());
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -154,7 +151,6 @@ private CryptoKey(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -165,7 +161,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.kms.v1.KmsResourcesProto.internal_static_google_cloud_kms_v1_CryptoKey_fieldAccessorTable
@@ -445,7 +440,6 @@ public int getPurposeValue() {
    * .google.cloud.kms.v1.CryptoKey.CryptoKeyPurpose purpose = 3;
    */
   public com.google.cloud.kms.v1.CryptoKey.CryptoKeyPurpose getPurpose() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.kms.v1.CryptoKey.CryptoKeyPurpose result = com.google.cloud.kms.v1.CryptoKey.CryptoKeyPurpose.valueOf(purpose_);
     return result == null ? com.google.cloud.kms.v1.CryptoKey.CryptoKeyPurpose.UNRECOGNIZED : result;
   }
@@ -675,7 +669,6 @@ public java.lang.String getLabelsOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -685,7 +678,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -715,7 +707,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -915,7 +906,6 @@ public static com.google.cloud.kms.v1.CryptoKey parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -923,7 +913,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.kms.v1.CryptoKey prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -976,7 +965,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.kms.v1.KmsResourcesProto.internal_static_google_cloud_kms_v1_CryptoKey_fieldAccessorTable
@@ -999,7 +987,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -1030,18 +1017,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.kms.v1.KmsResourcesProto.internal_static_google_cloud_kms_v1_CryptoKey_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.CryptoKey getDefaultInstanceForType() {
       return com.google.cloud.kms.v1.CryptoKey.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.CryptoKey build() {
       com.google.cloud.kms.v1.CryptoKey result = buildPartial();
       if (!result.isInitialized()) {
@@ -1050,7 +1034,6 @@ public com.google.cloud.kms.v1.CryptoKey build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.CryptoKey buildPartial() {
       com.google.cloud.kms.v1.CryptoKey result = new com.google.cloud.kms.v1.CryptoKey(this);
       int from_bitField0_ = bitField0_;
@@ -1087,39 +1070,32 @@ public com.google.cloud.kms.v1.CryptoKey buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.kms.v1.CryptoKey) {
         return mergeFrom((com.google.cloud.kms.v1.CryptoKey)other);
@@ -1163,12 +1139,10 @@ public Builder mergeFrom(com.google.cloud.kms.v1.CryptoKey other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1520,7 +1494,6 @@ public Builder setPurposeValue(int value) {
      * .google.cloud.kms.v1.CryptoKey.CryptoKeyPurpose purpose = 3;
      */
     public com.google.cloud.kms.v1.CryptoKey.CryptoKeyPurpose getPurpose() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.kms.v1.CryptoKey.CryptoKeyPurpose result = com.google.cloud.kms.v1.CryptoKey.CryptoKeyPurpose.valueOf(purpose_);
       return result == null ? com.google.cloud.kms.v1.CryptoKey.CryptoKeyPurpose.UNRECOGNIZED : result;
     }
@@ -2263,13 +2236,11 @@ public Builder putAllLabels(
           .putAll(values);
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2291,12 +2262,11 @@ public static com.google.cloud.kms.v1.CryptoKey getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CryptoKey parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CryptoKey(input, extensionRegistry);
+        return new CryptoKey(input, extensionRegistry);
     }
   };
 
@@ -2309,7 +2279,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.kms.v1.CryptoKey getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CryptoKeyVersion.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CryptoKeyVersion.java
index 8dd63fd67926..5940e295ac8b 100644
--- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CryptoKeyVersion.java
+++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/CryptoKeyVersion.java
@@ -42,9 +42,6 @@ private CryptoKeyVersion(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -56,6 +53,13 @@ private CryptoKeyVersion(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -107,13 +111,6 @@ private CryptoKeyVersion(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -131,7 +128,6 @@ private CryptoKeyVersion(
     return com.google.cloud.kms.v1.KmsResourcesProto.internal_static_google_cloud_kms_v1_CryptoKeyVersion_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.kms.v1.KmsResourcesProto.internal_static_google_cloud_kms_v1_CryptoKeyVersion_fieldAccessorTable
@@ -384,7 +380,6 @@ public int getStateValue() {
    * .google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState state = 3;
    */
   public com.google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState getState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState result = com.google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.valueOf(state_);
     return result == null ? com.google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.UNRECOGNIZED : result;
   }
@@ -501,7 +496,6 @@ public com.google.protobuf.TimestampOrBuilder getDestroyEventTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -511,7 +505,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -532,7 +525,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -693,7 +685,6 @@ public static com.google.cloud.kms.v1.CryptoKeyVersion parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -701,7 +692,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.kms.v1.CryptoKeyVersion prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -737,7 +727,6 @@ public static final class Builder extends
       return com.google.cloud.kms.v1.KmsResourcesProto.internal_static_google_cloud_kms_v1_CryptoKeyVersion_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.kms.v1.KmsResourcesProto.internal_static_google_cloud_kms_v1_CryptoKeyVersion_fieldAccessorTable
@@ -760,7 +749,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -788,18 +776,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.kms.v1.KmsResourcesProto.internal_static_google_cloud_kms_v1_CryptoKeyVersion_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.CryptoKeyVersion getDefaultInstanceForType() {
       return com.google.cloud.kms.v1.CryptoKeyVersion.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.CryptoKeyVersion build() {
       com.google.cloud.kms.v1.CryptoKeyVersion result = buildPartial();
       if (!result.isInitialized()) {
@@ -808,7 +793,6 @@ public com.google.cloud.kms.v1.CryptoKeyVersion build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.CryptoKeyVersion buildPartial() {
       com.google.cloud.kms.v1.CryptoKeyVersion result = new com.google.cloud.kms.v1.CryptoKeyVersion(this);
       result.name_ = name_;
@@ -832,39 +816,32 @@ public com.google.cloud.kms.v1.CryptoKeyVersion buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.kms.v1.CryptoKeyVersion) {
         return mergeFrom((com.google.cloud.kms.v1.CryptoKeyVersion)other);
@@ -897,12 +874,10 @@ public Builder mergeFrom(com.google.cloud.kms.v1.CryptoKeyVersion other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1046,7 +1021,6 @@ public Builder setStateValue(int value) {
      * .google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState state = 3;
      */
     public com.google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState getState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState result = com.google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.valueOf(state_);
       return result == null ? com.google.cloud.kms.v1.CryptoKeyVersion.CryptoKeyVersionState.UNRECOGNIZED : result;
     }
@@ -1574,13 +1548,11 @@ public com.google.protobuf.TimestampOrBuilder getDestroyEventTimeOrBuilder() {
       }
       return destroyEventTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1602,12 +1574,11 @@ public static com.google.cloud.kms.v1.CryptoKeyVersion getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CryptoKeyVersion parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CryptoKeyVersion(input, extensionRegistry);
+        return new CryptoKeyVersion(input, extensionRegistry);
     }
   };
 
@@ -1620,7 +1591,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.kms.v1.CryptoKeyVersion getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/DecryptRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/DecryptRequest.java
index 24ea6b964a4f..182fbce4e4b7 100644
--- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/DecryptRequest.java
+++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/DecryptRequest.java
@@ -35,9 +35,6 @@ private DecryptRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private DecryptRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -65,13 +69,6 @@ private DecryptRequest(
             additionalAuthenticatedData_ = input.readBytes();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -89,7 +86,6 @@ private DecryptRequest(
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_DecryptRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_DecryptRequest_fieldAccessorTable
@@ -170,7 +166,6 @@ public com.google.protobuf.ByteString getAdditionalAuthenticatedData() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -180,7 +175,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -195,7 +189,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -326,7 +319,6 @@ public static com.google.cloud.kms.v1.DecryptRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -334,7 +326,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.kms.v1.DecryptRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -362,7 +353,6 @@ public static final class Builder extends
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_DecryptRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_DecryptRequest_fieldAccessorTable
@@ -385,7 +375,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -397,18 +386,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_DecryptRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.DecryptRequest getDefaultInstanceForType() {
       return com.google.cloud.kms.v1.DecryptRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.DecryptRequest build() {
       com.google.cloud.kms.v1.DecryptRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -417,7 +403,6 @@ public com.google.cloud.kms.v1.DecryptRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.DecryptRequest buildPartial() {
       com.google.cloud.kms.v1.DecryptRequest result = new com.google.cloud.kms.v1.DecryptRequest(this);
       result.name_ = name_;
@@ -427,39 +412,32 @@ public com.google.cloud.kms.v1.DecryptRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.kms.v1.DecryptRequest) {
         return mergeFrom((com.google.cloud.kms.v1.DecryptRequest)other);
@@ -486,12 +464,10 @@ public Builder mergeFrom(com.google.cloud.kms.v1.DecryptRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -691,13 +667,11 @@ public Builder clearAdditionalAuthenticatedData() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -719,12 +693,11 @@ public static com.google.cloud.kms.v1.DecryptRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DecryptRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DecryptRequest(input, extensionRegistry);
+        return new DecryptRequest(input, extensionRegistry);
     }
   };
 
@@ -737,7 +710,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.kms.v1.DecryptRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/DecryptResponse.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/DecryptResponse.java
index 9231005bf1f8..11336e87acdb 100644
--- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/DecryptResponse.java
+++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/DecryptResponse.java
@@ -33,9 +33,6 @@ private DecryptResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,11 +44,6 @@ private DecryptResponse(
           case 0:
             done = true;
             break;
-          case 10: {
-
-            plaintext_ = input.readBytes();
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -59,6 +51,11 @@ private DecryptResponse(
             }
             break;
           }
+          case 10: {
+
+            plaintext_ = input.readBytes();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -76,7 +73,6 @@ private DecryptResponse(
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_DecryptResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_DecryptResponse_fieldAccessorTable
@@ -98,7 +94,6 @@ public com.google.protobuf.ByteString getPlaintext() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -108,7 +103,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!plaintext_.isEmpty()) {
@@ -117,7 +111,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -233,7 +226,6 @@ public static com.google.cloud.kms.v1.DecryptResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -241,7 +233,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.kms.v1.DecryptResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -269,7 +260,6 @@ public static final class Builder extends
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_DecryptResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_DecryptResponse_fieldAccessorTable
@@ -292,7 +282,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       plaintext_ = com.google.protobuf.ByteString.EMPTY;
@@ -300,18 +289,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_DecryptResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.DecryptResponse getDefaultInstanceForType() {
       return com.google.cloud.kms.v1.DecryptResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.DecryptResponse build() {
       com.google.cloud.kms.v1.DecryptResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -320,7 +306,6 @@ public com.google.cloud.kms.v1.DecryptResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.DecryptResponse buildPartial() {
       com.google.cloud.kms.v1.DecryptResponse result = new com.google.cloud.kms.v1.DecryptResponse(this);
       result.plaintext_ = plaintext_;
@@ -328,39 +313,32 @@ public com.google.cloud.kms.v1.DecryptResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.kms.v1.DecryptResponse) {
         return mergeFrom((com.google.cloud.kms.v1.DecryptResponse)other);
@@ -380,12 +358,10 @@ public Builder mergeFrom(com.google.cloud.kms.v1.DecryptResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -444,13 +420,11 @@ public Builder clearPlaintext() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -472,12 +446,11 @@ public static com.google.cloud.kms.v1.DecryptResponse getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DecryptResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DecryptResponse(input, extensionRegistry);
+        return new DecryptResponse(input, extensionRegistry);
     }
   };
 
@@ -490,7 +463,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.kms.v1.DecryptResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/DestroyCryptoKeyVersionRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/DestroyCryptoKeyVersionRequest.java
index 64c4b193bea0..6c0348c007c6 100644
--- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/DestroyCryptoKeyVersionRequest.java
+++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/DestroyCryptoKeyVersionRequest.java
@@ -33,9 +33,6 @@ private DestroyCryptoKeyVersionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DestroyCryptoKeyVersionRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DestroyCryptoKeyVersionRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DestroyCryptoKeyVersionRequest(
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_DestroyCryptoKeyVersionRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_DestroyCryptoKeyVersionRequest_fieldAccessorTable
@@ -128,7 +124,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -138,7 +133,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -147,7 +141,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -262,7 +255,6 @@ public static com.google.cloud.kms.v1.DestroyCryptoKeyVersionRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -270,7 +262,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.kms.v1.DestroyCryptoKeyVersionRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -298,7 +289,6 @@ public static final class Builder extends
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_DestroyCryptoKeyVersionRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_DestroyCryptoKeyVersionRequest_fieldAccessorTable
@@ -321,7 +311,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -329,18 +318,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_DestroyCryptoKeyVersionRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.DestroyCryptoKeyVersionRequest getDefaultInstanceForType() {
       return com.google.cloud.kms.v1.DestroyCryptoKeyVersionRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.DestroyCryptoKeyVersionRequest build() {
       com.google.cloud.kms.v1.DestroyCryptoKeyVersionRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -349,7 +335,6 @@ public com.google.cloud.kms.v1.DestroyCryptoKeyVersionRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.DestroyCryptoKeyVersionRequest buildPartial() {
       com.google.cloud.kms.v1.DestroyCryptoKeyVersionRequest result = new com.google.cloud.kms.v1.DestroyCryptoKeyVersionRequest(this);
       result.name_ = name_;
@@ -357,39 +342,32 @@ public com.google.cloud.kms.v1.DestroyCryptoKeyVersionRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.kms.v1.DestroyCryptoKeyVersionRequest) {
         return mergeFrom((com.google.cloud.kms.v1.DestroyCryptoKeyVersionRequest)other);
@@ -410,12 +388,10 @@ public Builder mergeFrom(com.google.cloud.kms.v1.DestroyCryptoKeyVersionRequest
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -522,13 +498,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -550,12 +524,11 @@ public static com.google.cloud.kms.v1.DestroyCryptoKeyVersionRequest getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DestroyCryptoKeyVersionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DestroyCryptoKeyVersionRequest(input, extensionRegistry);
+        return new DestroyCryptoKeyVersionRequest(input, extensionRegistry);
     }
   };
 
@@ -568,7 +541,6 @@ public com.google.protobuf.Parser getParserForTy
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.kms.v1.DestroyCryptoKeyVersionRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/EncryptRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/EncryptRequest.java
index b6a8a6c4b51a..75a590e87f38 100644
--- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/EncryptRequest.java
+++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/EncryptRequest.java
@@ -35,9 +35,6 @@ private EncryptRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private EncryptRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -65,13 +69,6 @@ private EncryptRequest(
             additionalAuthenticatedData_ = input.readBytes();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -89,7 +86,6 @@ private EncryptRequest(
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_EncryptRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_EncryptRequest_fieldAccessorTable
@@ -174,7 +170,6 @@ public com.google.protobuf.ByteString getAdditionalAuthenticatedData() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -184,7 +179,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -199,7 +193,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -330,7 +323,6 @@ public static com.google.cloud.kms.v1.EncryptRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -338,7 +330,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.kms.v1.EncryptRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -366,7 +357,6 @@ public static final class Builder extends
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_EncryptRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_EncryptRequest_fieldAccessorTable
@@ -389,7 +379,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -401,18 +390,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_EncryptRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.EncryptRequest getDefaultInstanceForType() {
       return com.google.cloud.kms.v1.EncryptRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.EncryptRequest build() {
       com.google.cloud.kms.v1.EncryptRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -421,7 +407,6 @@ public com.google.cloud.kms.v1.EncryptRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.EncryptRequest buildPartial() {
       com.google.cloud.kms.v1.EncryptRequest result = new com.google.cloud.kms.v1.EncryptRequest(this);
       result.name_ = name_;
@@ -431,39 +416,32 @@ public com.google.cloud.kms.v1.EncryptRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.kms.v1.EncryptRequest) {
         return mergeFrom((com.google.cloud.kms.v1.EncryptRequest)other);
@@ -490,12 +468,10 @@ public Builder mergeFrom(com.google.cloud.kms.v1.EncryptRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -705,13 +681,11 @@ public Builder clearAdditionalAuthenticatedData() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -733,12 +707,11 @@ public static com.google.cloud.kms.v1.EncryptRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public EncryptRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new EncryptRequest(input, extensionRegistry);
+        return new EncryptRequest(input, extensionRegistry);
     }
   };
 
@@ -751,7 +724,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.kms.v1.EncryptRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/EncryptResponse.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/EncryptResponse.java
index 3e4afb429463..254a99076b37 100644
--- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/EncryptResponse.java
+++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/EncryptResponse.java
@@ -34,9 +34,6 @@ private EncryptResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private EncryptResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -59,13 +63,6 @@ private EncryptResponse(
             ciphertext_ = input.readBytes();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private EncryptResponse(
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_EncryptResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_EncryptResponse_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.protobuf.ByteString getCiphertext() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -169,7 +163,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -292,7 +285,6 @@ public static com.google.cloud.kms.v1.EncryptResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -300,7 +292,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.kms.v1.EncryptResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -328,7 +319,6 @@ public static final class Builder extends
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_EncryptResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_EncryptResponse_fieldAccessorTable
@@ -351,7 +341,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -361,18 +350,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_EncryptResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.EncryptResponse getDefaultInstanceForType() {
       return com.google.cloud.kms.v1.EncryptResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.EncryptResponse build() {
       com.google.cloud.kms.v1.EncryptResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -381,7 +367,6 @@ public com.google.cloud.kms.v1.EncryptResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.EncryptResponse buildPartial() {
       com.google.cloud.kms.v1.EncryptResponse result = new com.google.cloud.kms.v1.EncryptResponse(this);
       result.name_ = name_;
@@ -390,39 +375,32 @@ public com.google.cloud.kms.v1.EncryptResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.kms.v1.EncryptResponse) {
         return mergeFrom((com.google.cloud.kms.v1.EncryptResponse)other);
@@ -446,12 +424,10 @@ public Builder mergeFrom(com.google.cloud.kms.v1.EncryptResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -599,13 +575,11 @@ public Builder clearCiphertext() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -627,12 +601,11 @@ public static com.google.cloud.kms.v1.EncryptResponse getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public EncryptResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new EncryptResponse(input, extensionRegistry);
+        return new EncryptResponse(input, extensionRegistry);
     }
   };
 
@@ -645,7 +618,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.kms.v1.EncryptResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/GetCryptoKeyRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/GetCryptoKeyRequest.java
index faa12c83aca7..efdba5e779c1 100644
--- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/GetCryptoKeyRequest.java
+++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/GetCryptoKeyRequest.java
@@ -33,9 +33,6 @@ private GetCryptoKeyRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetCryptoKeyRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetCryptoKeyRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetCryptoKeyRequest(
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_GetCryptoKeyRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_GetCryptoKeyRequest_fieldAccessorTable
@@ -128,7 +124,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -138,7 +133,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -147,7 +141,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -262,7 +255,6 @@ public static com.google.cloud.kms.v1.GetCryptoKeyRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -270,7 +262,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.kms.v1.GetCryptoKeyRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -298,7 +289,6 @@ public static final class Builder extends
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_GetCryptoKeyRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_GetCryptoKeyRequest_fieldAccessorTable
@@ -321,7 +311,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -329,18 +318,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_GetCryptoKeyRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.GetCryptoKeyRequest getDefaultInstanceForType() {
       return com.google.cloud.kms.v1.GetCryptoKeyRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.GetCryptoKeyRequest build() {
       com.google.cloud.kms.v1.GetCryptoKeyRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -349,7 +335,6 @@ public com.google.cloud.kms.v1.GetCryptoKeyRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.GetCryptoKeyRequest buildPartial() {
       com.google.cloud.kms.v1.GetCryptoKeyRequest result = new com.google.cloud.kms.v1.GetCryptoKeyRequest(this);
       result.name_ = name_;
@@ -357,39 +342,32 @@ public com.google.cloud.kms.v1.GetCryptoKeyRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.kms.v1.GetCryptoKeyRequest) {
         return mergeFrom((com.google.cloud.kms.v1.GetCryptoKeyRequest)other);
@@ -410,12 +388,10 @@ public Builder mergeFrom(com.google.cloud.kms.v1.GetCryptoKeyRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -522,13 +498,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -550,12 +524,11 @@ public static com.google.cloud.kms.v1.GetCryptoKeyRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetCryptoKeyRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetCryptoKeyRequest(input, extensionRegistry);
+        return new GetCryptoKeyRequest(input, extensionRegistry);
     }
   };
 
@@ -568,7 +541,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.kms.v1.GetCryptoKeyRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/GetCryptoKeyVersionRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/GetCryptoKeyVersionRequest.java
index fb7af9650112..9998306417d9 100644
--- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/GetCryptoKeyVersionRequest.java
+++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/GetCryptoKeyVersionRequest.java
@@ -33,9 +33,6 @@ private GetCryptoKeyVersionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetCryptoKeyVersionRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetCryptoKeyVersionRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetCryptoKeyVersionRequest(
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_GetCryptoKeyVersionRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_GetCryptoKeyVersionRequest_fieldAccessorTable
@@ -128,7 +124,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -138,7 +133,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -147,7 +141,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -262,7 +255,6 @@ public static com.google.cloud.kms.v1.GetCryptoKeyVersionRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -270,7 +262,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.kms.v1.GetCryptoKeyVersionRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -298,7 +289,6 @@ public static final class Builder extends
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_GetCryptoKeyVersionRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_GetCryptoKeyVersionRequest_fieldAccessorTable
@@ -321,7 +311,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -329,18 +318,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_GetCryptoKeyVersionRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.GetCryptoKeyVersionRequest getDefaultInstanceForType() {
       return com.google.cloud.kms.v1.GetCryptoKeyVersionRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.GetCryptoKeyVersionRequest build() {
       com.google.cloud.kms.v1.GetCryptoKeyVersionRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -349,7 +335,6 @@ public com.google.cloud.kms.v1.GetCryptoKeyVersionRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.GetCryptoKeyVersionRequest buildPartial() {
       com.google.cloud.kms.v1.GetCryptoKeyVersionRequest result = new com.google.cloud.kms.v1.GetCryptoKeyVersionRequest(this);
       result.name_ = name_;
@@ -357,39 +342,32 @@ public com.google.cloud.kms.v1.GetCryptoKeyVersionRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.kms.v1.GetCryptoKeyVersionRequest) {
         return mergeFrom((com.google.cloud.kms.v1.GetCryptoKeyVersionRequest)other);
@@ -410,12 +388,10 @@ public Builder mergeFrom(com.google.cloud.kms.v1.GetCryptoKeyVersionRequest othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -522,13 +498,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -550,12 +524,11 @@ public static com.google.cloud.kms.v1.GetCryptoKeyVersionRequest getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetCryptoKeyVersionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetCryptoKeyVersionRequest(input, extensionRegistry);
+        return new GetCryptoKeyVersionRequest(input, extensionRegistry);
     }
   };
 
@@ -568,7 +541,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.kms.v1.GetCryptoKeyVersionRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/GetKeyRingRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/GetKeyRingRequest.java
index 6c3dfb9958e6..88780208cae2 100644
--- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/GetKeyRingRequest.java
+++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/GetKeyRingRequest.java
@@ -33,9 +33,6 @@ private GetKeyRingRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetKeyRingRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetKeyRingRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetKeyRingRequest(
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_GetKeyRingRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_GetKeyRingRequest_fieldAccessorTable
@@ -128,7 +124,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -138,7 +133,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -147,7 +141,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -262,7 +255,6 @@ public static com.google.cloud.kms.v1.GetKeyRingRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -270,7 +262,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.kms.v1.GetKeyRingRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -298,7 +289,6 @@ public static final class Builder extends
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_GetKeyRingRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_GetKeyRingRequest_fieldAccessorTable
@@ -321,7 +311,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -329,18 +318,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_GetKeyRingRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.GetKeyRingRequest getDefaultInstanceForType() {
       return com.google.cloud.kms.v1.GetKeyRingRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.GetKeyRingRequest build() {
       com.google.cloud.kms.v1.GetKeyRingRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -349,7 +335,6 @@ public com.google.cloud.kms.v1.GetKeyRingRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.GetKeyRingRequest buildPartial() {
       com.google.cloud.kms.v1.GetKeyRingRequest result = new com.google.cloud.kms.v1.GetKeyRingRequest(this);
       result.name_ = name_;
@@ -357,39 +342,32 @@ public com.google.cloud.kms.v1.GetKeyRingRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.kms.v1.GetKeyRingRequest) {
         return mergeFrom((com.google.cloud.kms.v1.GetKeyRingRequest)other);
@@ -410,12 +388,10 @@ public Builder mergeFrom(com.google.cloud.kms.v1.GetKeyRingRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -522,13 +498,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -550,12 +524,11 @@ public static com.google.cloud.kms.v1.GetKeyRingRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetKeyRingRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetKeyRingRequest(input, extensionRegistry);
+        return new GetKeyRingRequest(input, extensionRegistry);
     }
   };
 
@@ -568,7 +541,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.kms.v1.GetKeyRingRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/KeyRing.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/KeyRing.java
index d364c017614e..2e664d8be56f 100644
--- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/KeyRing.java
+++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/KeyRing.java
@@ -33,9 +33,6 @@ private KeyRing(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private KeyRing(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private KeyRing(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private KeyRing(
     return com.google.cloud.kms.v1.KmsResourcesProto.internal_static_google_cloud_kms_v1_KeyRing_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.kms.v1.KmsResourcesProto.internal_static_google_cloud_kms_v1_KeyRing_fieldAccessorTable
@@ -176,7 +172,6 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -186,7 +181,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -198,7 +192,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -326,7 +319,6 @@ public static com.google.cloud.kms.v1.KeyRing parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -334,7 +326,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.kms.v1.KeyRing prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -362,7 +353,6 @@ public static final class Builder extends
       return com.google.cloud.kms.v1.KmsResourcesProto.internal_static_google_cloud_kms_v1_KeyRing_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.kms.v1.KmsResourcesProto.internal_static_google_cloud_kms_v1_KeyRing_fieldAccessorTable
@@ -385,7 +375,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -399,18 +388,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.kms.v1.KmsResourcesProto.internal_static_google_cloud_kms_v1_KeyRing_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.KeyRing getDefaultInstanceForType() {
       return com.google.cloud.kms.v1.KeyRing.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.KeyRing build() {
       com.google.cloud.kms.v1.KeyRing result = buildPartial();
       if (!result.isInitialized()) {
@@ -419,7 +405,6 @@ public com.google.cloud.kms.v1.KeyRing build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.KeyRing buildPartial() {
       com.google.cloud.kms.v1.KeyRing result = new com.google.cloud.kms.v1.KeyRing(this);
       result.name_ = name_;
@@ -432,39 +417,32 @@ public com.google.cloud.kms.v1.KeyRing buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.kms.v1.KeyRing) {
         return mergeFrom((com.google.cloud.kms.v1.KeyRing)other);
@@ -488,12 +466,10 @@ public Builder mergeFrom(com.google.cloud.kms.v1.KeyRing other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -758,13 +734,11 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() {
       }
       return createTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -786,12 +760,11 @@ public static com.google.cloud.kms.v1.KeyRing getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public KeyRing parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new KeyRing(input, extensionRegistry);
+        return new KeyRing(input, extensionRegistry);
     }
   };
 
@@ -804,7 +777,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.kms.v1.KeyRing getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/KmsProto.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/KmsProto.java
index eebfe668bc7f..b94c5d2a4930 100644
--- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/KmsProto.java
+++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/KmsProto.java
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       "st\022\016\n\006parent\030\001 \001(\t\022\021\n\tpage_size\030\002 \001(\005\022\022\n" +
       "\npage_token\030\003 \001(\t\"N\n\025ListCryptoKeysReque" +
       "st\022\016\n\006parent\030\001 \001(\t\022\021\n\tpage_size\030\002 \001(\005\022\022\n" +
-      "\npage_token\030\003 \001(\t\"U\n\034ListCryptoKeyVersio" +
+      "\npage_token\030\003 \001(\t\"U\n\034ListCryptoKeyVersio",
       "nsRequest\022\016\n\006parent\030\001 \001(\t\022\021\n\tpage_size\030\002" +
       " \001(\005\022\022\n\npage_token\030\003 \001(\t\"t\n\024ListKeyRings" +
       "Response\022/\n\tkey_rings\030\001 \003(\0132\034.google.clo" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "loud.kms.v1.CryptoKey\022\027\n\017next_page_token" +
       "\030\002 \001(\t\022\022\n\ntotal_size\030\003 \001(\005\"\220\001\n\035ListCrypt" +
       "oKeyVersionsResponse\022B\n\023crypto_key_versi" +
-      "ons\030\001 \003(\0132%.google.cloud.kms.v1.CryptoKe" +
+      "ons\030\001 \003(\0132%.google.cloud.kms.v1.CryptoKe",
       "yVersion\022\027\n\017next_page_token\030\002 \001(\t\022\022\n\ntot" +
       "al_size\030\003 \001(\005\"!\n\021GetKeyRingRequest\022\014\n\004na" +
       "me\030\001 \001(\t\"#\n\023GetCryptoKeyRequest\022\014\n\004name\030" +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       "ng\030\003 \001(\0132\034.google.cloud.kms.v1.KeyRing\"s" +
       "\n\026CreateCryptoKeyRequest\022\016\n\006parent\030\001 \001(\t" +
       "\022\025\n\rcrypto_key_id\030\002 \001(\t\0222\n\ncrypto_key\030\003 " +
-      "\001(\0132\036.google.cloud.kms.v1.CryptoKey\"r\n\035C" +
+      "\001(\0132\036.google.cloud.kms.v1.CryptoKey\"r\n\035C",
       "reateCryptoKeyVersionRequest\022\016\n\006parent\030\001" +
       " \001(\t\022A\n\022crypto_key_version\030\002 \001(\0132%.googl" +
       "e.cloud.kms.v1.CryptoKeyVersion\"}\n\026Updat" +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       "\001\n\035UpdateCryptoKeyVersionRequest\022A\n\022cryp" +
       "to_key_version\030\001 \001(\0132%.google.cloud.kms." +
       "v1.CryptoKeyVersion\022/\n\013update_mask\030\002 \001(\013" +
-      "2\032.google.protobuf.FieldMask\"X\n\016EncryptR" +
+      "2\032.google.protobuf.FieldMask\"X\n\016EncryptR",
       "equest\022\014\n\004name\030\001 \001(\t\022\021\n\tplaintext\030\002 \001(\014\022" +
       "%\n\035additional_authenticated_data\030\003 \001(\014\"Y" +
       "\n\016DecryptRequest\022\014\n\004name\030\001 \001(\t\022\022\n\ncipher" +
@@ -177,7 +177,7 @@ public static void registerAllExtensions(
       "\022\022\n\nciphertext\030\002 \001(\014\"S\n$UpdateCryptoKeyP" +
       "rimaryVersionRequest\022\014\n\004name\030\001 \001(\t\022\035\n\025cr" +
       "ypto_key_version_id\030\002 \001(\t\".\n\036DestroyCryp" +
-      "toKeyVersionRequest\022\014\n\004name\030\001 \001(\t\".\n\036Res" +
+      "toKeyVersionRequest\022\014\n\004name\030\001 \001(\t\".\n\036Res",
       "toreCryptoKeyVersionRequest\022\014\n\004name\030\001 \001(" +
       "\t2\333\027\n\024KeyManagementService\022\231\001\n\014ListKeyRi" +
       "ngs\022(.google.cloud.kms.v1.ListKeyRingsRe" +
@@ -187,7 +187,7 @@ public static void registerAllExtensions(
       "s\022*.google.cloud.kms.v1.ListCryptoKeysRe" +
       "quest\032+.google.cloud.kms.v1.ListCryptoKe" +
       "ysResponse\"A\202\323\344\223\002;\0229/v1/{parent=projects" +
-      "/*/locations/*/keyRings/*}/cryptoKeys\022\325\001" +
+      "/*/locations/*/keyRings/*}/cryptoKeys\022\325\001",
       "\n\025ListCryptoKeyVersions\0221.google.cloud.k" +
       "ms.v1.ListCryptoKeyVersionsRequest\0322.goo" +
       "gle.cloud.kms.v1.ListCryptoKeyVersionsRe" +
@@ -197,7 +197,7 @@ public static void registerAllExtensions(
       "oud.kms.v1.GetKeyRingRequest\032\034.google.cl" +
       "oud.kms.v1.KeyRing\"4\202\323\344\223\002.\022,/v1/{name=pr" +
       "ojects/*/locations/*/keyRings/*}\022\233\001\n\014Get" +
-      "CryptoKey\022(.google.cloud.kms.v1.GetCrypt" +
+      "CryptoKey\022(.google.cloud.kms.v1.GetCrypt",
       "oKeyRequest\032\036.google.cloud.kms.v1.Crypto" +
       "Key\"A\202\323\344\223\002;\0229/v1/{name=projects/*/locati" +
       "ons/*/keyRings/*/cryptoKeys/*}\022\304\001\n\023GetCr" +
@@ -207,7 +207,7 @@ public static void registerAllExtensions(
       "e=projects/*/locations/*/keyRings/*/cryp" +
       "toKeys/*/cryptoKeyVersions/*}\022\230\001\n\rCreate" +
       "KeyRing\022).google.cloud.kms.v1.CreateKeyR" +
-      "ingRequest\032\034.google.cloud.kms.v1.KeyRing" +
+      "ingRequest\032\034.google.cloud.kms.v1.KeyRing",
       "\">\202\323\344\223\0028\",/v1/{parent=projects/*/locatio" +
       "ns/*}/keyRings:\010key_ring\022\255\001\n\017CreateCrypt" +
       "oKey\022+.google.cloud.kms.v1.CreateCryptoK" +
@@ -217,7 +217,7 @@ public static void registerAllExtensions(
       "\022\336\001\n\026CreateCryptoKeyVersion\0222.google.clo" +
       "ud.kms.v1.CreateCryptoKeyVersionRequest\032" +
       "%.google.cloud.kms.v1.CryptoKeyVersion\"i" +
-      "\202\323\344\223\002c\"M/v1/{parent=projects/*/locations" +
+      "\202\323\344\223\002c\"M/v1/{parent=projects/*/locations",
       "/*/keyRings/*/cryptoKeys/*}/cryptoKeyVer" +
       "sions:\022crypto_key_version\022\270\001\n\017UpdateCryp" +
       "toKey\022+.google.cloud.kms.v1.UpdateCrypto" +
@@ -227,7 +227,7 @@ public static void registerAllExtensions(
       ":\ncrypto_key\022\361\001\n\026UpdateCryptoKeyVersion\022" +
       "2.google.cloud.kms.v1.UpdateCryptoKeyVer" +
       "sionRequest\032%.google.cloud.kms.v1.Crypto" +
-      "KeyVersion\"|\202\323\344\223\002v2`/v1/{crypto_key_vers" +
+      "KeyVersion\"|\202\323\344\223\002v2`/v1/{crypto_key_vers",
       "ion.name=projects/*/locations/*/keyRings" +
       "/*/cryptoKeys/*/cryptoKeyVersions/*}:\022cr" +
       "ypto_key_version\022\243\001\n\007Encrypt\022#.google.cl" +
@@ -237,7 +237,7 @@ public static void registerAllExtensions(
       "ptoKeys/**}:encrypt:\001*\022\242\001\n\007Decrypt\022#.goo" +
       "gle.cloud.kms.v1.DecryptRequest\032$.google" +
       ".cloud.kms.v1.DecryptResponse\"L\202\323\344\223\002F\"A/" +
-      "v1/{name=projects/*/locations/*/keyRings" +
+      "v1/{name=projects/*/locations/*/keyRings",
       "/*/cryptoKeys/*}:decrypt:\001*\022\325\001\n\035UpdateCr" +
       "yptoKeyPrimaryVersion\0229.google.cloud.kms" +
       ".v1.UpdateCryptoKeyPrimaryVersionRequest" +
@@ -247,7 +247,7 @@ public static void registerAllExtensions(
       ":\001*\022\327\001\n\027DestroyCryptoKeyVersion\0223.google" +
       ".cloud.kms.v1.DestroyCryptoKeyVersionReq" +
       "uest\032%.google.cloud.kms.v1.CryptoKeyVers" +
-      "ion\"`\202\323\344\223\002Z\"U/v1/{name=projects/*/locati" +
+      "ion\"`\202\323\344\223\002Z\"U/v1/{name=projects/*/locati",
       "ons/*/keyRings/*/cryptoKeys/*/cryptoKeyV" +
       "ersions/*}:destroy:\001*\022\327\001\n\027RestoreCryptoK" +
       "eyVersion\0223.google.cloud.kms.v1.RestoreC" +
@@ -257,7 +257,7 @@ public static void registerAllExtensions(
       "oKeys/*/cryptoKeyVersions/*}:restore:\001*B" +
       "\214\001\n\027com.google.cloud.kms.v1B\010KmsProtoP\001Z" +
       "6google.golang.org/genproto/googleapis/c" +
-      "loud/kms/v1;kms\370\001\001\252\002\023Google.Cloud.Kms.V1" +
+      "loud/kms/v1;kms\370\001\001\252\002\023Google.Cloud.Kms.V1",
       "\312\002\023Google\\Cloud\\Kms\\V1b\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/KmsResourcesProto.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/KmsResourcesProto.java
index 63cac2096708..b7196fb9b5b2 100644
--- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/KmsResourcesProto.java
+++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/KmsResourcesProto.java
@@ -52,7 +52,7 @@ public static void registerAllExtensions(
       "y\022\014\n\004name\030\001 \001(\t\0226\n\007primary\030\002 \001(\0132%.googl" +
       "e.cloud.kms.v1.CryptoKeyVersion\022@\n\007purpo" +
       "se\030\003 \001(\0162/.google.cloud.kms.v1.CryptoKey" +
-      ".CryptoKeyPurpose\022/\n\013create_time\030\005 \001(\0132\032" +
+      ".CryptoKeyPurpose\022/\n\013create_time\030\005 \001(\0132\032",
       ".google.protobuf.Timestamp\0226\n\022next_rotat" +
       "ion_time\030\007 \001(\0132\032.google.protobuf.Timesta" +
       "mp\0224\n\017rotation_period\030\010 \001(\0132\031.google.pro" +
@@ -62,7 +62,7 @@ public static void registerAllExtensions(
       "\0028\001\"K\n\020CryptoKeyPurpose\022\"\n\036CRYPTO_KEY_PU" +
       "RPOSE_UNSPECIFIED\020\000\022\023\n\017ENCRYPT_DECRYPT\020\001" +
       "B\023\n\021rotation_schedule\"\214\003\n\020CryptoKeyVersi" +
-      "on\022\014\n\004name\030\001 \001(\t\022J\n\005state\030\003 \001(\0162;.google" +
+      "on\022\014\n\004name\030\001 \001(\t\022J\n\005state\030\003 \001(\0162;.google",
       ".cloud.kms.v1.CryptoKeyVersion.CryptoKey" +
       "VersionState\022/\n\013create_time\030\004 \001(\0132\032.goog" +
       "le.protobuf.Timestamp\0220\n\014destroy_time\030\005 " +
@@ -72,7 +72,7 @@ public static void registerAllExtensions(
       "PTO_KEY_VERSION_STATE_UNSPECIFIED\020\000\022\013\n\007E" +
       "NABLED\020\001\022\014\n\010DISABLED\020\002\022\r\n\tDESTROYED\020\003\022\025\n" +
       "\021DESTROY_SCHEDULED\020\004B\225\001\n\027com.google.clou" +
-      "d.kms.v1B\021KmsResourcesProtoP\001Z6google.go" +
+      "d.kms.v1B\021KmsResourcesProtoP\001Z6google.go",
       "lang.org/genproto/googleapis/cloud/kms/v" +
       "1;kms\370\001\001\252\002\023Google.Cloud.Kms.V1\312\002\023Google\\" +
       "Cloud\\Kms\\V1b\006proto3"
diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeyVersionsRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeyVersionsRequest.java
index b6545ef308a6..406143d17c79 100644
--- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeyVersionsRequest.java
+++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeyVersionsRequest.java
@@ -35,9 +35,6 @@ private ListCryptoKeyVersionsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListCryptoKeyVersionsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ListCryptoKeyVersionsRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListCryptoKeyVersionsRequest(
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_ListCryptoKeyVersionsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_ListCryptoKeyVersionsRequest_fieldAccessorTable
@@ -204,7 +200,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -214,7 +209,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -229,7 +223,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -359,7 +352,6 @@ public static com.google.cloud.kms.v1.ListCryptoKeyVersionsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -367,7 +359,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.kms.v1.ListCryptoKeyVersionsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -395,7 +386,6 @@ public static final class Builder extends
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_ListCryptoKeyVersionsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_ListCryptoKeyVersionsRequest_fieldAccessorTable
@@ -418,7 +408,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -430,18 +419,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_ListCryptoKeyVersionsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.ListCryptoKeyVersionsRequest getDefaultInstanceForType() {
       return com.google.cloud.kms.v1.ListCryptoKeyVersionsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.ListCryptoKeyVersionsRequest build() {
       com.google.cloud.kms.v1.ListCryptoKeyVersionsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -450,7 +436,6 @@ public com.google.cloud.kms.v1.ListCryptoKeyVersionsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.ListCryptoKeyVersionsRequest buildPartial() {
       com.google.cloud.kms.v1.ListCryptoKeyVersionsRequest result = new com.google.cloud.kms.v1.ListCryptoKeyVersionsRequest(this);
       result.parent_ = parent_;
@@ -460,39 +445,32 @@ public com.google.cloud.kms.v1.ListCryptoKeyVersionsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.kms.v1.ListCryptoKeyVersionsRequest) {
         return mergeFrom((com.google.cloud.kms.v1.ListCryptoKeyVersionsRequest)other);
@@ -520,12 +498,10 @@ public Builder mergeFrom(com.google.cloud.kms.v1.ListCryptoKeyVersionsRequest ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -781,13 +757,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -809,12 +783,11 @@ public static com.google.cloud.kms.v1.ListCryptoKeyVersionsRequest getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListCryptoKeyVersionsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListCryptoKeyVersionsRequest(input, extensionRegistry);
+        return new ListCryptoKeyVersionsRequest(input, extensionRegistry);
     }
   };
 
@@ -827,7 +800,6 @@ public com.google.protobuf.Parser getParserForType
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.kms.v1.ListCryptoKeyVersionsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeyVersionsResponse.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeyVersionsResponse.java
index 23cdff7c4d8a..3e0da8a51d97 100644
--- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeyVersionsResponse.java
+++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeyVersionsResponse.java
@@ -35,9 +35,6 @@ private ListCryptoKeyVersionsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListCryptoKeyVersionsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               cryptoKeyVersions_ = new java.util.ArrayList();
@@ -69,13 +73,6 @@ private ListCryptoKeyVersionsResponse(
             totalSize_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private ListCryptoKeyVersionsResponse(
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_ListCryptoKeyVersionsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_ListCryptoKeyVersionsResponse_fieldAccessorTable
@@ -221,7 +217,6 @@ public int getTotalSize() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -231,7 +226,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < cryptoKeyVersions_.size(); i++) {
@@ -246,7 +240,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -379,7 +372,6 @@ public static com.google.cloud.kms.v1.ListCryptoKeyVersionsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -387,7 +379,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.kms.v1.ListCryptoKeyVersionsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -415,7 +406,6 @@ public static final class Builder extends
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_ListCryptoKeyVersionsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_ListCryptoKeyVersionsResponse_fieldAccessorTable
@@ -439,7 +429,6 @@ private void maybeForceBuilderInitialization() {
         getCryptoKeyVersionsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (cryptoKeyVersionsBuilder_ == null) {
@@ -455,18 +444,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_ListCryptoKeyVersionsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.ListCryptoKeyVersionsResponse getDefaultInstanceForType() {
       return com.google.cloud.kms.v1.ListCryptoKeyVersionsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.ListCryptoKeyVersionsResponse build() {
       com.google.cloud.kms.v1.ListCryptoKeyVersionsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -475,7 +461,6 @@ public com.google.cloud.kms.v1.ListCryptoKeyVersionsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.ListCryptoKeyVersionsResponse buildPartial() {
       com.google.cloud.kms.v1.ListCryptoKeyVersionsResponse result = new com.google.cloud.kms.v1.ListCryptoKeyVersionsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -496,39 +481,32 @@ public com.google.cloud.kms.v1.ListCryptoKeyVersionsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.kms.v1.ListCryptoKeyVersionsResponse) {
         return mergeFrom((com.google.cloud.kms.v1.ListCryptoKeyVersionsResponse)other);
@@ -578,12 +556,10 @@ public Builder mergeFrom(com.google.cloud.kms.v1.ListCryptoKeyVersionsResponse o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1054,13 +1030,11 @@ public Builder clearTotalSize() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1082,12 +1056,11 @@ public static com.google.cloud.kms.v1.ListCryptoKeyVersionsResponse getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListCryptoKeyVersionsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListCryptoKeyVersionsResponse(input, extensionRegistry);
+        return new ListCryptoKeyVersionsResponse(input, extensionRegistry);
     }
   };
 
@@ -1100,7 +1073,6 @@ public com.google.protobuf.Parser getParserForTyp
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.kms.v1.ListCryptoKeyVersionsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeysRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeysRequest.java
index 1424dffd0719..191f231f66bf 100644
--- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeysRequest.java
+++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeysRequest.java
@@ -35,9 +35,6 @@ private ListCryptoKeysRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListCryptoKeysRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ListCryptoKeysRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListCryptoKeysRequest(
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_ListCryptoKeysRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_ListCryptoKeysRequest_fieldAccessorTable
@@ -203,7 +199,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -213,7 +208,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -228,7 +222,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -358,7 +351,6 @@ public static com.google.cloud.kms.v1.ListCryptoKeysRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -366,7 +358,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.kms.v1.ListCryptoKeysRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -394,7 +385,6 @@ public static final class Builder extends
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_ListCryptoKeysRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_ListCryptoKeysRequest_fieldAccessorTable
@@ -417,7 +407,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -429,18 +418,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_ListCryptoKeysRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.ListCryptoKeysRequest getDefaultInstanceForType() {
       return com.google.cloud.kms.v1.ListCryptoKeysRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.ListCryptoKeysRequest build() {
       com.google.cloud.kms.v1.ListCryptoKeysRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -449,7 +435,6 @@ public com.google.cloud.kms.v1.ListCryptoKeysRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.ListCryptoKeysRequest buildPartial() {
       com.google.cloud.kms.v1.ListCryptoKeysRequest result = new com.google.cloud.kms.v1.ListCryptoKeysRequest(this);
       result.parent_ = parent_;
@@ -459,39 +444,32 @@ public com.google.cloud.kms.v1.ListCryptoKeysRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.kms.v1.ListCryptoKeysRequest) {
         return mergeFrom((com.google.cloud.kms.v1.ListCryptoKeysRequest)other);
@@ -519,12 +497,10 @@ public Builder mergeFrom(com.google.cloud.kms.v1.ListCryptoKeysRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -777,13 +753,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -805,12 +779,11 @@ public static com.google.cloud.kms.v1.ListCryptoKeysRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListCryptoKeysRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListCryptoKeysRequest(input, extensionRegistry);
+        return new ListCryptoKeysRequest(input, extensionRegistry);
     }
   };
 
@@ -823,7 +796,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.kms.v1.ListCryptoKeysRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeysResponse.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeysResponse.java
index a5caf53e9d4a..bb159dfde2d8 100644
--- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeysResponse.java
+++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListCryptoKeysResponse.java
@@ -35,9 +35,6 @@ private ListCryptoKeysResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListCryptoKeysResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               cryptoKeys_ = new java.util.ArrayList();
@@ -69,13 +73,6 @@ private ListCryptoKeysResponse(
             totalSize_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private ListCryptoKeysResponse(
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_ListCryptoKeysResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_ListCryptoKeysResponse_fieldAccessorTable
@@ -218,7 +214,6 @@ public int getTotalSize() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -228,7 +223,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < cryptoKeys_.size(); i++) {
@@ -243,7 +237,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -376,7 +369,6 @@ public static com.google.cloud.kms.v1.ListCryptoKeysResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -384,7 +376,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.kms.v1.ListCryptoKeysResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -412,7 +403,6 @@ public static final class Builder extends
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_ListCryptoKeysResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_ListCryptoKeysResponse_fieldAccessorTable
@@ -436,7 +426,6 @@ private void maybeForceBuilderInitialization() {
         getCryptoKeysFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (cryptoKeysBuilder_ == null) {
@@ -452,18 +441,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_ListCryptoKeysResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.ListCryptoKeysResponse getDefaultInstanceForType() {
       return com.google.cloud.kms.v1.ListCryptoKeysResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.ListCryptoKeysResponse build() {
       com.google.cloud.kms.v1.ListCryptoKeysResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -472,7 +458,6 @@ public com.google.cloud.kms.v1.ListCryptoKeysResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.ListCryptoKeysResponse buildPartial() {
       com.google.cloud.kms.v1.ListCryptoKeysResponse result = new com.google.cloud.kms.v1.ListCryptoKeysResponse(this);
       int from_bitField0_ = bitField0_;
@@ -493,39 +478,32 @@ public com.google.cloud.kms.v1.ListCryptoKeysResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.kms.v1.ListCryptoKeysResponse) {
         return mergeFrom((com.google.cloud.kms.v1.ListCryptoKeysResponse)other);
@@ -575,12 +553,10 @@ public Builder mergeFrom(com.google.cloud.kms.v1.ListCryptoKeysResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1043,13 +1019,11 @@ public Builder clearTotalSize() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1071,12 +1045,11 @@ public static com.google.cloud.kms.v1.ListCryptoKeysResponse getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListCryptoKeysResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListCryptoKeysResponse(input, extensionRegistry);
+        return new ListCryptoKeysResponse(input, extensionRegistry);
     }
   };
 
@@ -1089,7 +1062,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.kms.v1.ListCryptoKeysResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListKeyRingsRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListKeyRingsRequest.java
index ee4f4684fb8c..2275b39b57c2 100644
--- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListKeyRingsRequest.java
+++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListKeyRingsRequest.java
@@ -35,9 +35,6 @@ private ListKeyRingsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListKeyRingsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ListKeyRingsRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListKeyRingsRequest(
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_ListKeyRingsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_ListKeyRingsRequest_fieldAccessorTable
@@ -203,7 +199,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -213,7 +208,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -228,7 +222,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -358,7 +351,6 @@ public static com.google.cloud.kms.v1.ListKeyRingsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -366,7 +358,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.kms.v1.ListKeyRingsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -394,7 +385,6 @@ public static final class Builder extends
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_ListKeyRingsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_ListKeyRingsRequest_fieldAccessorTable
@@ -417,7 +407,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -429,18 +418,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_ListKeyRingsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.ListKeyRingsRequest getDefaultInstanceForType() {
       return com.google.cloud.kms.v1.ListKeyRingsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.ListKeyRingsRequest build() {
       com.google.cloud.kms.v1.ListKeyRingsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -449,7 +435,6 @@ public com.google.cloud.kms.v1.ListKeyRingsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.ListKeyRingsRequest buildPartial() {
       com.google.cloud.kms.v1.ListKeyRingsRequest result = new com.google.cloud.kms.v1.ListKeyRingsRequest(this);
       result.parent_ = parent_;
@@ -459,39 +444,32 @@ public com.google.cloud.kms.v1.ListKeyRingsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.kms.v1.ListKeyRingsRequest) {
         return mergeFrom((com.google.cloud.kms.v1.ListKeyRingsRequest)other);
@@ -519,12 +497,10 @@ public Builder mergeFrom(com.google.cloud.kms.v1.ListKeyRingsRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -777,13 +753,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -805,12 +779,11 @@ public static com.google.cloud.kms.v1.ListKeyRingsRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListKeyRingsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListKeyRingsRequest(input, extensionRegistry);
+        return new ListKeyRingsRequest(input, extensionRegistry);
     }
   };
 
@@ -823,7 +796,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.kms.v1.ListKeyRingsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListKeyRingsResponse.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListKeyRingsResponse.java
index 9893fd99c270..8e9bc1702fa1 100644
--- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListKeyRingsResponse.java
+++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/ListKeyRingsResponse.java
@@ -35,9 +35,6 @@ private ListKeyRingsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListKeyRingsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               keyRings_ = new java.util.ArrayList();
@@ -69,13 +73,6 @@ private ListKeyRingsResponse(
             totalSize_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private ListKeyRingsResponse(
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_ListKeyRingsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_ListKeyRingsResponse_fieldAccessorTable
@@ -218,7 +214,6 @@ public int getTotalSize() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -228,7 +223,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < keyRings_.size(); i++) {
@@ -243,7 +237,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -376,7 +369,6 @@ public static com.google.cloud.kms.v1.ListKeyRingsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -384,7 +376,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.kms.v1.ListKeyRingsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -412,7 +403,6 @@ public static final class Builder extends
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_ListKeyRingsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_ListKeyRingsResponse_fieldAccessorTable
@@ -436,7 +426,6 @@ private void maybeForceBuilderInitialization() {
         getKeyRingsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (keyRingsBuilder_ == null) {
@@ -452,18 +441,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_ListKeyRingsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.ListKeyRingsResponse getDefaultInstanceForType() {
       return com.google.cloud.kms.v1.ListKeyRingsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.ListKeyRingsResponse build() {
       com.google.cloud.kms.v1.ListKeyRingsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -472,7 +458,6 @@ public com.google.cloud.kms.v1.ListKeyRingsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.ListKeyRingsResponse buildPartial() {
       com.google.cloud.kms.v1.ListKeyRingsResponse result = new com.google.cloud.kms.v1.ListKeyRingsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -493,39 +478,32 @@ public com.google.cloud.kms.v1.ListKeyRingsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.kms.v1.ListKeyRingsResponse) {
         return mergeFrom((com.google.cloud.kms.v1.ListKeyRingsResponse)other);
@@ -575,12 +553,10 @@ public Builder mergeFrom(com.google.cloud.kms.v1.ListKeyRingsResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1043,13 +1019,11 @@ public Builder clearTotalSize() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1071,12 +1045,11 @@ public static com.google.cloud.kms.v1.ListKeyRingsResponse getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListKeyRingsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListKeyRingsResponse(input, extensionRegistry);
+        return new ListKeyRingsResponse(input, extensionRegistry);
     }
   };
 
@@ -1089,7 +1062,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.kms.v1.ListKeyRingsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/RestoreCryptoKeyVersionRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/RestoreCryptoKeyVersionRequest.java
index 2b984bef0789..ac8f8d2bd428 100644
--- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/RestoreCryptoKeyVersionRequest.java
+++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/RestoreCryptoKeyVersionRequest.java
@@ -33,9 +33,6 @@ private RestoreCryptoKeyVersionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private RestoreCryptoKeyVersionRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private RestoreCryptoKeyVersionRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private RestoreCryptoKeyVersionRequest(
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_RestoreCryptoKeyVersionRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_RestoreCryptoKeyVersionRequest_fieldAccessorTable
@@ -128,7 +124,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -138,7 +133,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -147,7 +141,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -262,7 +255,6 @@ public static com.google.cloud.kms.v1.RestoreCryptoKeyVersionRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -270,7 +262,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.kms.v1.RestoreCryptoKeyVersionRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -298,7 +289,6 @@ public static final class Builder extends
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_RestoreCryptoKeyVersionRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_RestoreCryptoKeyVersionRequest_fieldAccessorTable
@@ -321,7 +311,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -329,18 +318,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_RestoreCryptoKeyVersionRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.RestoreCryptoKeyVersionRequest getDefaultInstanceForType() {
       return com.google.cloud.kms.v1.RestoreCryptoKeyVersionRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.RestoreCryptoKeyVersionRequest build() {
       com.google.cloud.kms.v1.RestoreCryptoKeyVersionRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -349,7 +335,6 @@ public com.google.cloud.kms.v1.RestoreCryptoKeyVersionRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.RestoreCryptoKeyVersionRequest buildPartial() {
       com.google.cloud.kms.v1.RestoreCryptoKeyVersionRequest result = new com.google.cloud.kms.v1.RestoreCryptoKeyVersionRequest(this);
       result.name_ = name_;
@@ -357,39 +342,32 @@ public com.google.cloud.kms.v1.RestoreCryptoKeyVersionRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.kms.v1.RestoreCryptoKeyVersionRequest) {
         return mergeFrom((com.google.cloud.kms.v1.RestoreCryptoKeyVersionRequest)other);
@@ -410,12 +388,10 @@ public Builder mergeFrom(com.google.cloud.kms.v1.RestoreCryptoKeyVersionRequest
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -522,13 +498,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -550,12 +524,11 @@ public static com.google.cloud.kms.v1.RestoreCryptoKeyVersionRequest getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RestoreCryptoKeyVersionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RestoreCryptoKeyVersionRequest(input, extensionRegistry);
+        return new RestoreCryptoKeyVersionRequest(input, extensionRegistry);
     }
   };
 
@@ -568,7 +541,6 @@ public com.google.protobuf.Parser getParserForTy
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.kms.v1.RestoreCryptoKeyVersionRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/UpdateCryptoKeyPrimaryVersionRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/UpdateCryptoKeyPrimaryVersionRequest.java
index ce2ed7d37a6d..92cdec65355f 100644
--- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/UpdateCryptoKeyPrimaryVersionRequest.java
+++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/UpdateCryptoKeyPrimaryVersionRequest.java
@@ -34,9 +34,6 @@ private UpdateCryptoKeyPrimaryVersionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private UpdateCryptoKeyPrimaryVersionRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private UpdateCryptoKeyPrimaryVersionRequest(
             cryptoKeyVersionId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private UpdateCryptoKeyPrimaryVersionRequest(
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_UpdateCryptoKeyPrimaryVersionRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_UpdateCryptoKeyPrimaryVersionRequest_fieldAccessorTable
@@ -177,7 +173,6 @@ public java.lang.String getCryptoKeyVersionId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -187,7 +182,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -199,7 +193,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -321,7 +314,6 @@ public static com.google.cloud.kms.v1.UpdateCryptoKeyPrimaryVersionRequest parse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -329,7 +321,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.kms.v1.UpdateCryptoKeyPrimaryVersionRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -357,7 +348,6 @@ public static final class Builder extends
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_UpdateCryptoKeyPrimaryVersionRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_UpdateCryptoKeyPrimaryVersionRequest_fieldAccessorTable
@@ -380,7 +370,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -390,18 +379,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_UpdateCryptoKeyPrimaryVersionRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.UpdateCryptoKeyPrimaryVersionRequest getDefaultInstanceForType() {
       return com.google.cloud.kms.v1.UpdateCryptoKeyPrimaryVersionRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.UpdateCryptoKeyPrimaryVersionRequest build() {
       com.google.cloud.kms.v1.UpdateCryptoKeyPrimaryVersionRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -410,7 +396,6 @@ public com.google.cloud.kms.v1.UpdateCryptoKeyPrimaryVersionRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.UpdateCryptoKeyPrimaryVersionRequest buildPartial() {
       com.google.cloud.kms.v1.UpdateCryptoKeyPrimaryVersionRequest result = new com.google.cloud.kms.v1.UpdateCryptoKeyPrimaryVersionRequest(this);
       result.name_ = name_;
@@ -419,39 +404,32 @@ public com.google.cloud.kms.v1.UpdateCryptoKeyPrimaryVersionRequest buildPartial
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.kms.v1.UpdateCryptoKeyPrimaryVersionRequest) {
         return mergeFrom((com.google.cloud.kms.v1.UpdateCryptoKeyPrimaryVersionRequest)other);
@@ -476,12 +454,10 @@ public Builder mergeFrom(com.google.cloud.kms.v1.UpdateCryptoKeyPrimaryVersionRe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -677,13 +653,11 @@ public Builder setCryptoKeyVersionIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -705,12 +679,11 @@ public static com.google.cloud.kms.v1.UpdateCryptoKeyPrimaryVersionRequest getDe
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateCryptoKeyPrimaryVersionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateCryptoKeyPrimaryVersionRequest(input, extensionRegistry);
+        return new UpdateCryptoKeyPrimaryVersionRequest(input, extensionRegistry);
     }
   };
 
@@ -723,7 +696,6 @@ public com.google.protobuf.Parser getParse
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.kms.v1.UpdateCryptoKeyPrimaryVersionRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/UpdateCryptoKeyRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/UpdateCryptoKeyRequest.java
index 249feb2c1a6d..6c13fd3e28a6 100644
--- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/UpdateCryptoKeyRequest.java
+++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/UpdateCryptoKeyRequest.java
@@ -32,9 +32,6 @@ private UpdateCryptoKeyRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private UpdateCryptoKeyRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.kms.v1.CryptoKey.Builder subBuilder = null;
             if (cryptoKey_ != null) {
@@ -72,13 +76,6 @@ private UpdateCryptoKeyRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private UpdateCryptoKeyRequest(
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_UpdateCryptoKeyRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_UpdateCryptoKeyRequest_fieldAccessorTable
@@ -171,7 +167,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -181,7 +176,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (cryptoKey_ != null) {
@@ -193,7 +187,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -327,7 +320,6 @@ public static com.google.cloud.kms.v1.UpdateCryptoKeyRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -335,7 +327,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.kms.v1.UpdateCryptoKeyRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -363,7 +354,6 @@ public static final class Builder extends
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_UpdateCryptoKeyRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_UpdateCryptoKeyRequest_fieldAccessorTable
@@ -386,7 +376,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (cryptoKeyBuilder_ == null) {
@@ -404,18 +393,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_UpdateCryptoKeyRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.UpdateCryptoKeyRequest getDefaultInstanceForType() {
       return com.google.cloud.kms.v1.UpdateCryptoKeyRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.UpdateCryptoKeyRequest build() {
       com.google.cloud.kms.v1.UpdateCryptoKeyRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -424,7 +410,6 @@ public com.google.cloud.kms.v1.UpdateCryptoKeyRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.UpdateCryptoKeyRequest buildPartial() {
       com.google.cloud.kms.v1.UpdateCryptoKeyRequest result = new com.google.cloud.kms.v1.UpdateCryptoKeyRequest(this);
       if (cryptoKeyBuilder_ == null) {
@@ -441,39 +426,32 @@ public com.google.cloud.kms.v1.UpdateCryptoKeyRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.kms.v1.UpdateCryptoKeyRequest) {
         return mergeFrom((com.google.cloud.kms.v1.UpdateCryptoKeyRequest)other);
@@ -496,12 +474,10 @@ public Builder mergeFrom(com.google.cloud.kms.v1.UpdateCryptoKeyRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -825,13 +801,11 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
       }
       return updateMaskBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -853,12 +827,11 @@ public static com.google.cloud.kms.v1.UpdateCryptoKeyRequest getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateCryptoKeyRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateCryptoKeyRequest(input, extensionRegistry);
+        return new UpdateCryptoKeyRequest(input, extensionRegistry);
     }
   };
 
@@ -871,7 +844,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.kms.v1.UpdateCryptoKeyRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/UpdateCryptoKeyVersionRequest.java b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/UpdateCryptoKeyVersionRequest.java
index d82424adff80..aaf2b8d4ae04 100644
--- a/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/UpdateCryptoKeyVersionRequest.java
+++ b/google-api-grpc/proto-google-cloud-kms-v1/src/main/java/com/google/cloud/kms/v1/UpdateCryptoKeyVersionRequest.java
@@ -32,9 +32,6 @@ private UpdateCryptoKeyVersionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private UpdateCryptoKeyVersionRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.kms.v1.CryptoKeyVersion.Builder subBuilder = null;
             if (cryptoKeyVersion_ != null) {
@@ -72,13 +76,6 @@ private UpdateCryptoKeyVersionRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private UpdateCryptoKeyVersionRequest(
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_UpdateCryptoKeyVersionRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_UpdateCryptoKeyVersionRequest_fieldAccessorTable
@@ -171,7 +167,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -181,7 +176,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (cryptoKeyVersion_ != null) {
@@ -193,7 +187,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -327,7 +320,6 @@ public static com.google.cloud.kms.v1.UpdateCryptoKeyVersionRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -335,7 +327,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.kms.v1.UpdateCryptoKeyVersionRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -363,7 +354,6 @@ public static final class Builder extends
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_UpdateCryptoKeyVersionRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_UpdateCryptoKeyVersionRequest_fieldAccessorTable
@@ -386,7 +376,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (cryptoKeyVersionBuilder_ == null) {
@@ -404,18 +393,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.kms.v1.KmsProto.internal_static_google_cloud_kms_v1_UpdateCryptoKeyVersionRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.UpdateCryptoKeyVersionRequest getDefaultInstanceForType() {
       return com.google.cloud.kms.v1.UpdateCryptoKeyVersionRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.UpdateCryptoKeyVersionRequest build() {
       com.google.cloud.kms.v1.UpdateCryptoKeyVersionRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -424,7 +410,6 @@ public com.google.cloud.kms.v1.UpdateCryptoKeyVersionRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.kms.v1.UpdateCryptoKeyVersionRequest buildPartial() {
       com.google.cloud.kms.v1.UpdateCryptoKeyVersionRequest result = new com.google.cloud.kms.v1.UpdateCryptoKeyVersionRequest(this);
       if (cryptoKeyVersionBuilder_ == null) {
@@ -441,39 +426,32 @@ public com.google.cloud.kms.v1.UpdateCryptoKeyVersionRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.kms.v1.UpdateCryptoKeyVersionRequest) {
         return mergeFrom((com.google.cloud.kms.v1.UpdateCryptoKeyVersionRequest)other);
@@ -496,12 +474,10 @@ public Builder mergeFrom(com.google.cloud.kms.v1.UpdateCryptoKeyVersionRequest o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -825,13 +801,11 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
       }
       return updateMaskBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -853,12 +827,11 @@ public static com.google.cloud.kms.v1.UpdateCryptoKeyVersionRequest getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateCryptoKeyVersionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateCryptoKeyVersionRequest(input, extensionRegistry);
+        return new UpdateCryptoKeyVersionRequest(input, extensionRegistry);
     }
   };
 
@@ -871,7 +844,6 @@ public com.google.protobuf.Parser getParserForTyp
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.kms.v1.UpdateCryptoKeyVersionRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitiesRequest.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitiesRequest.java
index efb9c38948fd..e26b2f1cb31b 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitiesRequest.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitiesRequest.java
@@ -33,9 +33,6 @@ private AnalyzeEntitiesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private AnalyzeEntitiesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.language.v1.Document.Builder subBuilder = null;
             if (document_ != null) {
@@ -66,13 +70,6 @@ private AnalyzeEntitiesRequest(
             encodingType_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private AnalyzeEntitiesRequest(
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeEntitiesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeEntitiesRequest_fieldAccessorTable
@@ -151,13 +147,11 @@ public int getEncodingTypeValue() {
    * .google.cloud.language.v1.EncodingType encoding_type = 2;
    */
   public com.google.cloud.language.v1.EncodingType getEncodingType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1.EncodingType result = com.google.cloud.language.v1.EncodingType.valueOf(encodingType_);
     return result == null ? com.google.cloud.language.v1.EncodingType.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -167,7 +161,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (document_ != null) {
@@ -179,7 +172,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -307,7 +299,6 @@ public static com.google.cloud.language.v1.AnalyzeEntitiesRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -315,7 +306,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1.AnalyzeEntitiesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -343,7 +333,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeEntitiesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeEntitiesRequest_fieldAccessorTable
@@ -366,7 +355,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (documentBuilder_ == null) {
@@ -380,18 +368,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeEntitiesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.AnalyzeEntitiesRequest getDefaultInstanceForType() {
       return com.google.cloud.language.v1.AnalyzeEntitiesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.AnalyzeEntitiesRequest build() {
       com.google.cloud.language.v1.AnalyzeEntitiesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -400,7 +385,6 @@ public com.google.cloud.language.v1.AnalyzeEntitiesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.AnalyzeEntitiesRequest buildPartial() {
       com.google.cloud.language.v1.AnalyzeEntitiesRequest result = new com.google.cloud.language.v1.AnalyzeEntitiesRequest(this);
       if (documentBuilder_ == null) {
@@ -413,39 +397,32 @@ public com.google.cloud.language.v1.AnalyzeEntitiesRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1.AnalyzeEntitiesRequest) {
         return mergeFrom((com.google.cloud.language.v1.AnalyzeEntitiesRequest)other);
@@ -468,12 +445,10 @@ public Builder mergeFrom(com.google.cloud.language.v1.AnalyzeEntitiesRequest oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -676,7 +651,6 @@ public Builder setEncodingTypeValue(int value) {
      * .google.cloud.language.v1.EncodingType encoding_type = 2;
      */
     public com.google.cloud.language.v1.EncodingType getEncodingType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1.EncodingType result = com.google.cloud.language.v1.EncodingType.valueOf(encodingType_);
       return result == null ? com.google.cloud.language.v1.EncodingType.UNRECOGNIZED : result;
     }
@@ -709,13 +683,11 @@ public Builder clearEncodingType() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -737,12 +709,11 @@ public static com.google.cloud.language.v1.AnalyzeEntitiesRequest getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnalyzeEntitiesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeEntitiesRequest(input, extensionRegistry);
+        return new AnalyzeEntitiesRequest(input, extensionRegistry);
     }
   };
 
@@ -755,7 +726,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1.AnalyzeEntitiesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitiesResponse.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitiesResponse.java
index 8d7d8055d719..c07763ee40b7 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitiesResponse.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitiesResponse.java
@@ -34,9 +34,6 @@ private AnalyzeEntitiesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private AnalyzeEntitiesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               entities_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private AnalyzeEntitiesResponse(
             language_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private AnalyzeEntitiesResponse(
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeEntitiesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeEntitiesResponse_fieldAccessorTable
@@ -201,7 +197,6 @@ public java.lang.String getLanguage() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -211,7 +206,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < entities_.size(); i++) {
@@ -223,7 +217,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.cloud.language.v1.AnalyzeEntitiesResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1.AnalyzeEntitiesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeEntitiesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeEntitiesResponse_fieldAccessorTable
@@ -408,7 +398,6 @@ private void maybeForceBuilderInitialization() {
         getEntitiesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (entitiesBuilder_ == null) {
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeEntitiesResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.AnalyzeEntitiesResponse getDefaultInstanceForType() {
       return com.google.cloud.language.v1.AnalyzeEntitiesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.AnalyzeEntitiesResponse build() {
       com.google.cloud.language.v1.AnalyzeEntitiesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public com.google.cloud.language.v1.AnalyzeEntitiesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.AnalyzeEntitiesResponse buildPartial() {
       com.google.cloud.language.v1.AnalyzeEntitiesResponse result = new com.google.cloud.language.v1.AnalyzeEntitiesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -462,39 +447,32 @@ public com.google.cloud.language.v1.AnalyzeEntitiesResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1.AnalyzeEntitiesResponse) {
         return mergeFrom((com.google.cloud.language.v1.AnalyzeEntitiesResponse)other);
@@ -541,12 +519,10 @@ public Builder mergeFrom(com.google.cloud.language.v1.AnalyzeEntitiesResponse ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -976,13 +952,11 @@ public Builder setLanguageBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1004,12 +978,11 @@ public static com.google.cloud.language.v1.AnalyzeEntitiesResponse getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnalyzeEntitiesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeEntitiesResponse(input, extensionRegistry);
+        return new AnalyzeEntitiesResponse(input, extensionRegistry);
     }
   };
 
@@ -1022,7 +995,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1.AnalyzeEntitiesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitySentimentRequest.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitySentimentRequest.java
index 6dbdcb2a4471..bde4b0e4bb72 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitySentimentRequest.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitySentimentRequest.java
@@ -33,9 +33,6 @@ private AnalyzeEntitySentimentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private AnalyzeEntitySentimentRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.language.v1.Document.Builder subBuilder = null;
             if (document_ != null) {
@@ -66,13 +70,6 @@ private AnalyzeEntitySentimentRequest(
             encodingType_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private AnalyzeEntitySentimentRequest(
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeEntitySentimentRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeEntitySentimentRequest_fieldAccessorTable
@@ -151,13 +147,11 @@ public int getEncodingTypeValue() {
    * .google.cloud.language.v1.EncodingType encoding_type = 2;
    */
   public com.google.cloud.language.v1.EncodingType getEncodingType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1.EncodingType result = com.google.cloud.language.v1.EncodingType.valueOf(encodingType_);
     return result == null ? com.google.cloud.language.v1.EncodingType.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -167,7 +161,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (document_ != null) {
@@ -179,7 +172,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -307,7 +299,6 @@ public static com.google.cloud.language.v1.AnalyzeEntitySentimentRequest parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -315,7 +306,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1.AnalyzeEntitySentimentRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -343,7 +333,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeEntitySentimentRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeEntitySentimentRequest_fieldAccessorTable
@@ -366,7 +355,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (documentBuilder_ == null) {
@@ -380,18 +368,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeEntitySentimentRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.AnalyzeEntitySentimentRequest getDefaultInstanceForType() {
       return com.google.cloud.language.v1.AnalyzeEntitySentimentRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.AnalyzeEntitySentimentRequest build() {
       com.google.cloud.language.v1.AnalyzeEntitySentimentRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -400,7 +385,6 @@ public com.google.cloud.language.v1.AnalyzeEntitySentimentRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.AnalyzeEntitySentimentRequest buildPartial() {
       com.google.cloud.language.v1.AnalyzeEntitySentimentRequest result = new com.google.cloud.language.v1.AnalyzeEntitySentimentRequest(this);
       if (documentBuilder_ == null) {
@@ -413,39 +397,32 @@ public com.google.cloud.language.v1.AnalyzeEntitySentimentRequest buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1.AnalyzeEntitySentimentRequest) {
         return mergeFrom((com.google.cloud.language.v1.AnalyzeEntitySentimentRequest)other);
@@ -468,12 +445,10 @@ public Builder mergeFrom(com.google.cloud.language.v1.AnalyzeEntitySentimentRequ
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -676,7 +651,6 @@ public Builder setEncodingTypeValue(int value) {
      * .google.cloud.language.v1.EncodingType encoding_type = 2;
      */
     public com.google.cloud.language.v1.EncodingType getEncodingType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1.EncodingType result = com.google.cloud.language.v1.EncodingType.valueOf(encodingType_);
       return result == null ? com.google.cloud.language.v1.EncodingType.UNRECOGNIZED : result;
     }
@@ -709,13 +683,11 @@ public Builder clearEncodingType() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -737,12 +709,11 @@ public static com.google.cloud.language.v1.AnalyzeEntitySentimentRequest getDefa
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnalyzeEntitySentimentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeEntitySentimentRequest(input, extensionRegistry);
+        return new AnalyzeEntitySentimentRequest(input, extensionRegistry);
     }
   };
 
@@ -755,7 +726,6 @@ public com.google.protobuf.Parser getParserForTyp
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1.AnalyzeEntitySentimentRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitySentimentResponse.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitySentimentResponse.java
index 29161cba51cd..6a26f096da30 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitySentimentResponse.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeEntitySentimentResponse.java
@@ -34,9 +34,6 @@ private AnalyzeEntitySentimentResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private AnalyzeEntitySentimentResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               entities_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private AnalyzeEntitySentimentResponse(
             language_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private AnalyzeEntitySentimentResponse(
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeEntitySentimentResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeEntitySentimentResponse_fieldAccessorTable
@@ -201,7 +197,6 @@ public java.lang.String getLanguage() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -211,7 +206,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < entities_.size(); i++) {
@@ -223,7 +217,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.cloud.language.v1.AnalyzeEntitySentimentResponse parseF
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1.AnalyzeEntitySentimentResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeEntitySentimentResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeEntitySentimentResponse_fieldAccessorTable
@@ -408,7 +398,6 @@ private void maybeForceBuilderInitialization() {
         getEntitiesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (entitiesBuilder_ == null) {
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeEntitySentimentResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.AnalyzeEntitySentimentResponse getDefaultInstanceForType() {
       return com.google.cloud.language.v1.AnalyzeEntitySentimentResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.AnalyzeEntitySentimentResponse build() {
       com.google.cloud.language.v1.AnalyzeEntitySentimentResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public com.google.cloud.language.v1.AnalyzeEntitySentimentResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.AnalyzeEntitySentimentResponse buildPartial() {
       com.google.cloud.language.v1.AnalyzeEntitySentimentResponse result = new com.google.cloud.language.v1.AnalyzeEntitySentimentResponse(this);
       int from_bitField0_ = bitField0_;
@@ -462,39 +447,32 @@ public com.google.cloud.language.v1.AnalyzeEntitySentimentResponse buildPartial(
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1.AnalyzeEntitySentimentResponse) {
         return mergeFrom((com.google.cloud.language.v1.AnalyzeEntitySentimentResponse)other);
@@ -541,12 +519,10 @@ public Builder mergeFrom(com.google.cloud.language.v1.AnalyzeEntitySentimentResp
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -976,13 +952,11 @@ public Builder setLanguageBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1004,12 +978,11 @@ public static com.google.cloud.language.v1.AnalyzeEntitySentimentResponse getDef
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnalyzeEntitySentimentResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeEntitySentimentResponse(input, extensionRegistry);
+        return new AnalyzeEntitySentimentResponse(input, extensionRegistry);
     }
   };
 
@@ -1022,7 +995,6 @@ public com.google.protobuf.Parser getParserForTy
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1.AnalyzeEntitySentimentResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSentimentRequest.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSentimentRequest.java
index 9d3256cc159b..081f8dd87104 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSentimentRequest.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSentimentRequest.java
@@ -33,9 +33,6 @@ private AnalyzeSentimentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private AnalyzeSentimentRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.language.v1.Document.Builder subBuilder = null;
             if (document_ != null) {
@@ -66,13 +70,6 @@ private AnalyzeSentimentRequest(
             encodingType_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private AnalyzeSentimentRequest(
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeSentimentRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeSentimentRequest_fieldAccessorTable
@@ -151,13 +147,11 @@ public int getEncodingTypeValue() {
    * .google.cloud.language.v1.EncodingType encoding_type = 2;
    */
   public com.google.cloud.language.v1.EncodingType getEncodingType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1.EncodingType result = com.google.cloud.language.v1.EncodingType.valueOf(encodingType_);
     return result == null ? com.google.cloud.language.v1.EncodingType.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -167,7 +161,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (document_ != null) {
@@ -179,7 +172,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -307,7 +299,6 @@ public static com.google.cloud.language.v1.AnalyzeSentimentRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -315,7 +306,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1.AnalyzeSentimentRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -343,7 +333,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeSentimentRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeSentimentRequest_fieldAccessorTable
@@ -366,7 +355,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (documentBuilder_ == null) {
@@ -380,18 +368,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeSentimentRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.AnalyzeSentimentRequest getDefaultInstanceForType() {
       return com.google.cloud.language.v1.AnalyzeSentimentRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.AnalyzeSentimentRequest build() {
       com.google.cloud.language.v1.AnalyzeSentimentRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -400,7 +385,6 @@ public com.google.cloud.language.v1.AnalyzeSentimentRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.AnalyzeSentimentRequest buildPartial() {
       com.google.cloud.language.v1.AnalyzeSentimentRequest result = new com.google.cloud.language.v1.AnalyzeSentimentRequest(this);
       if (documentBuilder_ == null) {
@@ -413,39 +397,32 @@ public com.google.cloud.language.v1.AnalyzeSentimentRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1.AnalyzeSentimentRequest) {
         return mergeFrom((com.google.cloud.language.v1.AnalyzeSentimentRequest)other);
@@ -468,12 +445,10 @@ public Builder mergeFrom(com.google.cloud.language.v1.AnalyzeSentimentRequest ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -676,7 +651,6 @@ public Builder setEncodingTypeValue(int value) {
      * .google.cloud.language.v1.EncodingType encoding_type = 2;
      */
     public com.google.cloud.language.v1.EncodingType getEncodingType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1.EncodingType result = com.google.cloud.language.v1.EncodingType.valueOf(encodingType_);
       return result == null ? com.google.cloud.language.v1.EncodingType.UNRECOGNIZED : result;
     }
@@ -709,13 +683,11 @@ public Builder clearEncodingType() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -737,12 +709,11 @@ public static com.google.cloud.language.v1.AnalyzeSentimentRequest getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnalyzeSentimentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeSentimentRequest(input, extensionRegistry);
+        return new AnalyzeSentimentRequest(input, extensionRegistry);
     }
   };
 
@@ -755,7 +726,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1.AnalyzeSentimentRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSentimentResponse.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSentimentResponse.java
index 5bb65be090ea..0f0949070968 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSentimentResponse.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSentimentResponse.java
@@ -34,9 +34,6 @@ private AnalyzeSentimentResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private AnalyzeSentimentResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.language.v1.Sentiment.Builder subBuilder = null;
             if (documentSentiment_ != null) {
@@ -76,13 +80,6 @@ private AnalyzeSentimentResponse(
                 input.readMessage(com.google.cloud.language.v1.Sentence.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private AnalyzeSentimentResponse(
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeSentimentResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeSentimentResponse_fieldAccessorTable
@@ -247,7 +243,6 @@ public com.google.cloud.language.v1.SentenceOrBuilder getSentencesOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -257,7 +252,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (documentSentiment_ != null) {
@@ -272,7 +266,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -410,7 +403,6 @@ public static com.google.cloud.language.v1.AnalyzeSentimentResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -418,7 +410,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1.AnalyzeSentimentResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -446,7 +437,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeSentimentResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeSentimentResponse_fieldAccessorTable
@@ -470,7 +460,6 @@ private void maybeForceBuilderInitialization() {
         getSentencesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (documentSentimentBuilder_ == null) {
@@ -490,18 +479,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeSentimentResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.AnalyzeSentimentResponse getDefaultInstanceForType() {
       return com.google.cloud.language.v1.AnalyzeSentimentResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.AnalyzeSentimentResponse build() {
       com.google.cloud.language.v1.AnalyzeSentimentResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -510,7 +496,6 @@ public com.google.cloud.language.v1.AnalyzeSentimentResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.AnalyzeSentimentResponse buildPartial() {
       com.google.cloud.language.v1.AnalyzeSentimentResponse result = new com.google.cloud.language.v1.AnalyzeSentimentResponse(this);
       int from_bitField0_ = bitField0_;
@@ -535,39 +520,32 @@ public com.google.cloud.language.v1.AnalyzeSentimentResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1.AnalyzeSentimentResponse) {
         return mergeFrom((com.google.cloud.language.v1.AnalyzeSentimentResponse)other);
@@ -617,12 +595,10 @@ public Builder mergeFrom(com.google.cloud.language.v1.AnalyzeSentimentResponse o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1205,13 +1181,11 @@ public com.google.cloud.language.v1.Sentence.Builder addSentencesBuilder(
       }
       return sentencesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1233,12 +1207,11 @@ public static com.google.cloud.language.v1.AnalyzeSentimentResponse getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnalyzeSentimentResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeSentimentResponse(input, extensionRegistry);
+        return new AnalyzeSentimentResponse(input, extensionRegistry);
     }
   };
 
@@ -1251,7 +1224,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1.AnalyzeSentimentResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSyntaxRequest.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSyntaxRequest.java
index ab35af9b17fd..df6d3ba294a6 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSyntaxRequest.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSyntaxRequest.java
@@ -33,9 +33,6 @@ private AnalyzeSyntaxRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private AnalyzeSyntaxRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.language.v1.Document.Builder subBuilder = null;
             if (document_ != null) {
@@ -66,13 +70,6 @@ private AnalyzeSyntaxRequest(
             encodingType_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private AnalyzeSyntaxRequest(
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeSyntaxRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeSyntaxRequest_fieldAccessorTable
@@ -151,13 +147,11 @@ public int getEncodingTypeValue() {
    * .google.cloud.language.v1.EncodingType encoding_type = 2;
    */
   public com.google.cloud.language.v1.EncodingType getEncodingType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1.EncodingType result = com.google.cloud.language.v1.EncodingType.valueOf(encodingType_);
     return result == null ? com.google.cloud.language.v1.EncodingType.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -167,7 +161,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (document_ != null) {
@@ -179,7 +172,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -307,7 +299,6 @@ public static com.google.cloud.language.v1.AnalyzeSyntaxRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -315,7 +306,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1.AnalyzeSyntaxRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -343,7 +333,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeSyntaxRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeSyntaxRequest_fieldAccessorTable
@@ -366,7 +355,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (documentBuilder_ == null) {
@@ -380,18 +368,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeSyntaxRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.AnalyzeSyntaxRequest getDefaultInstanceForType() {
       return com.google.cloud.language.v1.AnalyzeSyntaxRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.AnalyzeSyntaxRequest build() {
       com.google.cloud.language.v1.AnalyzeSyntaxRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -400,7 +385,6 @@ public com.google.cloud.language.v1.AnalyzeSyntaxRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.AnalyzeSyntaxRequest buildPartial() {
       com.google.cloud.language.v1.AnalyzeSyntaxRequest result = new com.google.cloud.language.v1.AnalyzeSyntaxRequest(this);
       if (documentBuilder_ == null) {
@@ -413,39 +397,32 @@ public com.google.cloud.language.v1.AnalyzeSyntaxRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1.AnalyzeSyntaxRequest) {
         return mergeFrom((com.google.cloud.language.v1.AnalyzeSyntaxRequest)other);
@@ -468,12 +445,10 @@ public Builder mergeFrom(com.google.cloud.language.v1.AnalyzeSyntaxRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -676,7 +651,6 @@ public Builder setEncodingTypeValue(int value) {
      * .google.cloud.language.v1.EncodingType encoding_type = 2;
      */
     public com.google.cloud.language.v1.EncodingType getEncodingType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1.EncodingType result = com.google.cloud.language.v1.EncodingType.valueOf(encodingType_);
       return result == null ? com.google.cloud.language.v1.EncodingType.UNRECOGNIZED : result;
     }
@@ -709,13 +683,11 @@ public Builder clearEncodingType() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -737,12 +709,11 @@ public static com.google.cloud.language.v1.AnalyzeSyntaxRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnalyzeSyntaxRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeSyntaxRequest(input, extensionRegistry);
+        return new AnalyzeSyntaxRequest(input, extensionRegistry);
     }
   };
 
@@ -755,7 +726,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1.AnalyzeSyntaxRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSyntaxResponse.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSyntaxResponse.java
index 2cd4a2e00fcd..8db3c4b46000 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSyntaxResponse.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnalyzeSyntaxResponse.java
@@ -35,9 +35,6 @@ private AnalyzeSyntaxResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private AnalyzeSyntaxResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               sentences_ = new java.util.ArrayList();
@@ -73,13 +77,6 @@ private AnalyzeSyntaxResponse(
             language_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private AnalyzeSyntaxResponse(
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeSyntaxResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeSyntaxResponse_fieldAccessorTable
@@ -269,7 +265,6 @@ public java.lang.String getLanguage() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -279,7 +274,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < sentences_.size(); i++) {
@@ -294,7 +288,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -429,7 +422,6 @@ public static com.google.cloud.language.v1.AnalyzeSyntaxResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -437,7 +429,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1.AnalyzeSyntaxResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -465,7 +456,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeSyntaxResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeSyntaxResponse_fieldAccessorTable
@@ -490,7 +480,6 @@ private void maybeForceBuilderInitialization() {
         getTokensFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (sentencesBuilder_ == null) {
@@ -510,18 +499,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnalyzeSyntaxResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.AnalyzeSyntaxResponse getDefaultInstanceForType() {
       return com.google.cloud.language.v1.AnalyzeSyntaxResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.AnalyzeSyntaxResponse build() {
       com.google.cloud.language.v1.AnalyzeSyntaxResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -530,7 +516,6 @@ public com.google.cloud.language.v1.AnalyzeSyntaxResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.AnalyzeSyntaxResponse buildPartial() {
       com.google.cloud.language.v1.AnalyzeSyntaxResponse result = new com.google.cloud.language.v1.AnalyzeSyntaxResponse(this);
       int from_bitField0_ = bitField0_;
@@ -559,39 +544,32 @@ public com.google.cloud.language.v1.AnalyzeSyntaxResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1.AnalyzeSyntaxResponse) {
         return mergeFrom((com.google.cloud.language.v1.AnalyzeSyntaxResponse)other);
@@ -664,12 +642,10 @@ public Builder mergeFrom(com.google.cloud.language.v1.AnalyzeSyntaxResponse othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1411,13 +1387,11 @@ public Builder setLanguageBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1439,12 +1413,11 @@ public static com.google.cloud.language.v1.AnalyzeSyntaxResponse getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnalyzeSyntaxResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeSyntaxResponse(input, extensionRegistry);
+        return new AnalyzeSyntaxResponse(input, extensionRegistry);
     }
   };
 
@@ -1457,7 +1430,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1.AnalyzeSyntaxResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnnotateTextRequest.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnnotateTextRequest.java
index 8e89d28c8672..a0b4092b4d05 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnnotateTextRequest.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnnotateTextRequest.java
@@ -34,9 +34,6 @@ private AnnotateTextRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private AnnotateTextRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.language.v1.Document.Builder subBuilder = null;
             if (document_ != null) {
@@ -80,13 +84,6 @@ private AnnotateTextRequest(
             encodingType_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private AnnotateTextRequest(
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnnotateTextRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnnotateTextRequest_fieldAccessorTable
@@ -196,9 +192,6 @@ private Features(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -210,6 +203,13 @@ private Features(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 8: {
 
               extractSyntax_ = input.readBool();
@@ -235,13 +235,6 @@ private Features(
               classifyText_ = input.readBool();
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -259,7 +252,6 @@ private Features(
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnnotateTextRequest_Features_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnnotateTextRequest_Features_fieldAccessorTable
@@ -333,7 +325,6 @@ public boolean getClassifyText() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -343,7 +334,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (extractSyntax_ != false) {
@@ -364,7 +354,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -517,7 +506,6 @@ public static com.google.cloud.language.v1.AnnotateTextRequest.Features parseFro
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -525,7 +513,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.language.v1.AnnotateTextRequest.Features prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -554,7 +541,6 @@ public static final class Builder extends
         return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnnotateTextRequest_Features_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnnotateTextRequest_Features_fieldAccessorTable
@@ -577,7 +563,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         extractSyntax_ = false;
@@ -593,18 +578,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnnotateTextRequest_Features_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.language.v1.AnnotateTextRequest.Features getDefaultInstanceForType() {
         return com.google.cloud.language.v1.AnnotateTextRequest.Features.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.language.v1.AnnotateTextRequest.Features build() {
         com.google.cloud.language.v1.AnnotateTextRequest.Features result = buildPartial();
         if (!result.isInitialized()) {
@@ -613,7 +595,6 @@ public com.google.cloud.language.v1.AnnotateTextRequest.Features build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.language.v1.AnnotateTextRequest.Features buildPartial() {
         com.google.cloud.language.v1.AnnotateTextRequest.Features result = new com.google.cloud.language.v1.AnnotateTextRequest.Features(this);
         result.extractSyntax_ = extractSyntax_;
@@ -625,39 +606,32 @@ public com.google.cloud.language.v1.AnnotateTextRequest.Features buildPartial()
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.language.v1.AnnotateTextRequest.Features) {
           return mergeFrom((com.google.cloud.language.v1.AnnotateTextRequest.Features)other);
@@ -689,12 +663,10 @@ public Builder mergeFrom(com.google.cloud.language.v1.AnnotateTextRequest.Featur
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -902,13 +874,11 @@ public Builder clearClassifyText() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -930,12 +900,11 @@ public static com.google.cloud.language.v1.AnnotateTextRequest.Features getDefau
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Features parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Features(input, extensionRegistry);
+          return new Features(input, extensionRegistry);
       }
     };
 
@@ -948,7 +917,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.AnnotateTextRequest.Features getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1041,13 +1009,11 @@ public int getEncodingTypeValue() {
    * .google.cloud.language.v1.EncodingType encoding_type = 3;
    */
   public com.google.cloud.language.v1.EncodingType getEncodingType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1.EncodingType result = com.google.cloud.language.v1.EncodingType.valueOf(encodingType_);
     return result == null ? com.google.cloud.language.v1.EncodingType.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1057,7 +1023,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (document_ != null) {
@@ -1072,7 +1037,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1213,7 +1177,6 @@ public static com.google.cloud.language.v1.AnnotateTextRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1221,7 +1184,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1.AnnotateTextRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1250,7 +1212,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnnotateTextRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnnotateTextRequest_fieldAccessorTable
@@ -1273,7 +1234,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (documentBuilder_ == null) {
@@ -1293,18 +1253,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnnotateTextRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.AnnotateTextRequest getDefaultInstanceForType() {
       return com.google.cloud.language.v1.AnnotateTextRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.AnnotateTextRequest build() {
       com.google.cloud.language.v1.AnnotateTextRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -1313,7 +1270,6 @@ public com.google.cloud.language.v1.AnnotateTextRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.AnnotateTextRequest buildPartial() {
       com.google.cloud.language.v1.AnnotateTextRequest result = new com.google.cloud.language.v1.AnnotateTextRequest(this);
       if (documentBuilder_ == null) {
@@ -1331,39 +1287,32 @@ public com.google.cloud.language.v1.AnnotateTextRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1.AnnotateTextRequest) {
         return mergeFrom((com.google.cloud.language.v1.AnnotateTextRequest)other);
@@ -1389,12 +1338,10 @@ public Builder mergeFrom(com.google.cloud.language.v1.AnnotateTextRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1750,7 +1697,6 @@ public Builder setEncodingTypeValue(int value) {
      * .google.cloud.language.v1.EncodingType encoding_type = 3;
      */
     public com.google.cloud.language.v1.EncodingType getEncodingType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1.EncodingType result = com.google.cloud.language.v1.EncodingType.valueOf(encodingType_);
       return result == null ? com.google.cloud.language.v1.EncodingType.UNRECOGNIZED : result;
     }
@@ -1783,13 +1729,11 @@ public Builder clearEncodingType() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1811,12 +1755,11 @@ public static com.google.cloud.language.v1.AnnotateTextRequest getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnnotateTextRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateTextRequest(input, extensionRegistry);
+        return new AnnotateTextRequest(input, extensionRegistry);
     }
   };
 
@@ -1829,7 +1772,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1.AnnotateTextRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnnotateTextResponse.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnnotateTextResponse.java
index 3b4b95247aaa..9ec5396808f4 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnnotateTextResponse.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/AnnotateTextResponse.java
@@ -37,9 +37,6 @@ private AnnotateTextResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private AnnotateTextResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               sentences_ = new java.util.ArrayList();
@@ -106,13 +110,6 @@ private AnnotateTextResponse(
                 input.readMessage(com.google.cloud.language.v1.ClassificationCategory.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -142,7 +139,6 @@ private AnnotateTextResponse(
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnnotateTextResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnnotateTextResponse_fieldAccessorTable
@@ -479,7 +475,6 @@ public com.google.cloud.language.v1.ClassificationCategoryOrBuilder getCategorie
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -489,7 +484,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < sentences_.size(); i++) {
@@ -513,7 +507,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -681,7 +674,6 @@ public static com.google.cloud.language.v1.AnnotateTextResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -689,7 +681,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1.AnnotateTextResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -717,7 +708,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnnotateTextResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnnotateTextResponse_fieldAccessorTable
@@ -744,7 +734,6 @@ private void maybeForceBuilderInitialization() {
         getCategoriesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (sentencesBuilder_ == null) {
@@ -782,18 +771,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_AnnotateTextResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.AnnotateTextResponse getDefaultInstanceForType() {
       return com.google.cloud.language.v1.AnnotateTextResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.AnnotateTextResponse build() {
       com.google.cloud.language.v1.AnnotateTextResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -802,7 +788,6 @@ public com.google.cloud.language.v1.AnnotateTextResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.AnnotateTextResponse buildPartial() {
       com.google.cloud.language.v1.AnnotateTextResponse result = new com.google.cloud.language.v1.AnnotateTextResponse(this);
       int from_bitField0_ = bitField0_;
@@ -854,39 +839,32 @@ public com.google.cloud.language.v1.AnnotateTextResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1.AnnotateTextResponse) {
         return mergeFrom((com.google.cloud.language.v1.AnnotateTextResponse)other);
@@ -1014,12 +992,10 @@ public Builder mergeFrom(com.google.cloud.language.v1.AnnotateTextResponse other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2637,13 +2613,11 @@ public com.google.cloud.language.v1.ClassificationCategory.Builder addCategories
       }
       return categoriesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2665,12 +2639,11 @@ public static com.google.cloud.language.v1.AnnotateTextResponse getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnnotateTextResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateTextResponse(input, extensionRegistry);
+        return new AnnotateTextResponse(input, extensionRegistry);
     }
   };
 
@@ -2683,7 +2656,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1.AnnotateTextResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassificationCategory.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassificationCategory.java
index b137e1f3d00d..24c4c3ca78ec 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassificationCategory.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassificationCategory.java
@@ -34,9 +34,6 @@ private ClassificationCategory(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ClassificationCategory(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -59,13 +63,6 @@ private ClassificationCategory(
             confidence_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private ClassificationCategory(
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_ClassificationCategory_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_ClassificationCategory_fieldAccessorTable
@@ -148,7 +144,6 @@ public float getConfidence() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -158,7 +153,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -170,7 +164,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -296,7 +289,6 @@ public static com.google.cloud.language.v1.ClassificationCategory parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -304,7 +296,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1.ClassificationCategory prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -332,7 +323,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_ClassificationCategory_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_ClassificationCategory_fieldAccessorTable
@@ -355,7 +345,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -365,18 +354,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_ClassificationCategory_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.ClassificationCategory getDefaultInstanceForType() {
       return com.google.cloud.language.v1.ClassificationCategory.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.ClassificationCategory build() {
       com.google.cloud.language.v1.ClassificationCategory result = buildPartial();
       if (!result.isInitialized()) {
@@ -385,7 +371,6 @@ public com.google.cloud.language.v1.ClassificationCategory build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.ClassificationCategory buildPartial() {
       com.google.cloud.language.v1.ClassificationCategory result = new com.google.cloud.language.v1.ClassificationCategory(this);
       result.name_ = name_;
@@ -394,39 +379,32 @@ public com.google.cloud.language.v1.ClassificationCategory buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1.ClassificationCategory) {
         return mergeFrom((com.google.cloud.language.v1.ClassificationCategory)other);
@@ -450,12 +428,10 @@ public Builder mergeFrom(com.google.cloud.language.v1.ClassificationCategory oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -603,13 +579,11 @@ public Builder clearConfidence() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -631,12 +605,11 @@ public static com.google.cloud.language.v1.ClassificationCategory getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ClassificationCategory parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ClassificationCategory(input, extensionRegistry);
+        return new ClassificationCategory(input, extensionRegistry);
     }
   };
 
@@ -649,7 +622,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1.ClassificationCategory getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassifyTextRequest.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassifyTextRequest.java
index 35985ee13420..21227490fadb 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassifyTextRequest.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassifyTextRequest.java
@@ -32,9 +32,6 @@ private ClassifyTextRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private ClassifyTextRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.language.v1.Document.Builder subBuilder = null;
             if (document_ != null) {
@@ -59,13 +63,6 @@ private ClassifyTextRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private ClassifyTextRequest(
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_ClassifyTextRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_ClassifyTextRequest_fieldAccessorTable
@@ -125,7 +121,6 @@ public com.google.cloud.language.v1.DocumentOrBuilder getDocumentOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -135,7 +130,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (document_ != null) {
@@ -144,7 +138,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static com.google.cloud.language.v1.ClassifyTextRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1.ClassifyTextRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_ClassifyTextRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_ClassifyTextRequest_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (documentBuilder_ == null) {
@@ -336,18 +325,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_ClassifyTextRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.ClassifyTextRequest getDefaultInstanceForType() {
       return com.google.cloud.language.v1.ClassifyTextRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.ClassifyTextRequest build() {
       com.google.cloud.language.v1.ClassifyTextRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -356,7 +342,6 @@ public com.google.cloud.language.v1.ClassifyTextRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.ClassifyTextRequest buildPartial() {
       com.google.cloud.language.v1.ClassifyTextRequest result = new com.google.cloud.language.v1.ClassifyTextRequest(this);
       if (documentBuilder_ == null) {
@@ -368,39 +353,32 @@ public com.google.cloud.language.v1.ClassifyTextRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1.ClassifyTextRequest) {
         return mergeFrom((com.google.cloud.language.v1.ClassifyTextRequest)other);
@@ -420,12 +398,10 @@ public Builder mergeFrom(com.google.cloud.language.v1.ClassifyTextRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -596,13 +572,11 @@ public com.google.cloud.language.v1.DocumentOrBuilder getDocumentOrBuilder() {
       }
       return documentBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -624,12 +598,11 @@ public static com.google.cloud.language.v1.ClassifyTextRequest getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ClassifyTextRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ClassifyTextRequest(input, extensionRegistry);
+        return new ClassifyTextRequest(input, extensionRegistry);
     }
   };
 
@@ -642,7 +615,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1.ClassifyTextRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassifyTextResponse.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassifyTextResponse.java
index fe0d3bf3fed8..73ea7ee357fd 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassifyTextResponse.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/ClassifyTextResponse.java
@@ -33,9 +33,6 @@ private ClassifyTextResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ClassifyTextResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               categories_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private ClassifyTextResponse(
                 input.readMessage(com.google.cloud.language.v1.ClassificationCategory.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private ClassifyTextResponse(
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_ClassifyTextResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_ClassifyTextResponse_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.cloud.language.v1.ClassificationCategoryOrBuilder getCategorie
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < categories_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.language.v1.ClassifyTextResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1.ClassifyTextResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_ClassifyTextResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_ClassifyTextResponse_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getCategoriesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (categoriesBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_ClassifyTextResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.ClassifyTextResponse getDefaultInstanceForType() {
       return com.google.cloud.language.v1.ClassifyTextResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.ClassifyTextResponse build() {
       com.google.cloud.language.v1.ClassifyTextResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.cloud.language.v1.ClassifyTextResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.ClassifyTextResponse buildPartial() {
       com.google.cloud.language.v1.ClassifyTextResponse result = new com.google.cloud.language.v1.ClassifyTextResponse(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.cloud.language.v1.ClassifyTextResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1.ClassifyTextResponse) {
         return mergeFrom((com.google.cloud.language.v1.ClassifyTextResponse)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.cloud.language.v1.ClassifyTextResponse other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.cloud.language.v1.ClassificationCategory.Builder addCategories
       }
       return categoriesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.cloud.language.v1.ClassifyTextResponse getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ClassifyTextResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ClassifyTextResponse(input, extensionRegistry);
+        return new ClassifyTextResponse(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1.ClassifyTextResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/DependencyEdge.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/DependencyEdge.java
index 3c110eb1af5c..85c3e5beb141 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/DependencyEdge.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/DependencyEdge.java
@@ -36,9 +36,6 @@ private DependencyEdge(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private DependencyEdge(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
 
             headTokenIndex_ = input.readInt32();
@@ -61,13 +65,6 @@ private DependencyEdge(
             label_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -85,7 +82,6 @@ private DependencyEdge(
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_DependencyEdge_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_DependencyEdge_fieldAccessorTable
@@ -1625,13 +1621,11 @@ public int getLabelValue() {
    * .google.cloud.language.v1.DependencyEdge.Label label = 2;
    */
   public com.google.cloud.language.v1.DependencyEdge.Label getLabel() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1.DependencyEdge.Label result = com.google.cloud.language.v1.DependencyEdge.Label.valueOf(label_);
     return result == null ? com.google.cloud.language.v1.DependencyEdge.Label.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1641,7 +1635,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (headTokenIndex_ != 0) {
@@ -1653,7 +1646,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1776,7 +1768,6 @@ public static com.google.cloud.language.v1.DependencyEdge parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1784,7 +1775,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1.DependencyEdge prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1814,7 +1804,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_DependencyEdge_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_DependencyEdge_fieldAccessorTable
@@ -1837,7 +1826,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       headTokenIndex_ = 0;
@@ -1847,18 +1835,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_DependencyEdge_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.DependencyEdge getDefaultInstanceForType() {
       return com.google.cloud.language.v1.DependencyEdge.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.DependencyEdge build() {
       com.google.cloud.language.v1.DependencyEdge result = buildPartial();
       if (!result.isInitialized()) {
@@ -1867,7 +1852,6 @@ public com.google.cloud.language.v1.DependencyEdge build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.DependencyEdge buildPartial() {
       com.google.cloud.language.v1.DependencyEdge result = new com.google.cloud.language.v1.DependencyEdge(this);
       result.headTokenIndex_ = headTokenIndex_;
@@ -1876,39 +1860,32 @@ public com.google.cloud.language.v1.DependencyEdge buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1.DependencyEdge) {
         return mergeFrom((com.google.cloud.language.v1.DependencyEdge)other);
@@ -1931,12 +1908,10 @@ public Builder mergeFrom(com.google.cloud.language.v1.DependencyEdge other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2036,7 +2011,6 @@ public Builder setLabelValue(int value) {
      * .google.cloud.language.v1.DependencyEdge.Label label = 2;
      */
     public com.google.cloud.language.v1.DependencyEdge.Label getLabel() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1.DependencyEdge.Label result = com.google.cloud.language.v1.DependencyEdge.Label.valueOf(label_);
       return result == null ? com.google.cloud.language.v1.DependencyEdge.Label.UNRECOGNIZED : result;
     }
@@ -2069,13 +2043,11 @@ public Builder clearLabel() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2097,12 +2069,11 @@ public static com.google.cloud.language.v1.DependencyEdge getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DependencyEdge parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DependencyEdge(input, extensionRegistry);
+        return new DependencyEdge(input, extensionRegistry);
     }
   };
 
@@ -2115,7 +2086,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1.DependencyEdge getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Document.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Document.java
index f474a17bcdad..28ddfe314b65 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Document.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Document.java
@@ -35,9 +35,6 @@ private Document(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private Document(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -73,13 +77,6 @@ private Document(
             language_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private Document(
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_Document_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_Document_fieldAccessorTable
@@ -300,7 +296,6 @@ public int getTypeValue() {
    * .google.cloud.language.v1.Document.Type type = 1;
    */
   public com.google.cloud.language.v1.Document.Type getType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1.Document.Type result = com.google.cloud.language.v1.Document.Type.valueOf(type_);
     return result == null ? com.google.cloud.language.v1.Document.Type.UNRECOGNIZED : result;
   }
@@ -470,7 +465,6 @@ public java.lang.String getLanguage() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -480,7 +474,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (type_ != com.google.cloud.language.v1.Document.Type.TYPE_UNSPECIFIED.getNumber()) {
@@ -498,7 +491,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -653,7 +645,6 @@ public static com.google.cloud.language.v1.Document parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -661,7 +652,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1.Document prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -690,7 +680,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_Document_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_Document_fieldAccessorTable
@@ -713,7 +702,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       type_ = 0;
@@ -725,18 +713,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_Document_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.Document getDefaultInstanceForType() {
       return com.google.cloud.language.v1.Document.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.Document build() {
       com.google.cloud.language.v1.Document result = buildPartial();
       if (!result.isInitialized()) {
@@ -745,7 +730,6 @@ public com.google.cloud.language.v1.Document build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.Document buildPartial() {
       com.google.cloud.language.v1.Document result = new com.google.cloud.language.v1.Document(this);
       result.type_ = type_;
@@ -761,39 +745,32 @@ public com.google.cloud.language.v1.Document buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1.Document) {
         return mergeFrom((com.google.cloud.language.v1.Document)other);
@@ -834,12 +811,10 @@ public Builder mergeFrom(com.google.cloud.language.v1.Document other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -907,7 +882,6 @@ public Builder setTypeValue(int value) {
      * .google.cloud.language.v1.Document.Type type = 1;
      */
     public com.google.cloud.language.v1.Document.Type getType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1.Document.Type result = com.google.cloud.language.v1.Document.Type.valueOf(type_);
       return result == null ? com.google.cloud.language.v1.Document.Type.UNRECOGNIZED : result;
     }
@@ -1281,13 +1255,11 @@ public Builder setLanguageBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1309,12 +1281,11 @@ public static com.google.cloud.language.v1.Document getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Document parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Document(input, extensionRegistry);
+        return new Document(input, extensionRegistry);
     }
   };
 
@@ -1327,7 +1298,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1.Document getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Entity.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Entity.java
index befc130707ee..e1e3c6a08ec9 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Entity.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Entity.java
@@ -38,9 +38,6 @@ private Entity(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private Entity(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -104,13 +108,6 @@ private Entity(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -132,7 +129,6 @@ private Entity(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -143,7 +139,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_Entity_fieldAccessorTable
@@ -434,7 +429,6 @@ public int getTypeValue() {
    * .google.cloud.language.v1.Entity.Type type = 2;
    */
   public com.google.cloud.language.v1.Entity.Type getType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1.Entity.Type result = com.google.cloud.language.v1.Entity.Type.valueOf(type_);
     return result == null ? com.google.cloud.language.v1.Entity.Type.UNRECOGNIZED : result;
   }
@@ -659,7 +653,6 @@ public com.google.cloud.language.v1.SentimentOrBuilder getSentimentOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -669,7 +662,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -696,7 +688,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -868,7 +859,6 @@ public static com.google.cloud.language.v1.Entity parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -876,7 +866,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1.Entity prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -928,7 +917,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_Entity_fieldAccessorTable
@@ -952,7 +940,6 @@ private void maybeForceBuilderInitialization() {
         getMentionsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -977,18 +964,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_Entity_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.Entity getDefaultInstanceForType() {
       return com.google.cloud.language.v1.Entity.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.Entity build() {
       com.google.cloud.language.v1.Entity result = buildPartial();
       if (!result.isInitialized()) {
@@ -997,7 +981,6 @@ public com.google.cloud.language.v1.Entity build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.Entity buildPartial() {
       com.google.cloud.language.v1.Entity result = new com.google.cloud.language.v1.Entity(this);
       int from_bitField0_ = bitField0_;
@@ -1026,39 +1009,32 @@ public com.google.cloud.language.v1.Entity buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1.Entity) {
         return mergeFrom((com.google.cloud.language.v1.Entity)other);
@@ -1116,12 +1092,10 @@ public Builder mergeFrom(com.google.cloud.language.v1.Entity other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1261,7 +1235,6 @@ public Builder setTypeValue(int value) {
      * .google.cloud.language.v1.Entity.Type type = 2;
      */
     public com.google.cloud.language.v1.Entity.Type getType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1.Entity.Type result = com.google.cloud.language.v1.Entity.Type.valueOf(type_);
       return result == null ? com.google.cloud.language.v1.Entity.Type.UNRECOGNIZED : result;
     }
@@ -2019,13 +1992,11 @@ public com.google.cloud.language.v1.SentimentOrBuilder getSentimentOrBuilder() {
       }
       return sentimentBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2047,12 +2018,11 @@ public static com.google.cloud.language.v1.Entity getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Entity parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Entity(input, extensionRegistry);
+        return new Entity(input, extensionRegistry);
     }
   };
 
@@ -2065,7 +2035,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1.Entity getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/EntityMention.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/EntityMention.java
index f8345c46d6ca..4ad95693114d 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/EntityMention.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/EntityMention.java
@@ -34,9 +34,6 @@ private EntityMention(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private EntityMention(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.language.v1.TextSpan.Builder subBuilder = null;
             if (text_ != null) {
@@ -80,13 +84,6 @@ private EntityMention(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private EntityMention(
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_EntityMention_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_EntityMention_fieldAccessorTable
@@ -300,7 +296,6 @@ public int getTypeValue() {
    * .google.cloud.language.v1.EntityMention.Type type = 2;
    */
   public com.google.cloud.language.v1.EntityMention.Type getType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1.EntityMention.Type result = com.google.cloud.language.v1.EntityMention.Type.valueOf(type_);
     return result == null ? com.google.cloud.language.v1.EntityMention.Type.UNRECOGNIZED : result;
   }
@@ -348,7 +343,6 @@ public com.google.cloud.language.v1.SentimentOrBuilder getSentimentOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -358,7 +352,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (text_ != null) {
@@ -373,7 +366,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -514,7 +506,6 @@ public static com.google.cloud.language.v1.EntityMention parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -522,7 +513,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1.EntityMention prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -551,7 +541,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_EntityMention_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_EntityMention_fieldAccessorTable
@@ -574,7 +563,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (textBuilder_ == null) {
@@ -594,18 +582,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_EntityMention_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.EntityMention getDefaultInstanceForType() {
       return com.google.cloud.language.v1.EntityMention.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.EntityMention build() {
       com.google.cloud.language.v1.EntityMention result = buildPartial();
       if (!result.isInitialized()) {
@@ -614,7 +599,6 @@ public com.google.cloud.language.v1.EntityMention build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.EntityMention buildPartial() {
       com.google.cloud.language.v1.EntityMention result = new com.google.cloud.language.v1.EntityMention(this);
       if (textBuilder_ == null) {
@@ -632,39 +616,32 @@ public com.google.cloud.language.v1.EntityMention buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1.EntityMention) {
         return mergeFrom((com.google.cloud.language.v1.EntityMention)other);
@@ -690,12 +667,10 @@ public Builder mergeFrom(com.google.cloud.language.v1.EntityMention other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -898,7 +873,6 @@ public Builder setTypeValue(int value) {
      * .google.cloud.language.v1.EntityMention.Type type = 2;
      */
     public com.google.cloud.language.v1.EntityMention.Type getType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1.EntityMention.Type result = com.google.cloud.language.v1.EntityMention.Type.valueOf(type_);
       return result == null ? com.google.cloud.language.v1.EntityMention.Type.UNRECOGNIZED : result;
     }
@@ -1111,13 +1085,11 @@ public com.google.cloud.language.v1.SentimentOrBuilder getSentimentOrBuilder() {
       }
       return sentimentBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1139,12 +1111,11 @@ public static com.google.cloud.language.v1.EntityMention getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public EntityMention parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new EntityMention(input, extensionRegistry);
+        return new EntityMention(input, extensionRegistry);
     }
   };
 
@@ -1157,7 +1128,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1.EntityMention getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/LanguageServiceProto.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/LanguageServiceProto.java
index 5d54e98179fd..5a2c3dbde19c 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/LanguageServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/LanguageServiceProto.java
@@ -152,7 +152,7 @@ public static void registerAllExtensions(
       "\004Type\022\024\n\020TYPE_UNSPECIFIED\020\000\022\016\n\nPLAIN_TEX" +
       "T\020\001\022\010\n\004HTML\020\002B\010\n\006source\"t\n\010Sentence\0220\n\004t" +
       "ext\030\001 \001(\0132\".google.cloud.language.v1.Tex" +
-      "tSpan\0226\n\tsentiment\030\002 \001(\0132#.google.cloud." +
+      "tSpan\0226\n\tsentiment\030\002 \001(\0132#.google.cloud.",
       "language.v1.Sentiment\"\276\003\n\006Entity\022\014\n\004name" +
       "\030\001 \001(\t\0223\n\004type\030\002 \001(\0162%.google.cloud.lang" +
       "uage.v1.Entity.Type\022@\n\010metadata\030\003 \003(\0132.." +
@@ -162,7 +162,7 @@ public static void registerAllExtensions(
       "on\0226\n\tsentiment\030\006 \001(\0132#.google.cloud.lan" +
       "guage.v1.Sentiment\032/\n\rMetadataEntry\022\013\n\003k" +
       "ey\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"y\n\004Type\022\013\n\007U" +
-      "NKNOWN\020\000\022\n\n\006PERSON\020\001\022\014\n\010LOCATION\020\002\022\020\n\014OR" +
+      "NKNOWN\020\000\022\n\n\006PERSON\020\001\022\014\n\010LOCATION\020\002\022\020\n\014OR",
       "GANIZATION\020\003\022\t\n\005EVENT\020\004\022\017\n\013WORK_OF_ART\020\005" +
       "\022\021\n\rCONSUMER_GOOD\020\006\022\t\n\005OTHER\020\007\"\313\001\n\005Token" +
       "\0220\n\004text\030\001 \001(\0132\".google.cloud.language.v" +
@@ -172,7 +172,7 @@ public static void registerAllExtensions(
       "age.v1.DependencyEdge\022\r\n\005lemma\030\004 \001(\t\"-\n\t" +
       "Sentiment\022\021\n\tmagnitude\030\002 \001(\002\022\r\n\005score\030\003 " +
       "\001(\002\"\243\020\n\014PartOfSpeech\0227\n\003tag\030\001 \001(\0162*.goog" +
-      "le.cloud.language.v1.PartOfSpeech.Tag\022=\n" +
+      "le.cloud.language.v1.PartOfSpeech.Tag\022=\n",
       "\006aspect\030\002 \001(\0162-.google.cloud.language.v1" +
       ".PartOfSpeech.Aspect\0229\n\004case\030\003 \001(\0162+.goo" +
       "gle.cloud.language.v1.PartOfSpeech.Case\022" +
@@ -182,7 +182,7 @@ public static void registerAllExtensions(
       "r\0229\n\004mood\030\006 \001(\0162+.google.cloud.language." +
       "v1.PartOfSpeech.Mood\022=\n\006number\030\007 \001(\0162-.g" +
       "oogle.cloud.language.v1.PartOfSpeech.Num" +
-      "ber\022=\n\006person\030\010 \001(\0162-.google.cloud.langu" +
+      "ber\022=\n\006person\030\010 \001(\0162-.google.cloud.langu",
       "age.v1.PartOfSpeech.Person\022=\n\006proper\030\t \001" +
       "(\0162-.google.cloud.language.v1.PartOfSpee" +
       "ch.Proper\022G\n\013reciprocity\030\n \001(\01622.google." +
@@ -192,7 +192,7 @@ public static void registerAllExtensions(
       ".google.cloud.language.v1.PartOfSpeech.V" +
       "oice\"\215\001\n\003Tag\022\013\n\007UNKNOWN\020\000\022\007\n\003ADJ\020\001\022\007\n\003AD" +
       "P\020\002\022\007\n\003ADV\020\003\022\010\n\004CONJ\020\004\022\007\n\003DET\020\005\022\010\n\004NOUN\020" +
-      "\006\022\007\n\003NUM\020\007\022\010\n\004PRON\020\010\022\007\n\003PRT\020\t\022\t\n\005PUNCT\020\n" +
+      "\006\022\007\n\003NUM\020\007\022\010\n\004PRON\020\010\022\007\n\003PRT\020\t\022\t\n\005PUNCT\020\n",
       "\022\010\n\004VERB\020\013\022\005\n\001X\020\014\022\t\n\005AFFIX\020\r\"O\n\006Aspect\022\022" +
       "\n\016ASPECT_UNKNOWN\020\000\022\016\n\nPERFECTIVE\020\001\022\020\n\014IM" +
       "PERFECTIVE\020\002\022\017\n\013PROGRESSIVE\020\003\"\370\001\n\004Case\022\020" +
@@ -202,7 +202,7 @@ public static void registerAllExtensions(
       "VE\020\007\022\016\n\nNOMINATIVE\020\010\022\013\n\007OBLIQUE\020\t\022\r\n\tPAR" +
       "TITIVE\020\n\022\021\n\rPREPOSITIONAL\020\013\022\022\n\016REFLEXIVE" +
       "_CASE\020\014\022\021\n\rRELATIVE_CASE\020\r\022\014\n\010VOCATIVE\020\016" +
-      "\"\257\001\n\004Form\022\020\n\014FORM_UNKNOWN\020\000\022\014\n\010ADNOMIAL\020" +
+      "\"\257\001\n\004Form\022\020\n\014FORM_UNKNOWN\020\000\022\014\n\010ADNOMIAL\020",
       "\001\022\r\n\tAUXILIARY\020\002\022\022\n\016COMPLEMENTIZER\020\003\022\020\n\014" +
       "FINAL_ENDING\020\004\022\n\n\006GERUND\020\005\022\n\n\006REALIS\020\006\022\014" +
       "\n\010IRREALIS\020\007\022\t\n\005SHORT\020\010\022\010\n\004LONG\020\t\022\t\n\005ORD" +
@@ -212,7 +212,7 @@ public static void registerAllExtensions(
       "ONDITIONAL_MOOD\020\001\022\016\n\nIMPERATIVE\020\002\022\016\n\nIND" +
       "ICATIVE\020\003\022\021\n\rINTERROGATIVE\020\004\022\013\n\007JUSSIVE\020" +
       "\005\022\017\n\013SUBJUNCTIVE\020\006\"@\n\006Number\022\022\n\016NUMBER_U" +
-      "NKNOWN\020\000\022\014\n\010SINGULAR\020\001\022\n\n\006PLURAL\020\002\022\010\n\004DU" +
+      "NKNOWN\020\000\022\014\n\010SINGULAR\020\001\022\n\n\006PLURAL\020\002\022\010\n\004DU",
       "AL\020\003\"T\n\006Person\022\022\n\016PERSON_UNKNOWN\020\000\022\t\n\005FI" +
       "RST\020\001\022\n\n\006SECOND\020\002\022\t\n\005THIRD\020\003\022\024\n\020REFLEXIV" +
       "E_PERSON\020\004\"8\n\006Proper\022\022\n\016PROPER_UNKNOWN\020\000" +
@@ -222,7 +222,7 @@ public static void registerAllExtensions(
       "SE_UNKNOWN\020\000\022\025\n\021CONDITIONAL_TENSE\020\001\022\n\n\006F" +
       "UTURE\020\002\022\010\n\004PAST\020\003\022\013\n\007PRESENT\020\004\022\r\n\tIMPERF" +
       "ECT\020\005\022\016\n\nPLUPERFECT\020\006\"B\n\005Voice\022\021\n\rVOICE_" +
-      "UNKNOWN\020\000\022\n\n\006ACTIVE\020\001\022\r\n\tCAUSATIVE\020\002\022\013\n\007" +
+      "UNKNOWN\020\000\022\n\n\006ACTIVE\020\001\022\r\n\tCAUSATIVE\020\002\022\013\n\007",
       "PASSIVE\020\003\"\225\010\n\016DependencyEdge\022\030\n\020head_tok" +
       "en_index\030\001 \001(\005\022=\n\005label\030\002 \001(\0162..google.c" +
       "loud.language.v1.DependencyEdge.Label\"\251\007" +
@@ -232,7 +232,7 @@ public static void registerAllExtensions(
       "\006\n\002CC\020\n\022\t\n\005CCOMP\020\013\022\010\n\004CONJ\020\014\022\t\n\005CSUBJ\020\r\022" +
       "\r\n\tCSUBJPASS\020\016\022\007\n\003DEP\020\017\022\007\n\003DET\020\020\022\r\n\tDISC" +
       "OURSE\020\021\022\010\n\004DOBJ\020\022\022\010\n\004EXPL\020\023\022\014\n\010GOESWITH\020" +
-      "\024\022\010\n\004IOBJ\020\025\022\010\n\004MARK\020\026\022\007\n\003MWE\020\027\022\007\n\003MWV\020\030\022" +
+      "\024\022\010\n\004IOBJ\020\025\022\010\n\004MARK\020\026\022\007\n\003MWE\020\027\022\007\n\003MWV\020\030\022",
       "\007\n\003NEG\020\031\022\006\n\002NN\020\032\022\014\n\010NPADVMOD\020\033\022\t\n\005NSUBJ\020" +
       "\034\022\r\n\tNSUBJPASS\020\035\022\007\n\003NUM\020\036\022\n\n\006NUMBER\020\037\022\005\n" +
       "\001P\020 \022\r\n\tPARATAXIS\020!\022\013\n\007PARTMOD\020\"\022\t\n\005PCOM" +
@@ -242,7 +242,7 @@ public static void registerAllExtensions(
       "\020.\022\014\n\010QUANTMOD\020/\022\t\n\005RCMOD\0200\022\014\n\010RCMODREL\020" +
       "1\022\t\n\005RDROP\0202\022\007\n\003REF\0203\022\013\n\007REMNANT\0204\022\016\n\nRE" +
       "PARANDUM\0205\022\010\n\004ROOT\0206\022\010\n\004SNUM\0207\022\010\n\004SUFF\0208" +
-      "\022\010\n\004TMOD\0209\022\t\n\005TOPIC\020:\022\010\n\004VMOD\020;\022\014\n\010VOCAT" +
+      "\022\010\n\004TMOD\0209\022\t\n\005TOPIC\020:\022\010\n\004VMOD\020;\022\014\n\010VOCAT",
       "IVE\020<\022\t\n\005XCOMP\020=\022\n\n\006SUFFIX\020>\022\t\n\005TITLE\020?\022" +
       "\014\n\010ADVPHMOD\020@\022\013\n\007AUXCAUS\020A\022\t\n\005AUXVV\020B\022\t\n" +
       "\005DTMOD\020C\022\013\n\007FOREIGN\020D\022\006\n\002KW\020E\022\010\n\004LIST\020F\022" +
@@ -252,7 +252,7 @@ public static void registerAllExtensions(
       "\003MES\020Q\022\t\n\005NCOMP\020R\"\347\001\n\rEntityMention\0220\n\004t" +
       "ext\030\001 \001(\0132\".google.cloud.language.v1.Tex" +
       "tSpan\022:\n\004type\030\002 \001(\0162,.google.cloud.langu" +
-      "age.v1.EntityMention.Type\0226\n\tsentiment\030\003" +
+      "age.v1.EntityMention.Type\0226\n\tsentiment\030\003",
       " \001(\0132#.google.cloud.language.v1.Sentimen" +
       "t\"0\n\004Type\022\020\n\014TYPE_UNKNOWN\020\000\022\n\n\006PROPER\020\001\022" +
       "\n\n\006COMMON\020\002\"1\n\010TextSpan\022\017\n\007content\030\001 \001(\t" +
@@ -262,7 +262,7 @@ public static void registerAllExtensions(
       "nt\030\001 \001(\0132\".google.cloud.language.v1.Docu" +
       "ment\022=\n\rencoding_type\030\002 \001(\0162&.google.clo" +
       "ud.language.v1.EncodingType\"\244\001\n\030AnalyzeS" +
-      "entimentResponse\022?\n\022document_sentiment\030\001" +
+      "entimentResponse\022?\n\022document_sentiment\030\001",
       " \001(\0132#.google.cloud.language.v1.Sentimen" +
       "t\022\020\n\010language\030\002 \001(\t\0225\n\tsentences\030\003 \003(\0132\"" +
       ".google.cloud.language.v1.Sentence\"\224\001\n\035A" +
@@ -272,7 +272,7 @@ public static void registerAllExtensions(
       ".language.v1.EncodingType\"f\n\036AnalyzeEnti" +
       "tySentimentResponse\0222\n\010entities\030\001 \003(\0132 ." +
       "google.cloud.language.v1.Entity\022\020\n\010langu" +
-      "age\030\002 \001(\t\"\215\001\n\026AnalyzeEntitiesRequest\0224\n\010" +
+      "age\030\002 \001(\t\"\215\001\n\026AnalyzeEntitiesRequest\0224\n\010",
       "document\030\001 \001(\0132\".google.cloud.language.v" +
       "1.Document\022=\n\rencoding_type\030\002 \001(\0162&.goog" +
       "le.cloud.language.v1.EncodingType\"_\n\027Ana" +
@@ -282,7 +282,7 @@ public static void registerAllExtensions(
       "ocument\030\001 \001(\0132\".google.cloud.language.v1" +
       ".Document\022=\n\rencoding_type\030\002 \001(\0162&.googl" +
       "e.cloud.language.v1.EncodingType\"\221\001\n\025Ana" +
-      "lyzeSyntaxResponse\0225\n\tsentences\030\001 \003(\0132\"." +
+      "lyzeSyntaxResponse\0225\n\tsentences\030\001 \003(\0132\".",
       "google.cloud.language.v1.Sentence\022/\n\006tok" +
       "ens\030\002 \003(\0132\037.google.cloud.language.v1.Tok" +
       "en\022\020\n\010language\030\003 \001(\t\"K\n\023ClassifyTextRequ" +
@@ -292,7 +292,7 @@ public static void registerAllExtensions(
       "guage.v1.ClassificationCategory\"\360\002\n\023Anno" +
       "tateTextRequest\0224\n\010document\030\001 \001(\0132\".goog" +
       "le.cloud.language.v1.Document\022H\n\010feature" +
-      "s\030\002 \001(\01326.google.cloud.language.v1.Annot" +
+      "s\030\002 \001(\01326.google.cloud.language.v1.Annot",
       "ateTextRequest.Features\022=\n\rencoding_type" +
       "\030\003 \001(\0162&.google.cloud.language.v1.Encodi" +
       "ngType\032\231\001\n\010Features\022\026\n\016extract_syntax\030\001 " +
@@ -302,7 +302,7 @@ public static void registerAllExtensions(
       "(\010\"\313\002\n\024AnnotateTextResponse\0225\n\tsentences" +
       "\030\001 \003(\0132\".google.cloud.language.v1.Senten" +
       "ce\022/\n\006tokens\030\002 \003(\0132\037.google.cloud.langua" +
-      "ge.v1.Token\0222\n\010entities\030\003 \003(\0132 .google.c" +
+      "ge.v1.Token\0222\n\010entities\030\003 \003(\0132 .google.c",
       "loud.language.v1.Entity\022?\n\022document_sent" +
       "iment\030\004 \001(\0132#.google.cloud.language.v1.S" +
       "entiment\022\020\n\010language\030\005 \001(\t\022D\n\ncategories" +
@@ -312,7 +312,7 @@ public static void registerAllExtensions(
       "anguageService\022\244\001\n\020AnalyzeSentiment\0221.go" +
       "ogle.cloud.language.v1.AnalyzeSentimentR" +
       "equest\0322.google.cloud.language.v1.Analyz" +
-      "eSentimentResponse\")\202\323\344\223\002#\"\036/v1/document" +
+      "eSentimentResponse\")\202\323\344\223\002#\"\036/v1/document",
       "s:analyzeSentiment:\001*\022\240\001\n\017AnalyzeEntitie" +
       "s\0220.google.cloud.language.v1.AnalyzeEnti" +
       "tiesRequest\0321.google.cloud.language.v1.A" +
@@ -322,7 +322,7 @@ public static void registerAllExtensions(
       "nalyzeEntitySentimentRequest\0328.google.cl" +
       "oud.language.v1.AnalyzeEntitySentimentRe" +
       "sponse\"/\202\323\344\223\002)\"$/v1/documents:analyzeEnt" +
-      "itySentiment:\001*\022\230\001\n\rAnalyzeSyntax\022..goog" +
+      "itySentiment:\001*\022\230\001\n\rAnalyzeSyntax\022..goog",
       "le.cloud.language.v1.AnalyzeSyntaxReques" +
       "t\032/.google.cloud.language.v1.AnalyzeSynt" +
       "axResponse\"&\202\323\344\223\002 \"\033/v1/documents:analyz" +
@@ -332,7 +332,7 @@ public static void registerAllExtensions(
       "se\"%\202\323\344\223\002\037\"\032/v1/documents:classifyText:\001" +
       "*\022\224\001\n\014AnnotateText\022-.google.cloud.langua" +
       "ge.v1.AnnotateTextRequest\032..google.cloud" +
-      ".language.v1.AnnotateTextResponse\"%\202\323\344\223\002" +
+      ".language.v1.AnnotateTextResponse\"%\202\323\344\223\002",
       "\037\"\032/v1/documents:annotateText:\001*Bx\n\034com." +
       "google.cloud.language.v1B\024LanguageServic" +
       "eProtoP\001Z@google.golang.org/genproto/goo" +
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/PartOfSpeech.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/PartOfSpeech.java
index 62e8d9731b7e..230eab48f4b0 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/PartOfSpeech.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/PartOfSpeech.java
@@ -46,9 +46,6 @@ private PartOfSpeech(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -60,6 +57,13 @@ private PartOfSpeech(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -132,13 +136,6 @@ private PartOfSpeech(
             voice_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -156,7 +153,6 @@ private PartOfSpeech(
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_PartOfSpeech_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_PartOfSpeech_fieldAccessorTable
@@ -2594,7 +2590,6 @@ public int getTagValue() {
    * .google.cloud.language.v1.PartOfSpeech.Tag tag = 1;
    */
   public com.google.cloud.language.v1.PartOfSpeech.Tag getTag() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1.PartOfSpeech.Tag result = com.google.cloud.language.v1.PartOfSpeech.Tag.valueOf(tag_);
     return result == null ? com.google.cloud.language.v1.PartOfSpeech.Tag.UNRECOGNIZED : result;
   }
@@ -2619,7 +2614,6 @@ public int getAspectValue() {
    * .google.cloud.language.v1.PartOfSpeech.Aspect aspect = 2;
    */
   public com.google.cloud.language.v1.PartOfSpeech.Aspect getAspect() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1.PartOfSpeech.Aspect result = com.google.cloud.language.v1.PartOfSpeech.Aspect.valueOf(aspect_);
     return result == null ? com.google.cloud.language.v1.PartOfSpeech.Aspect.UNRECOGNIZED : result;
   }
@@ -2644,7 +2638,6 @@ public int getCaseValue() {
    * .google.cloud.language.v1.PartOfSpeech.Case case = 3;
    */
   public com.google.cloud.language.v1.PartOfSpeech.Case getCase() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1.PartOfSpeech.Case result = com.google.cloud.language.v1.PartOfSpeech.Case.valueOf(case_);
     return result == null ? com.google.cloud.language.v1.PartOfSpeech.Case.UNRECOGNIZED : result;
   }
@@ -2669,7 +2662,6 @@ public int getFormValue() {
    * .google.cloud.language.v1.PartOfSpeech.Form form = 4;
    */
   public com.google.cloud.language.v1.PartOfSpeech.Form getForm() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1.PartOfSpeech.Form result = com.google.cloud.language.v1.PartOfSpeech.Form.valueOf(form_);
     return result == null ? com.google.cloud.language.v1.PartOfSpeech.Form.UNRECOGNIZED : result;
   }
@@ -2694,7 +2686,6 @@ public int getGenderValue() {
    * .google.cloud.language.v1.PartOfSpeech.Gender gender = 5;
    */
   public com.google.cloud.language.v1.PartOfSpeech.Gender getGender() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1.PartOfSpeech.Gender result = com.google.cloud.language.v1.PartOfSpeech.Gender.valueOf(gender_);
     return result == null ? com.google.cloud.language.v1.PartOfSpeech.Gender.UNRECOGNIZED : result;
   }
@@ -2719,7 +2710,6 @@ public int getMoodValue() {
    * .google.cloud.language.v1.PartOfSpeech.Mood mood = 6;
    */
   public com.google.cloud.language.v1.PartOfSpeech.Mood getMood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1.PartOfSpeech.Mood result = com.google.cloud.language.v1.PartOfSpeech.Mood.valueOf(mood_);
     return result == null ? com.google.cloud.language.v1.PartOfSpeech.Mood.UNRECOGNIZED : result;
   }
@@ -2744,7 +2734,6 @@ public int getNumberValue() {
    * .google.cloud.language.v1.PartOfSpeech.Number number = 7;
    */
   public com.google.cloud.language.v1.PartOfSpeech.Number getNumber() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1.PartOfSpeech.Number result = com.google.cloud.language.v1.PartOfSpeech.Number.valueOf(number_);
     return result == null ? com.google.cloud.language.v1.PartOfSpeech.Number.UNRECOGNIZED : result;
   }
@@ -2769,7 +2758,6 @@ public int getPersonValue() {
    * .google.cloud.language.v1.PartOfSpeech.Person person = 8;
    */
   public com.google.cloud.language.v1.PartOfSpeech.Person getPerson() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1.PartOfSpeech.Person result = com.google.cloud.language.v1.PartOfSpeech.Person.valueOf(person_);
     return result == null ? com.google.cloud.language.v1.PartOfSpeech.Person.UNRECOGNIZED : result;
   }
@@ -2794,7 +2782,6 @@ public int getProperValue() {
    * .google.cloud.language.v1.PartOfSpeech.Proper proper = 9;
    */
   public com.google.cloud.language.v1.PartOfSpeech.Proper getProper() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1.PartOfSpeech.Proper result = com.google.cloud.language.v1.PartOfSpeech.Proper.valueOf(proper_);
     return result == null ? com.google.cloud.language.v1.PartOfSpeech.Proper.UNRECOGNIZED : result;
   }
@@ -2819,7 +2806,6 @@ public int getReciprocityValue() {
    * .google.cloud.language.v1.PartOfSpeech.Reciprocity reciprocity = 10;
    */
   public com.google.cloud.language.v1.PartOfSpeech.Reciprocity getReciprocity() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1.PartOfSpeech.Reciprocity result = com.google.cloud.language.v1.PartOfSpeech.Reciprocity.valueOf(reciprocity_);
     return result == null ? com.google.cloud.language.v1.PartOfSpeech.Reciprocity.UNRECOGNIZED : result;
   }
@@ -2844,7 +2830,6 @@ public int getTenseValue() {
    * .google.cloud.language.v1.PartOfSpeech.Tense tense = 11;
    */
   public com.google.cloud.language.v1.PartOfSpeech.Tense getTense() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1.PartOfSpeech.Tense result = com.google.cloud.language.v1.PartOfSpeech.Tense.valueOf(tense_);
     return result == null ? com.google.cloud.language.v1.PartOfSpeech.Tense.UNRECOGNIZED : result;
   }
@@ -2869,13 +2854,11 @@ public int getVoiceValue() {
    * .google.cloud.language.v1.PartOfSpeech.Voice voice = 12;
    */
   public com.google.cloud.language.v1.PartOfSpeech.Voice getVoice() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1.PartOfSpeech.Voice result = com.google.cloud.language.v1.PartOfSpeech.Voice.valueOf(voice_);
     return result == null ? com.google.cloud.language.v1.PartOfSpeech.Voice.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -2885,7 +2868,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (tag_ != com.google.cloud.language.v1.PartOfSpeech.Tag.UNKNOWN.getNumber()) {
@@ -2927,7 +2909,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -3119,7 +3100,6 @@ public static com.google.cloud.language.v1.PartOfSpeech parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -3127,7 +3107,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1.PartOfSpeech prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -3157,7 +3136,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_PartOfSpeech_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_PartOfSpeech_fieldAccessorTable
@@ -3180,7 +3158,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       tag_ = 0;
@@ -3210,18 +3187,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_PartOfSpeech_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.PartOfSpeech getDefaultInstanceForType() {
       return com.google.cloud.language.v1.PartOfSpeech.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.PartOfSpeech build() {
       com.google.cloud.language.v1.PartOfSpeech result = buildPartial();
       if (!result.isInitialized()) {
@@ -3230,7 +3204,6 @@ public com.google.cloud.language.v1.PartOfSpeech build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.PartOfSpeech buildPartial() {
       com.google.cloud.language.v1.PartOfSpeech result = new com.google.cloud.language.v1.PartOfSpeech(this);
       result.tag_ = tag_;
@@ -3249,39 +3222,32 @@ public com.google.cloud.language.v1.PartOfSpeech buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1.PartOfSpeech) {
         return mergeFrom((com.google.cloud.language.v1.PartOfSpeech)other);
@@ -3334,12 +3300,10 @@ public Builder mergeFrom(com.google.cloud.language.v1.PartOfSpeech other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3389,7 +3353,6 @@ public Builder setTagValue(int value) {
      * .google.cloud.language.v1.PartOfSpeech.Tag tag = 1;
      */
     public com.google.cloud.language.v1.PartOfSpeech.Tag getTag() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1.PartOfSpeech.Tag result = com.google.cloud.language.v1.PartOfSpeech.Tag.valueOf(tag_);
       return result == null ? com.google.cloud.language.v1.PartOfSpeech.Tag.UNRECOGNIZED : result;
     }
@@ -3454,7 +3417,6 @@ public Builder setAspectValue(int value) {
      * .google.cloud.language.v1.PartOfSpeech.Aspect aspect = 2;
      */
     public com.google.cloud.language.v1.PartOfSpeech.Aspect getAspect() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1.PartOfSpeech.Aspect result = com.google.cloud.language.v1.PartOfSpeech.Aspect.valueOf(aspect_);
       return result == null ? com.google.cloud.language.v1.PartOfSpeech.Aspect.UNRECOGNIZED : result;
     }
@@ -3519,7 +3481,6 @@ public Builder setCaseValue(int value) {
      * .google.cloud.language.v1.PartOfSpeech.Case case = 3;
      */
     public com.google.cloud.language.v1.PartOfSpeech.Case getCase() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1.PartOfSpeech.Case result = com.google.cloud.language.v1.PartOfSpeech.Case.valueOf(case_);
       return result == null ? com.google.cloud.language.v1.PartOfSpeech.Case.UNRECOGNIZED : result;
     }
@@ -3584,7 +3545,6 @@ public Builder setFormValue(int value) {
      * .google.cloud.language.v1.PartOfSpeech.Form form = 4;
      */
     public com.google.cloud.language.v1.PartOfSpeech.Form getForm() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1.PartOfSpeech.Form result = com.google.cloud.language.v1.PartOfSpeech.Form.valueOf(form_);
       return result == null ? com.google.cloud.language.v1.PartOfSpeech.Form.UNRECOGNIZED : result;
     }
@@ -3649,7 +3609,6 @@ public Builder setGenderValue(int value) {
      * .google.cloud.language.v1.PartOfSpeech.Gender gender = 5;
      */
     public com.google.cloud.language.v1.PartOfSpeech.Gender getGender() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1.PartOfSpeech.Gender result = com.google.cloud.language.v1.PartOfSpeech.Gender.valueOf(gender_);
       return result == null ? com.google.cloud.language.v1.PartOfSpeech.Gender.UNRECOGNIZED : result;
     }
@@ -3714,7 +3673,6 @@ public Builder setMoodValue(int value) {
      * .google.cloud.language.v1.PartOfSpeech.Mood mood = 6;
      */
     public com.google.cloud.language.v1.PartOfSpeech.Mood getMood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1.PartOfSpeech.Mood result = com.google.cloud.language.v1.PartOfSpeech.Mood.valueOf(mood_);
       return result == null ? com.google.cloud.language.v1.PartOfSpeech.Mood.UNRECOGNIZED : result;
     }
@@ -3779,7 +3737,6 @@ public Builder setNumberValue(int value) {
      * .google.cloud.language.v1.PartOfSpeech.Number number = 7;
      */
     public com.google.cloud.language.v1.PartOfSpeech.Number getNumber() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1.PartOfSpeech.Number result = com.google.cloud.language.v1.PartOfSpeech.Number.valueOf(number_);
       return result == null ? com.google.cloud.language.v1.PartOfSpeech.Number.UNRECOGNIZED : result;
     }
@@ -3844,7 +3801,6 @@ public Builder setPersonValue(int value) {
      * .google.cloud.language.v1.PartOfSpeech.Person person = 8;
      */
     public com.google.cloud.language.v1.PartOfSpeech.Person getPerson() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1.PartOfSpeech.Person result = com.google.cloud.language.v1.PartOfSpeech.Person.valueOf(person_);
       return result == null ? com.google.cloud.language.v1.PartOfSpeech.Person.UNRECOGNIZED : result;
     }
@@ -3909,7 +3865,6 @@ public Builder setProperValue(int value) {
      * .google.cloud.language.v1.PartOfSpeech.Proper proper = 9;
      */
     public com.google.cloud.language.v1.PartOfSpeech.Proper getProper() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1.PartOfSpeech.Proper result = com.google.cloud.language.v1.PartOfSpeech.Proper.valueOf(proper_);
       return result == null ? com.google.cloud.language.v1.PartOfSpeech.Proper.UNRECOGNIZED : result;
     }
@@ -3974,7 +3929,6 @@ public Builder setReciprocityValue(int value) {
      * .google.cloud.language.v1.PartOfSpeech.Reciprocity reciprocity = 10;
      */
     public com.google.cloud.language.v1.PartOfSpeech.Reciprocity getReciprocity() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1.PartOfSpeech.Reciprocity result = com.google.cloud.language.v1.PartOfSpeech.Reciprocity.valueOf(reciprocity_);
       return result == null ? com.google.cloud.language.v1.PartOfSpeech.Reciprocity.UNRECOGNIZED : result;
     }
@@ -4039,7 +3993,6 @@ public Builder setTenseValue(int value) {
      * .google.cloud.language.v1.PartOfSpeech.Tense tense = 11;
      */
     public com.google.cloud.language.v1.PartOfSpeech.Tense getTense() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1.PartOfSpeech.Tense result = com.google.cloud.language.v1.PartOfSpeech.Tense.valueOf(tense_);
       return result == null ? com.google.cloud.language.v1.PartOfSpeech.Tense.UNRECOGNIZED : result;
     }
@@ -4104,7 +4057,6 @@ public Builder setVoiceValue(int value) {
      * .google.cloud.language.v1.PartOfSpeech.Voice voice = 12;
      */
     public com.google.cloud.language.v1.PartOfSpeech.Voice getVoice() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1.PartOfSpeech.Voice result = com.google.cloud.language.v1.PartOfSpeech.Voice.valueOf(voice_);
       return result == null ? com.google.cloud.language.v1.PartOfSpeech.Voice.UNRECOGNIZED : result;
     }
@@ -4137,13 +4089,11 @@ public Builder clearVoice() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -4165,12 +4115,11 @@ public static com.google.cloud.language.v1.PartOfSpeech getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PartOfSpeech parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PartOfSpeech(input, extensionRegistry);
+        return new PartOfSpeech(input, extensionRegistry);
     }
   };
 
@@ -4183,7 +4132,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1.PartOfSpeech getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Sentence.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Sentence.java
index 638012d8f135..d655e467d606 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Sentence.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Sentence.java
@@ -32,9 +32,6 @@ private Sentence(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private Sentence(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.language.v1.TextSpan.Builder subBuilder = null;
             if (text_ != null) {
@@ -72,13 +76,6 @@ private Sentence(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private Sentence(
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_Sentence_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_Sentence_fieldAccessorTable
@@ -177,7 +173,6 @@ public com.google.cloud.language.v1.SentimentOrBuilder getSentimentOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -187,7 +182,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (text_ != null) {
@@ -199,7 +193,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -333,7 +326,6 @@ public static com.google.cloud.language.v1.Sentence parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -341,7 +333,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1.Sentence prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -369,7 +360,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_Sentence_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_Sentence_fieldAccessorTable
@@ -392,7 +382,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (textBuilder_ == null) {
@@ -410,18 +399,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_Sentence_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.Sentence getDefaultInstanceForType() {
       return com.google.cloud.language.v1.Sentence.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.Sentence build() {
       com.google.cloud.language.v1.Sentence result = buildPartial();
       if (!result.isInitialized()) {
@@ -430,7 +416,6 @@ public com.google.cloud.language.v1.Sentence build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.Sentence buildPartial() {
       com.google.cloud.language.v1.Sentence result = new com.google.cloud.language.v1.Sentence(this);
       if (textBuilder_ == null) {
@@ -447,39 +432,32 @@ public com.google.cloud.language.v1.Sentence buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1.Sentence) {
         return mergeFrom((com.google.cloud.language.v1.Sentence)other);
@@ -502,12 +480,10 @@ public Builder mergeFrom(com.google.cloud.language.v1.Sentence other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -849,13 +825,11 @@ public com.google.cloud.language.v1.SentimentOrBuilder getSentimentOrBuilder() {
       }
       return sentimentBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -877,12 +851,11 @@ public static com.google.cloud.language.v1.Sentence getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Sentence parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Sentence(input, extensionRegistry);
+        return new Sentence(input, extensionRegistry);
     }
   };
 
@@ -895,7 +868,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1.Sentence getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Sentiment.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Sentiment.java
index 8a87a16cd6db..e752d53c333f 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Sentiment.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Sentiment.java
@@ -35,9 +35,6 @@ private Sentiment(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private Sentiment(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 21: {
 
             magnitude_ = input.readFloat();
@@ -59,13 +63,6 @@ private Sentiment(
             score_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private Sentiment(
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_Sentiment_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_Sentiment_fieldAccessorTable
@@ -121,7 +117,6 @@ public float getScore() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -131,7 +126,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (magnitude_ != 0F) {
@@ -143,7 +137,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -273,7 +266,6 @@ public static com.google.cloud.language.v1.Sentiment parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -281,7 +273,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1.Sentiment prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -310,7 +301,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_Sentiment_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_Sentiment_fieldAccessorTable
@@ -333,7 +323,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       magnitude_ = 0F;
@@ -343,18 +332,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_Sentiment_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.Sentiment getDefaultInstanceForType() {
       return com.google.cloud.language.v1.Sentiment.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.Sentiment build() {
       com.google.cloud.language.v1.Sentiment result = buildPartial();
       if (!result.isInitialized()) {
@@ -363,7 +349,6 @@ public com.google.cloud.language.v1.Sentiment build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.Sentiment buildPartial() {
       com.google.cloud.language.v1.Sentiment result = new com.google.cloud.language.v1.Sentiment(this);
       result.magnitude_ = magnitude_;
@@ -372,39 +357,32 @@ public com.google.cloud.language.v1.Sentiment buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1.Sentiment) {
         return mergeFrom((com.google.cloud.language.v1.Sentiment)other);
@@ -427,12 +405,10 @@ public Builder mergeFrom(com.google.cloud.language.v1.Sentiment other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -535,13 +511,11 @@ public Builder clearScore() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -563,12 +537,11 @@ public static com.google.cloud.language.v1.Sentiment getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Sentiment parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Sentiment(input, extensionRegistry);
+        return new Sentiment(input, extensionRegistry);
     }
   };
 
@@ -581,7 +554,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1.Sentiment getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/TextSpan.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/TextSpan.java
index db1b0c570080..a3fc06640e47 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/TextSpan.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/TextSpan.java
@@ -34,9 +34,6 @@ private TextSpan(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private TextSpan(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -59,13 +63,6 @@ private TextSpan(
             beginOffset_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private TextSpan(
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_TextSpan_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_TextSpan_fieldAccessorTable
@@ -148,7 +144,6 @@ public int getBeginOffset() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -158,7 +153,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getContentBytes().isEmpty()) {
@@ -170,7 +164,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -293,7 +286,6 @@ public static com.google.cloud.language.v1.TextSpan parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -301,7 +293,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1.TextSpan prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -329,7 +320,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_TextSpan_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_TextSpan_fieldAccessorTable
@@ -352,7 +342,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       content_ = "";
@@ -362,18 +351,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_TextSpan_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.TextSpan getDefaultInstanceForType() {
       return com.google.cloud.language.v1.TextSpan.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.TextSpan build() {
       com.google.cloud.language.v1.TextSpan result = buildPartial();
       if (!result.isInitialized()) {
@@ -382,7 +368,6 @@ public com.google.cloud.language.v1.TextSpan build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.TextSpan buildPartial() {
       com.google.cloud.language.v1.TextSpan result = new com.google.cloud.language.v1.TextSpan(this);
       result.content_ = content_;
@@ -391,39 +376,32 @@ public com.google.cloud.language.v1.TextSpan buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1.TextSpan) {
         return mergeFrom((com.google.cloud.language.v1.TextSpan)other);
@@ -447,12 +425,10 @@ public Builder mergeFrom(com.google.cloud.language.v1.TextSpan other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -600,13 +576,11 @@ public Builder clearBeginOffset() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -628,12 +602,11 @@ public static com.google.cloud.language.v1.TextSpan getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TextSpan parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TextSpan(input, extensionRegistry);
+        return new TextSpan(input, extensionRegistry);
     }
   };
 
@@ -646,7 +619,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1.TextSpan getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Token.java b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Token.java
index 973ce5e91871..f554f6246ae8 100644
--- a/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Token.java
+++ b/google-api-grpc/proto-google-cloud-language-v1/src/main/java/com/google/cloud/language/v1/Token.java
@@ -33,9 +33,6 @@ private Token(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private Token(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.language.v1.TextSpan.Builder subBuilder = null;
             if (text_ != null) {
@@ -92,13 +96,6 @@ private Token(
             lemma_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -116,7 +113,6 @@ private Token(
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_Token_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_Token_fieldAccessorTable
@@ -266,7 +262,6 @@ public java.lang.String getLemma() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -276,7 +271,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (text_ != null) {
@@ -294,7 +288,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -448,7 +441,6 @@ public static com.google.cloud.language.v1.Token parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -456,7 +448,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1.Token prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -484,7 +475,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_Token_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_Token_fieldAccessorTable
@@ -507,7 +497,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (textBuilder_ == null) {
@@ -533,18 +522,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1.LanguageServiceProto.internal_static_google_cloud_language_v1_Token_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.Token getDefaultInstanceForType() {
       return com.google.cloud.language.v1.Token.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.Token build() {
       com.google.cloud.language.v1.Token result = buildPartial();
       if (!result.isInitialized()) {
@@ -553,7 +539,6 @@ public com.google.cloud.language.v1.Token build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1.Token buildPartial() {
       com.google.cloud.language.v1.Token result = new com.google.cloud.language.v1.Token(this);
       if (textBuilder_ == null) {
@@ -576,39 +561,32 @@ public com.google.cloud.language.v1.Token buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1.Token) {
         return mergeFrom((com.google.cloud.language.v1.Token)other);
@@ -638,12 +616,10 @@ public Builder mergeFrom(com.google.cloud.language.v1.Token other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1209,13 +1185,11 @@ public Builder setLemmaBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1237,12 +1211,11 @@ public static com.google.cloud.language.v1.Token getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Token parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Token(input, extensionRegistry);
+        return new Token(input, extensionRegistry);
     }
   };
 
@@ -1255,7 +1228,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1.Token getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitiesRequest.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitiesRequest.java
index f766744e9916..c63d96dd26cc 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitiesRequest.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitiesRequest.java
@@ -33,9 +33,6 @@ private AnalyzeEntitiesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private AnalyzeEntitiesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.language.v1beta2.Document.Builder subBuilder = null;
             if (document_ != null) {
@@ -66,13 +70,6 @@ private AnalyzeEntitiesRequest(
             encodingType_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private AnalyzeEntitiesRequest(
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeEntitiesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeEntitiesRequest_fieldAccessorTable
@@ -151,13 +147,11 @@ public int getEncodingTypeValue() {
    * .google.cloud.language.v1beta2.EncodingType encoding_type = 2;
    */
   public com.google.cloud.language.v1beta2.EncodingType getEncodingType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1beta2.EncodingType result = com.google.cloud.language.v1beta2.EncodingType.valueOf(encodingType_);
     return result == null ? com.google.cloud.language.v1beta2.EncodingType.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -167,7 +161,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (document_ != null) {
@@ -179,7 +172,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -307,7 +299,6 @@ public static com.google.cloud.language.v1beta2.AnalyzeEntitiesRequest parseFrom
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -315,7 +306,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1beta2.AnalyzeEntitiesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -343,7 +333,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeEntitiesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeEntitiesRequest_fieldAccessorTable
@@ -366,7 +355,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (documentBuilder_ == null) {
@@ -380,18 +368,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeEntitiesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.AnalyzeEntitiesRequest getDefaultInstanceForType() {
       return com.google.cloud.language.v1beta2.AnalyzeEntitiesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.AnalyzeEntitiesRequest build() {
       com.google.cloud.language.v1beta2.AnalyzeEntitiesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -400,7 +385,6 @@ public com.google.cloud.language.v1beta2.AnalyzeEntitiesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.AnalyzeEntitiesRequest buildPartial() {
       com.google.cloud.language.v1beta2.AnalyzeEntitiesRequest result = new com.google.cloud.language.v1beta2.AnalyzeEntitiesRequest(this);
       if (documentBuilder_ == null) {
@@ -413,39 +397,32 @@ public com.google.cloud.language.v1beta2.AnalyzeEntitiesRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1beta2.AnalyzeEntitiesRequest) {
         return mergeFrom((com.google.cloud.language.v1beta2.AnalyzeEntitiesRequest)other);
@@ -468,12 +445,10 @@ public Builder mergeFrom(com.google.cloud.language.v1beta2.AnalyzeEntitiesReques
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -676,7 +651,6 @@ public Builder setEncodingTypeValue(int value) {
      * .google.cloud.language.v1beta2.EncodingType encoding_type = 2;
      */
     public com.google.cloud.language.v1beta2.EncodingType getEncodingType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1beta2.EncodingType result = com.google.cloud.language.v1beta2.EncodingType.valueOf(encodingType_);
       return result == null ? com.google.cloud.language.v1beta2.EncodingType.UNRECOGNIZED : result;
     }
@@ -709,13 +683,11 @@ public Builder clearEncodingType() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -737,12 +709,11 @@ public static com.google.cloud.language.v1beta2.AnalyzeEntitiesRequest getDefaul
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnalyzeEntitiesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeEntitiesRequest(input, extensionRegistry);
+        return new AnalyzeEntitiesRequest(input, extensionRegistry);
     }
   };
 
@@ -755,7 +726,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1beta2.AnalyzeEntitiesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitiesResponse.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitiesResponse.java
index 4d3b1096ad39..0b973a178885 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitiesResponse.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitiesResponse.java
@@ -34,9 +34,6 @@ private AnalyzeEntitiesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private AnalyzeEntitiesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               entities_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private AnalyzeEntitiesResponse(
             language_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private AnalyzeEntitiesResponse(
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeEntitiesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeEntitiesResponse_fieldAccessorTable
@@ -201,7 +197,6 @@ public java.lang.String getLanguage() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -211,7 +206,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < entities_.size(); i++) {
@@ -223,7 +217,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.cloud.language.v1beta2.AnalyzeEntitiesResponse parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1beta2.AnalyzeEntitiesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeEntitiesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeEntitiesResponse_fieldAccessorTable
@@ -408,7 +398,6 @@ private void maybeForceBuilderInitialization() {
         getEntitiesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (entitiesBuilder_ == null) {
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeEntitiesResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.AnalyzeEntitiesResponse getDefaultInstanceForType() {
       return com.google.cloud.language.v1beta2.AnalyzeEntitiesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.AnalyzeEntitiesResponse build() {
       com.google.cloud.language.v1beta2.AnalyzeEntitiesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public com.google.cloud.language.v1beta2.AnalyzeEntitiesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.AnalyzeEntitiesResponse buildPartial() {
       com.google.cloud.language.v1beta2.AnalyzeEntitiesResponse result = new com.google.cloud.language.v1beta2.AnalyzeEntitiesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -462,39 +447,32 @@ public com.google.cloud.language.v1beta2.AnalyzeEntitiesResponse buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1beta2.AnalyzeEntitiesResponse) {
         return mergeFrom((com.google.cloud.language.v1beta2.AnalyzeEntitiesResponse)other);
@@ -541,12 +519,10 @@ public Builder mergeFrom(com.google.cloud.language.v1beta2.AnalyzeEntitiesRespon
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -976,13 +952,11 @@ public Builder setLanguageBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1004,12 +978,11 @@ public static com.google.cloud.language.v1beta2.AnalyzeEntitiesResponse getDefau
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnalyzeEntitiesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeEntitiesResponse(input, extensionRegistry);
+        return new AnalyzeEntitiesResponse(input, extensionRegistry);
     }
   };
 
@@ -1022,7 +995,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1beta2.AnalyzeEntitiesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitySentimentRequest.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitySentimentRequest.java
index e88050741d98..fa13602cf2c0 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitySentimentRequest.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitySentimentRequest.java
@@ -33,9 +33,6 @@ private AnalyzeEntitySentimentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private AnalyzeEntitySentimentRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.language.v1beta2.Document.Builder subBuilder = null;
             if (document_ != null) {
@@ -66,13 +70,6 @@ private AnalyzeEntitySentimentRequest(
             encodingType_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private AnalyzeEntitySentimentRequest(
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeEntitySentimentRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeEntitySentimentRequest_fieldAccessorTable
@@ -151,13 +147,11 @@ public int getEncodingTypeValue() {
    * .google.cloud.language.v1beta2.EncodingType encoding_type = 2;
    */
   public com.google.cloud.language.v1beta2.EncodingType getEncodingType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1beta2.EncodingType result = com.google.cloud.language.v1beta2.EncodingType.valueOf(encodingType_);
     return result == null ? com.google.cloud.language.v1beta2.EncodingType.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -167,7 +161,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (document_ != null) {
@@ -179,7 +172,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -307,7 +299,6 @@ public static com.google.cloud.language.v1beta2.AnalyzeEntitySentimentRequest pa
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -315,7 +306,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1beta2.AnalyzeEntitySentimentRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -343,7 +333,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeEntitySentimentRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeEntitySentimentRequest_fieldAccessorTable
@@ -366,7 +355,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (documentBuilder_ == null) {
@@ -380,18 +368,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeEntitySentimentRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.AnalyzeEntitySentimentRequest getDefaultInstanceForType() {
       return com.google.cloud.language.v1beta2.AnalyzeEntitySentimentRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.AnalyzeEntitySentimentRequest build() {
       com.google.cloud.language.v1beta2.AnalyzeEntitySentimentRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -400,7 +385,6 @@ public com.google.cloud.language.v1beta2.AnalyzeEntitySentimentRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.AnalyzeEntitySentimentRequest buildPartial() {
       com.google.cloud.language.v1beta2.AnalyzeEntitySentimentRequest result = new com.google.cloud.language.v1beta2.AnalyzeEntitySentimentRequest(this);
       if (documentBuilder_ == null) {
@@ -413,39 +397,32 @@ public com.google.cloud.language.v1beta2.AnalyzeEntitySentimentRequest buildPart
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1beta2.AnalyzeEntitySentimentRequest) {
         return mergeFrom((com.google.cloud.language.v1beta2.AnalyzeEntitySentimentRequest)other);
@@ -468,12 +445,10 @@ public Builder mergeFrom(com.google.cloud.language.v1beta2.AnalyzeEntitySentimen
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -676,7 +651,6 @@ public Builder setEncodingTypeValue(int value) {
      * .google.cloud.language.v1beta2.EncodingType encoding_type = 2;
      */
     public com.google.cloud.language.v1beta2.EncodingType getEncodingType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1beta2.EncodingType result = com.google.cloud.language.v1beta2.EncodingType.valueOf(encodingType_);
       return result == null ? com.google.cloud.language.v1beta2.EncodingType.UNRECOGNIZED : result;
     }
@@ -709,13 +683,11 @@ public Builder clearEncodingType() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -737,12 +709,11 @@ public static com.google.cloud.language.v1beta2.AnalyzeEntitySentimentRequest ge
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnalyzeEntitySentimentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeEntitySentimentRequest(input, extensionRegistry);
+        return new AnalyzeEntitySentimentRequest(input, extensionRegistry);
     }
   };
 
@@ -755,7 +726,6 @@ public com.google.protobuf.Parser getParserForTyp
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1beta2.AnalyzeEntitySentimentRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitySentimentResponse.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitySentimentResponse.java
index b5d768e0105b..b9d853bfc5cd 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitySentimentResponse.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeEntitySentimentResponse.java
@@ -34,9 +34,6 @@ private AnalyzeEntitySentimentResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private AnalyzeEntitySentimentResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               entities_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private AnalyzeEntitySentimentResponse(
             language_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private AnalyzeEntitySentimentResponse(
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeEntitySentimentResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeEntitySentimentResponse_fieldAccessorTable
@@ -201,7 +197,6 @@ public java.lang.String getLanguage() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -211,7 +206,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < entities_.size(); i++) {
@@ -223,7 +217,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.cloud.language.v1beta2.AnalyzeEntitySentimentResponse p
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1beta2.AnalyzeEntitySentimentResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeEntitySentimentResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeEntitySentimentResponse_fieldAccessorTable
@@ -408,7 +398,6 @@ private void maybeForceBuilderInitialization() {
         getEntitiesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (entitiesBuilder_ == null) {
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeEntitySentimentResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.AnalyzeEntitySentimentResponse getDefaultInstanceForType() {
       return com.google.cloud.language.v1beta2.AnalyzeEntitySentimentResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.AnalyzeEntitySentimentResponse build() {
       com.google.cloud.language.v1beta2.AnalyzeEntitySentimentResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public com.google.cloud.language.v1beta2.AnalyzeEntitySentimentResponse build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.AnalyzeEntitySentimentResponse buildPartial() {
       com.google.cloud.language.v1beta2.AnalyzeEntitySentimentResponse result = new com.google.cloud.language.v1beta2.AnalyzeEntitySentimentResponse(this);
       int from_bitField0_ = bitField0_;
@@ -462,39 +447,32 @@ public com.google.cloud.language.v1beta2.AnalyzeEntitySentimentResponse buildPar
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1beta2.AnalyzeEntitySentimentResponse) {
         return mergeFrom((com.google.cloud.language.v1beta2.AnalyzeEntitySentimentResponse)other);
@@ -541,12 +519,10 @@ public Builder mergeFrom(com.google.cloud.language.v1beta2.AnalyzeEntitySentimen
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -976,13 +952,11 @@ public Builder setLanguageBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1004,12 +978,11 @@ public static com.google.cloud.language.v1beta2.AnalyzeEntitySentimentResponse g
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnalyzeEntitySentimentResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeEntitySentimentResponse(input, extensionRegistry);
+        return new AnalyzeEntitySentimentResponse(input, extensionRegistry);
     }
   };
 
@@ -1022,7 +995,6 @@ public com.google.protobuf.Parser getParserForTy
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1beta2.AnalyzeEntitySentimentResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSentimentRequest.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSentimentRequest.java
index f37fb8bb883b..1d0f2732e7b5 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSentimentRequest.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSentimentRequest.java
@@ -33,9 +33,6 @@ private AnalyzeSentimentRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private AnalyzeSentimentRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.language.v1beta2.Document.Builder subBuilder = null;
             if (document_ != null) {
@@ -66,13 +70,6 @@ private AnalyzeSentimentRequest(
             encodingType_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private AnalyzeSentimentRequest(
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeSentimentRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeSentimentRequest_fieldAccessorTable
@@ -153,13 +149,11 @@ public int getEncodingTypeValue() {
    * .google.cloud.language.v1beta2.EncodingType encoding_type = 2;
    */
   public com.google.cloud.language.v1beta2.EncodingType getEncodingType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1beta2.EncodingType result = com.google.cloud.language.v1beta2.EncodingType.valueOf(encodingType_);
     return result == null ? com.google.cloud.language.v1beta2.EncodingType.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -169,7 +163,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (document_ != null) {
@@ -181,7 +174,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -309,7 +301,6 @@ public static com.google.cloud.language.v1beta2.AnalyzeSentimentRequest parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -317,7 +308,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1beta2.AnalyzeSentimentRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -345,7 +335,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeSentimentRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeSentimentRequest_fieldAccessorTable
@@ -368,7 +357,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (documentBuilder_ == null) {
@@ -382,18 +370,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeSentimentRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.AnalyzeSentimentRequest getDefaultInstanceForType() {
       return com.google.cloud.language.v1beta2.AnalyzeSentimentRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.AnalyzeSentimentRequest build() {
       com.google.cloud.language.v1beta2.AnalyzeSentimentRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -402,7 +387,6 @@ public com.google.cloud.language.v1beta2.AnalyzeSentimentRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.AnalyzeSentimentRequest buildPartial() {
       com.google.cloud.language.v1beta2.AnalyzeSentimentRequest result = new com.google.cloud.language.v1beta2.AnalyzeSentimentRequest(this);
       if (documentBuilder_ == null) {
@@ -415,39 +399,32 @@ public com.google.cloud.language.v1beta2.AnalyzeSentimentRequest buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1beta2.AnalyzeSentimentRequest) {
         return mergeFrom((com.google.cloud.language.v1beta2.AnalyzeSentimentRequest)other);
@@ -470,12 +447,10 @@ public Builder mergeFrom(com.google.cloud.language.v1beta2.AnalyzeSentimentReque
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -681,7 +656,6 @@ public Builder setEncodingTypeValue(int value) {
      * .google.cloud.language.v1beta2.EncodingType encoding_type = 2;
      */
     public com.google.cloud.language.v1beta2.EncodingType getEncodingType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1beta2.EncodingType result = com.google.cloud.language.v1beta2.EncodingType.valueOf(encodingType_);
       return result == null ? com.google.cloud.language.v1beta2.EncodingType.UNRECOGNIZED : result;
     }
@@ -716,13 +690,11 @@ public Builder clearEncodingType() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -744,12 +716,11 @@ public static com.google.cloud.language.v1beta2.AnalyzeSentimentRequest getDefau
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnalyzeSentimentRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeSentimentRequest(input, extensionRegistry);
+        return new AnalyzeSentimentRequest(input, extensionRegistry);
     }
   };
 
@@ -762,7 +733,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1beta2.AnalyzeSentimentRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSentimentResponse.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSentimentResponse.java
index 9004c2871d64..b00f991d5fbb 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSentimentResponse.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSentimentResponse.java
@@ -34,9 +34,6 @@ private AnalyzeSentimentResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private AnalyzeSentimentResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.language.v1beta2.Sentiment.Builder subBuilder = null;
             if (documentSentiment_ != null) {
@@ -76,13 +80,6 @@ private AnalyzeSentimentResponse(
                 input.readMessage(com.google.cloud.language.v1beta2.Sentence.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private AnalyzeSentimentResponse(
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeSentimentResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeSentimentResponse_fieldAccessorTable
@@ -247,7 +243,6 @@ public com.google.cloud.language.v1beta2.SentenceOrBuilder getSentencesOrBuilder
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -257,7 +252,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (documentSentiment_ != null) {
@@ -272,7 +266,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -410,7 +403,6 @@ public static com.google.cloud.language.v1beta2.AnalyzeSentimentResponse parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -418,7 +410,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1beta2.AnalyzeSentimentResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -446,7 +437,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeSentimentResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeSentimentResponse_fieldAccessorTable
@@ -470,7 +460,6 @@ private void maybeForceBuilderInitialization() {
         getSentencesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (documentSentimentBuilder_ == null) {
@@ -490,18 +479,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeSentimentResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.AnalyzeSentimentResponse getDefaultInstanceForType() {
       return com.google.cloud.language.v1beta2.AnalyzeSentimentResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.AnalyzeSentimentResponse build() {
       com.google.cloud.language.v1beta2.AnalyzeSentimentResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -510,7 +496,6 @@ public com.google.cloud.language.v1beta2.AnalyzeSentimentResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.AnalyzeSentimentResponse buildPartial() {
       com.google.cloud.language.v1beta2.AnalyzeSentimentResponse result = new com.google.cloud.language.v1beta2.AnalyzeSentimentResponse(this);
       int from_bitField0_ = bitField0_;
@@ -535,39 +520,32 @@ public com.google.cloud.language.v1beta2.AnalyzeSentimentResponse buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1beta2.AnalyzeSentimentResponse) {
         return mergeFrom((com.google.cloud.language.v1beta2.AnalyzeSentimentResponse)other);
@@ -617,12 +595,10 @@ public Builder mergeFrom(com.google.cloud.language.v1beta2.AnalyzeSentimentRespo
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1205,13 +1181,11 @@ public com.google.cloud.language.v1beta2.Sentence.Builder addSentencesBuilder(
       }
       return sentencesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1233,12 +1207,11 @@ public static com.google.cloud.language.v1beta2.AnalyzeSentimentResponse getDefa
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnalyzeSentimentResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeSentimentResponse(input, extensionRegistry);
+        return new AnalyzeSentimentResponse(input, extensionRegistry);
     }
   };
 
@@ -1251,7 +1224,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1beta2.AnalyzeSentimentResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSyntaxRequest.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSyntaxRequest.java
index e57d44fc6293..6ee60f828dd6 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSyntaxRequest.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSyntaxRequest.java
@@ -33,9 +33,6 @@ private AnalyzeSyntaxRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private AnalyzeSyntaxRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.language.v1beta2.Document.Builder subBuilder = null;
             if (document_ != null) {
@@ -66,13 +70,6 @@ private AnalyzeSyntaxRequest(
             encodingType_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private AnalyzeSyntaxRequest(
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeSyntaxRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeSyntaxRequest_fieldAccessorTable
@@ -151,13 +147,11 @@ public int getEncodingTypeValue() {
    * .google.cloud.language.v1beta2.EncodingType encoding_type = 2;
    */
   public com.google.cloud.language.v1beta2.EncodingType getEncodingType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1beta2.EncodingType result = com.google.cloud.language.v1beta2.EncodingType.valueOf(encodingType_);
     return result == null ? com.google.cloud.language.v1beta2.EncodingType.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -167,7 +161,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (document_ != null) {
@@ -179,7 +172,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -307,7 +299,6 @@ public static com.google.cloud.language.v1beta2.AnalyzeSyntaxRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -315,7 +306,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1beta2.AnalyzeSyntaxRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -343,7 +333,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeSyntaxRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeSyntaxRequest_fieldAccessorTable
@@ -366,7 +355,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (documentBuilder_ == null) {
@@ -380,18 +368,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeSyntaxRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.AnalyzeSyntaxRequest getDefaultInstanceForType() {
       return com.google.cloud.language.v1beta2.AnalyzeSyntaxRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.AnalyzeSyntaxRequest build() {
       com.google.cloud.language.v1beta2.AnalyzeSyntaxRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -400,7 +385,6 @@ public com.google.cloud.language.v1beta2.AnalyzeSyntaxRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.AnalyzeSyntaxRequest buildPartial() {
       com.google.cloud.language.v1beta2.AnalyzeSyntaxRequest result = new com.google.cloud.language.v1beta2.AnalyzeSyntaxRequest(this);
       if (documentBuilder_ == null) {
@@ -413,39 +397,32 @@ public com.google.cloud.language.v1beta2.AnalyzeSyntaxRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1beta2.AnalyzeSyntaxRequest) {
         return mergeFrom((com.google.cloud.language.v1beta2.AnalyzeSyntaxRequest)other);
@@ -468,12 +445,10 @@ public Builder mergeFrom(com.google.cloud.language.v1beta2.AnalyzeSyntaxRequest
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -676,7 +651,6 @@ public Builder setEncodingTypeValue(int value) {
      * .google.cloud.language.v1beta2.EncodingType encoding_type = 2;
      */
     public com.google.cloud.language.v1beta2.EncodingType getEncodingType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1beta2.EncodingType result = com.google.cloud.language.v1beta2.EncodingType.valueOf(encodingType_);
       return result == null ? com.google.cloud.language.v1beta2.EncodingType.UNRECOGNIZED : result;
     }
@@ -709,13 +683,11 @@ public Builder clearEncodingType() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -737,12 +709,11 @@ public static com.google.cloud.language.v1beta2.AnalyzeSyntaxRequest getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnalyzeSyntaxRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeSyntaxRequest(input, extensionRegistry);
+        return new AnalyzeSyntaxRequest(input, extensionRegistry);
     }
   };
 
@@ -755,7 +726,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1beta2.AnalyzeSyntaxRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSyntaxResponse.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSyntaxResponse.java
index 97a5ec67541b..fc05b4accbee 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSyntaxResponse.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnalyzeSyntaxResponse.java
@@ -35,9 +35,6 @@ private AnalyzeSyntaxResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private AnalyzeSyntaxResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               sentences_ = new java.util.ArrayList();
@@ -73,13 +77,6 @@ private AnalyzeSyntaxResponse(
             language_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private AnalyzeSyntaxResponse(
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeSyntaxResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeSyntaxResponse_fieldAccessorTable
@@ -269,7 +265,6 @@ public java.lang.String getLanguage() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -279,7 +274,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < sentences_.size(); i++) {
@@ -294,7 +288,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -429,7 +422,6 @@ public static com.google.cloud.language.v1beta2.AnalyzeSyntaxResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -437,7 +429,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1beta2.AnalyzeSyntaxResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -465,7 +456,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeSyntaxResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeSyntaxResponse_fieldAccessorTable
@@ -490,7 +480,6 @@ private void maybeForceBuilderInitialization() {
         getTokensFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (sentencesBuilder_ == null) {
@@ -510,18 +499,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnalyzeSyntaxResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.AnalyzeSyntaxResponse getDefaultInstanceForType() {
       return com.google.cloud.language.v1beta2.AnalyzeSyntaxResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.AnalyzeSyntaxResponse build() {
       com.google.cloud.language.v1beta2.AnalyzeSyntaxResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -530,7 +516,6 @@ public com.google.cloud.language.v1beta2.AnalyzeSyntaxResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.AnalyzeSyntaxResponse buildPartial() {
       com.google.cloud.language.v1beta2.AnalyzeSyntaxResponse result = new com.google.cloud.language.v1beta2.AnalyzeSyntaxResponse(this);
       int from_bitField0_ = bitField0_;
@@ -559,39 +544,32 @@ public com.google.cloud.language.v1beta2.AnalyzeSyntaxResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1beta2.AnalyzeSyntaxResponse) {
         return mergeFrom((com.google.cloud.language.v1beta2.AnalyzeSyntaxResponse)other);
@@ -664,12 +642,10 @@ public Builder mergeFrom(com.google.cloud.language.v1beta2.AnalyzeSyntaxResponse
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1411,13 +1387,11 @@ public Builder setLanguageBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1439,12 +1413,11 @@ public static com.google.cloud.language.v1beta2.AnalyzeSyntaxResponse getDefault
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnalyzeSyntaxResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnalyzeSyntaxResponse(input, extensionRegistry);
+        return new AnalyzeSyntaxResponse(input, extensionRegistry);
     }
   };
 
@@ -1457,7 +1430,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1beta2.AnalyzeSyntaxResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnnotateTextRequest.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnnotateTextRequest.java
index b463c448523e..c12bbd0d8055 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnnotateTextRequest.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnnotateTextRequest.java
@@ -34,9 +34,6 @@ private AnnotateTextRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private AnnotateTextRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.language.v1beta2.Document.Builder subBuilder = null;
             if (document_ != null) {
@@ -80,13 +84,6 @@ private AnnotateTextRequest(
             encodingType_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private AnnotateTextRequest(
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnnotateTextRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnnotateTextRequest_fieldAccessorTable
@@ -196,9 +192,6 @@ private Features(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -210,6 +203,13 @@ private Features(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 8: {
 
               extractSyntax_ = input.readBool();
@@ -235,13 +235,6 @@ private Features(
               classifyText_ = input.readBool();
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -259,7 +252,6 @@ private Features(
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnnotateTextRequest_Features_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnnotateTextRequest_Features_fieldAccessorTable
@@ -333,7 +325,6 @@ public boolean getClassifyText() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -343,7 +334,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (extractSyntax_ != false) {
@@ -364,7 +354,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -517,7 +506,6 @@ public static com.google.cloud.language.v1beta2.AnnotateTextRequest.Features par
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -525,7 +513,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.language.v1beta2.AnnotateTextRequest.Features prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -554,7 +541,6 @@ public static final class Builder extends
         return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnnotateTextRequest_Features_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnnotateTextRequest_Features_fieldAccessorTable
@@ -577,7 +563,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         extractSyntax_ = false;
@@ -593,18 +578,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnnotateTextRequest_Features_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.language.v1beta2.AnnotateTextRequest.Features getDefaultInstanceForType() {
         return com.google.cloud.language.v1beta2.AnnotateTextRequest.Features.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.language.v1beta2.AnnotateTextRequest.Features build() {
         com.google.cloud.language.v1beta2.AnnotateTextRequest.Features result = buildPartial();
         if (!result.isInitialized()) {
@@ -613,7 +595,6 @@ public com.google.cloud.language.v1beta2.AnnotateTextRequest.Features build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.language.v1beta2.AnnotateTextRequest.Features buildPartial() {
         com.google.cloud.language.v1beta2.AnnotateTextRequest.Features result = new com.google.cloud.language.v1beta2.AnnotateTextRequest.Features(this);
         result.extractSyntax_ = extractSyntax_;
@@ -625,39 +606,32 @@ public com.google.cloud.language.v1beta2.AnnotateTextRequest.Features buildParti
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.language.v1beta2.AnnotateTextRequest.Features) {
           return mergeFrom((com.google.cloud.language.v1beta2.AnnotateTextRequest.Features)other);
@@ -689,12 +663,10 @@ public Builder mergeFrom(com.google.cloud.language.v1beta2.AnnotateTextRequest.F
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -902,13 +874,11 @@ public Builder clearClassifyText() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -930,12 +900,11 @@ public static com.google.cloud.language.v1beta2.AnnotateTextRequest.Features get
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Features parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Features(input, extensionRegistry);
+          return new Features(input, extensionRegistry);
       }
     };
 
@@ -948,7 +917,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.AnnotateTextRequest.Features getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1041,13 +1009,11 @@ public int getEncodingTypeValue() {
    * .google.cloud.language.v1beta2.EncodingType encoding_type = 3;
    */
   public com.google.cloud.language.v1beta2.EncodingType getEncodingType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1beta2.EncodingType result = com.google.cloud.language.v1beta2.EncodingType.valueOf(encodingType_);
     return result == null ? com.google.cloud.language.v1beta2.EncodingType.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1057,7 +1023,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (document_ != null) {
@@ -1072,7 +1037,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1213,7 +1177,6 @@ public static com.google.cloud.language.v1beta2.AnnotateTextRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1221,7 +1184,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1beta2.AnnotateTextRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1250,7 +1212,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnnotateTextRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnnotateTextRequest_fieldAccessorTable
@@ -1273,7 +1234,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (documentBuilder_ == null) {
@@ -1293,18 +1253,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnnotateTextRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.AnnotateTextRequest getDefaultInstanceForType() {
       return com.google.cloud.language.v1beta2.AnnotateTextRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.AnnotateTextRequest build() {
       com.google.cloud.language.v1beta2.AnnotateTextRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -1313,7 +1270,6 @@ public com.google.cloud.language.v1beta2.AnnotateTextRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.AnnotateTextRequest buildPartial() {
       com.google.cloud.language.v1beta2.AnnotateTextRequest result = new com.google.cloud.language.v1beta2.AnnotateTextRequest(this);
       if (documentBuilder_ == null) {
@@ -1331,39 +1287,32 @@ public com.google.cloud.language.v1beta2.AnnotateTextRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1beta2.AnnotateTextRequest) {
         return mergeFrom((com.google.cloud.language.v1beta2.AnnotateTextRequest)other);
@@ -1389,12 +1338,10 @@ public Builder mergeFrom(com.google.cloud.language.v1beta2.AnnotateTextRequest o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1750,7 +1697,6 @@ public Builder setEncodingTypeValue(int value) {
      * .google.cloud.language.v1beta2.EncodingType encoding_type = 3;
      */
     public com.google.cloud.language.v1beta2.EncodingType getEncodingType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1beta2.EncodingType result = com.google.cloud.language.v1beta2.EncodingType.valueOf(encodingType_);
       return result == null ? com.google.cloud.language.v1beta2.EncodingType.UNRECOGNIZED : result;
     }
@@ -1783,13 +1729,11 @@ public Builder clearEncodingType() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1811,12 +1755,11 @@ public static com.google.cloud.language.v1beta2.AnnotateTextRequest getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnnotateTextRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateTextRequest(input, extensionRegistry);
+        return new AnnotateTextRequest(input, extensionRegistry);
     }
   };
 
@@ -1829,7 +1772,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1beta2.AnnotateTextRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnnotateTextResponse.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnnotateTextResponse.java
index 4008c3ef94a8..61802cede6bd 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnnotateTextResponse.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/AnnotateTextResponse.java
@@ -37,9 +37,6 @@ private AnnotateTextResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private AnnotateTextResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               sentences_ = new java.util.ArrayList();
@@ -106,13 +110,6 @@ private AnnotateTextResponse(
                 input.readMessage(com.google.cloud.language.v1beta2.ClassificationCategory.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -142,7 +139,6 @@ private AnnotateTextResponse(
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnnotateTextResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnnotateTextResponse_fieldAccessorTable
@@ -479,7 +475,6 @@ public com.google.cloud.language.v1beta2.ClassificationCategoryOrBuilder getCate
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -489,7 +484,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < sentences_.size(); i++) {
@@ -513,7 +507,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -681,7 +674,6 @@ public static com.google.cloud.language.v1beta2.AnnotateTextResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -689,7 +681,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1beta2.AnnotateTextResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -717,7 +708,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnnotateTextResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnnotateTextResponse_fieldAccessorTable
@@ -744,7 +734,6 @@ private void maybeForceBuilderInitialization() {
         getCategoriesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (sentencesBuilder_ == null) {
@@ -782,18 +771,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_AnnotateTextResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.AnnotateTextResponse getDefaultInstanceForType() {
       return com.google.cloud.language.v1beta2.AnnotateTextResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.AnnotateTextResponse build() {
       com.google.cloud.language.v1beta2.AnnotateTextResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -802,7 +788,6 @@ public com.google.cloud.language.v1beta2.AnnotateTextResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.AnnotateTextResponse buildPartial() {
       com.google.cloud.language.v1beta2.AnnotateTextResponse result = new com.google.cloud.language.v1beta2.AnnotateTextResponse(this);
       int from_bitField0_ = bitField0_;
@@ -854,39 +839,32 @@ public com.google.cloud.language.v1beta2.AnnotateTextResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1beta2.AnnotateTextResponse) {
         return mergeFrom((com.google.cloud.language.v1beta2.AnnotateTextResponse)other);
@@ -1014,12 +992,10 @@ public Builder mergeFrom(com.google.cloud.language.v1beta2.AnnotateTextResponse
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2637,13 +2613,11 @@ public com.google.cloud.language.v1beta2.ClassificationCategory.Builder addCateg
       }
       return categoriesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2665,12 +2639,11 @@ public static com.google.cloud.language.v1beta2.AnnotateTextResponse getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnnotateTextResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateTextResponse(input, extensionRegistry);
+        return new AnnotateTextResponse(input, extensionRegistry);
     }
   };
 
@@ -2683,7 +2656,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1beta2.AnnotateTextResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/ClassificationCategory.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/ClassificationCategory.java
index a0e6cacf42ef..4b580a1e3dbf 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/ClassificationCategory.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/ClassificationCategory.java
@@ -34,9 +34,6 @@ private ClassificationCategory(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ClassificationCategory(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -59,13 +63,6 @@ private ClassificationCategory(
             confidence_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private ClassificationCategory(
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_ClassificationCategory_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_ClassificationCategory_fieldAccessorTable
@@ -148,7 +144,6 @@ public float getConfidence() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -158,7 +153,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -170,7 +164,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -296,7 +289,6 @@ public static com.google.cloud.language.v1beta2.ClassificationCategory parseFrom
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -304,7 +296,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1beta2.ClassificationCategory prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -332,7 +323,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_ClassificationCategory_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_ClassificationCategory_fieldAccessorTable
@@ -355,7 +345,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -365,18 +354,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_ClassificationCategory_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.ClassificationCategory getDefaultInstanceForType() {
       return com.google.cloud.language.v1beta2.ClassificationCategory.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.ClassificationCategory build() {
       com.google.cloud.language.v1beta2.ClassificationCategory result = buildPartial();
       if (!result.isInitialized()) {
@@ -385,7 +371,6 @@ public com.google.cloud.language.v1beta2.ClassificationCategory build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.ClassificationCategory buildPartial() {
       com.google.cloud.language.v1beta2.ClassificationCategory result = new com.google.cloud.language.v1beta2.ClassificationCategory(this);
       result.name_ = name_;
@@ -394,39 +379,32 @@ public com.google.cloud.language.v1beta2.ClassificationCategory buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1beta2.ClassificationCategory) {
         return mergeFrom((com.google.cloud.language.v1beta2.ClassificationCategory)other);
@@ -450,12 +428,10 @@ public Builder mergeFrom(com.google.cloud.language.v1beta2.ClassificationCategor
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -603,13 +579,11 @@ public Builder clearConfidence() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -631,12 +605,11 @@ public static com.google.cloud.language.v1beta2.ClassificationCategory getDefaul
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ClassificationCategory parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ClassificationCategory(input, extensionRegistry);
+        return new ClassificationCategory(input, extensionRegistry);
     }
   };
 
@@ -649,7 +622,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1beta2.ClassificationCategory getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/ClassifyTextRequest.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/ClassifyTextRequest.java
index dfc967f71549..6e2e1c0532b7 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/ClassifyTextRequest.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/ClassifyTextRequest.java
@@ -32,9 +32,6 @@ private ClassifyTextRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private ClassifyTextRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.language.v1beta2.Document.Builder subBuilder = null;
             if (document_ != null) {
@@ -59,13 +63,6 @@ private ClassifyTextRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private ClassifyTextRequest(
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_ClassifyTextRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_ClassifyTextRequest_fieldAccessorTable
@@ -125,7 +121,6 @@ public com.google.cloud.language.v1beta2.DocumentOrBuilder getDocumentOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -135,7 +130,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (document_ != null) {
@@ -144,7 +138,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static com.google.cloud.language.v1beta2.ClassifyTextRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1beta2.ClassifyTextRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_ClassifyTextRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_ClassifyTextRequest_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (documentBuilder_ == null) {
@@ -336,18 +325,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_ClassifyTextRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.ClassifyTextRequest getDefaultInstanceForType() {
       return com.google.cloud.language.v1beta2.ClassifyTextRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.ClassifyTextRequest build() {
       com.google.cloud.language.v1beta2.ClassifyTextRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -356,7 +342,6 @@ public com.google.cloud.language.v1beta2.ClassifyTextRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.ClassifyTextRequest buildPartial() {
       com.google.cloud.language.v1beta2.ClassifyTextRequest result = new com.google.cloud.language.v1beta2.ClassifyTextRequest(this);
       if (documentBuilder_ == null) {
@@ -368,39 +353,32 @@ public com.google.cloud.language.v1beta2.ClassifyTextRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1beta2.ClassifyTextRequest) {
         return mergeFrom((com.google.cloud.language.v1beta2.ClassifyTextRequest)other);
@@ -420,12 +398,10 @@ public Builder mergeFrom(com.google.cloud.language.v1beta2.ClassifyTextRequest o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -596,13 +572,11 @@ public com.google.cloud.language.v1beta2.DocumentOrBuilder getDocumentOrBuilder(
       }
       return documentBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -624,12 +598,11 @@ public static com.google.cloud.language.v1beta2.ClassifyTextRequest getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ClassifyTextRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ClassifyTextRequest(input, extensionRegistry);
+        return new ClassifyTextRequest(input, extensionRegistry);
     }
   };
 
@@ -642,7 +615,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1beta2.ClassifyTextRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/ClassifyTextResponse.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/ClassifyTextResponse.java
index 92b7ebf8ebaf..609b29b7c61f 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/ClassifyTextResponse.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/ClassifyTextResponse.java
@@ -33,9 +33,6 @@ private ClassifyTextResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ClassifyTextResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               categories_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private ClassifyTextResponse(
                 input.readMessage(com.google.cloud.language.v1beta2.ClassificationCategory.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private ClassifyTextResponse(
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_ClassifyTextResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_ClassifyTextResponse_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.cloud.language.v1beta2.ClassificationCategoryOrBuilder getCate
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < categories_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.language.v1beta2.ClassifyTextResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1beta2.ClassifyTextResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_ClassifyTextResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_ClassifyTextResponse_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getCategoriesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (categoriesBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_ClassifyTextResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.ClassifyTextResponse getDefaultInstanceForType() {
       return com.google.cloud.language.v1beta2.ClassifyTextResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.ClassifyTextResponse build() {
       com.google.cloud.language.v1beta2.ClassifyTextResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.cloud.language.v1beta2.ClassifyTextResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.ClassifyTextResponse buildPartial() {
       com.google.cloud.language.v1beta2.ClassifyTextResponse result = new com.google.cloud.language.v1beta2.ClassifyTextResponse(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.cloud.language.v1beta2.ClassifyTextResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1beta2.ClassifyTextResponse) {
         return mergeFrom((com.google.cloud.language.v1beta2.ClassifyTextResponse)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.cloud.language.v1beta2.ClassifyTextResponse
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.cloud.language.v1beta2.ClassificationCategory.Builder addCateg
       }
       return categoriesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.cloud.language.v1beta2.ClassifyTextResponse getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ClassifyTextResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ClassifyTextResponse(input, extensionRegistry);
+        return new ClassifyTextResponse(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1beta2.ClassifyTextResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/DependencyEdge.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/DependencyEdge.java
index cefe0b31ee6e..c7c524c7495c 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/DependencyEdge.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/DependencyEdge.java
@@ -34,9 +34,6 @@ private DependencyEdge(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private DependencyEdge(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
 
             headTokenIndex_ = input.readInt32();
@@ -59,13 +63,6 @@ private DependencyEdge(
             label_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private DependencyEdge(
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_DependencyEdge_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_DependencyEdge_fieldAccessorTable
@@ -1623,13 +1619,11 @@ public int getLabelValue() {
    * .google.cloud.language.v1beta2.DependencyEdge.Label label = 2;
    */
   public com.google.cloud.language.v1beta2.DependencyEdge.Label getLabel() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1beta2.DependencyEdge.Label result = com.google.cloud.language.v1beta2.DependencyEdge.Label.valueOf(label_);
     return result == null ? com.google.cloud.language.v1beta2.DependencyEdge.Label.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1639,7 +1633,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (headTokenIndex_ != 0) {
@@ -1651,7 +1644,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1774,7 +1766,6 @@ public static com.google.cloud.language.v1beta2.DependencyEdge parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1782,7 +1773,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1beta2.DependencyEdge prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1810,7 +1800,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_DependencyEdge_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_DependencyEdge_fieldAccessorTable
@@ -1833,7 +1822,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       headTokenIndex_ = 0;
@@ -1843,18 +1831,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_DependencyEdge_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.DependencyEdge getDefaultInstanceForType() {
       return com.google.cloud.language.v1beta2.DependencyEdge.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.DependencyEdge build() {
       com.google.cloud.language.v1beta2.DependencyEdge result = buildPartial();
       if (!result.isInitialized()) {
@@ -1863,7 +1848,6 @@ public com.google.cloud.language.v1beta2.DependencyEdge build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.DependencyEdge buildPartial() {
       com.google.cloud.language.v1beta2.DependencyEdge result = new com.google.cloud.language.v1beta2.DependencyEdge(this);
       result.headTokenIndex_ = headTokenIndex_;
@@ -1872,39 +1856,32 @@ public com.google.cloud.language.v1beta2.DependencyEdge buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1beta2.DependencyEdge) {
         return mergeFrom((com.google.cloud.language.v1beta2.DependencyEdge)other);
@@ -1927,12 +1904,10 @@ public Builder mergeFrom(com.google.cloud.language.v1beta2.DependencyEdge other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2032,7 +2007,6 @@ public Builder setLabelValue(int value) {
      * .google.cloud.language.v1beta2.DependencyEdge.Label label = 2;
      */
     public com.google.cloud.language.v1beta2.DependencyEdge.Label getLabel() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1beta2.DependencyEdge.Label result = com.google.cloud.language.v1beta2.DependencyEdge.Label.valueOf(label_);
       return result == null ? com.google.cloud.language.v1beta2.DependencyEdge.Label.UNRECOGNIZED : result;
     }
@@ -2065,13 +2039,11 @@ public Builder clearLabel() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2093,12 +2065,11 @@ public static com.google.cloud.language.v1beta2.DependencyEdge getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DependencyEdge parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DependencyEdge(input, extensionRegistry);
+        return new DependencyEdge(input, extensionRegistry);
     }
   };
 
@@ -2111,7 +2082,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1beta2.DependencyEdge getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Document.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Document.java
index ab20e2bfa428..322139a99c21 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Document.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Document.java
@@ -35,9 +35,6 @@ private Document(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private Document(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -73,13 +77,6 @@ private Document(
             language_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private Document(
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_Document_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_Document_fieldAccessorTable
@@ -300,7 +296,6 @@ public int getTypeValue() {
    * .google.cloud.language.v1beta2.Document.Type type = 1;
    */
   public com.google.cloud.language.v1beta2.Document.Type getType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1beta2.Document.Type result = com.google.cloud.language.v1beta2.Document.Type.valueOf(type_);
     return result == null ? com.google.cloud.language.v1beta2.Document.Type.UNRECOGNIZED : result;
   }
@@ -470,7 +465,6 @@ public java.lang.String getLanguage() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -480,7 +474,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (type_ != com.google.cloud.language.v1beta2.Document.Type.TYPE_UNSPECIFIED.getNumber()) {
@@ -498,7 +491,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -653,7 +645,6 @@ public static com.google.cloud.language.v1beta2.Document parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -661,7 +652,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1beta2.Document prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -690,7 +680,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_Document_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_Document_fieldAccessorTable
@@ -713,7 +702,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       type_ = 0;
@@ -725,18 +713,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_Document_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.Document getDefaultInstanceForType() {
       return com.google.cloud.language.v1beta2.Document.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.Document build() {
       com.google.cloud.language.v1beta2.Document result = buildPartial();
       if (!result.isInitialized()) {
@@ -745,7 +730,6 @@ public com.google.cloud.language.v1beta2.Document build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.Document buildPartial() {
       com.google.cloud.language.v1beta2.Document result = new com.google.cloud.language.v1beta2.Document(this);
       result.type_ = type_;
@@ -761,39 +745,32 @@ public com.google.cloud.language.v1beta2.Document buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1beta2.Document) {
         return mergeFrom((com.google.cloud.language.v1beta2.Document)other);
@@ -834,12 +811,10 @@ public Builder mergeFrom(com.google.cloud.language.v1beta2.Document other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -907,7 +882,6 @@ public Builder setTypeValue(int value) {
      * .google.cloud.language.v1beta2.Document.Type type = 1;
      */
     public com.google.cloud.language.v1beta2.Document.Type getType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1beta2.Document.Type result = com.google.cloud.language.v1beta2.Document.Type.valueOf(type_);
       return result == null ? com.google.cloud.language.v1beta2.Document.Type.UNRECOGNIZED : result;
     }
@@ -1281,13 +1255,11 @@ public Builder setLanguageBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1309,12 +1281,11 @@ public static com.google.cloud.language.v1beta2.Document getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Document parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Document(input, extensionRegistry);
+        return new Document(input, extensionRegistry);
     }
   };
 
@@ -1327,7 +1298,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1beta2.Document getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Entity.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Entity.java
index 989b24783dc2..210d1d95fe94 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Entity.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Entity.java
@@ -38,9 +38,6 @@ private Entity(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private Entity(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -104,13 +108,6 @@ private Entity(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -132,7 +129,6 @@ private Entity(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -143,7 +139,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_Entity_fieldAccessorTable
@@ -434,7 +429,6 @@ public int getTypeValue() {
    * .google.cloud.language.v1beta2.Entity.Type type = 2;
    */
   public com.google.cloud.language.v1beta2.Entity.Type getType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1beta2.Entity.Type result = com.google.cloud.language.v1beta2.Entity.Type.valueOf(type_);
     return result == null ? com.google.cloud.language.v1beta2.Entity.Type.UNRECOGNIZED : result;
   }
@@ -659,7 +653,6 @@ public com.google.cloud.language.v1beta2.SentimentOrBuilder getSentimentOrBuilde
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -669,7 +662,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -696,7 +688,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -868,7 +859,6 @@ public static com.google.cloud.language.v1beta2.Entity parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -876,7 +866,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1beta2.Entity prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -928,7 +917,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_Entity_fieldAccessorTable
@@ -952,7 +940,6 @@ private void maybeForceBuilderInitialization() {
         getMentionsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -977,18 +964,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_Entity_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.Entity getDefaultInstanceForType() {
       return com.google.cloud.language.v1beta2.Entity.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.Entity build() {
       com.google.cloud.language.v1beta2.Entity result = buildPartial();
       if (!result.isInitialized()) {
@@ -997,7 +981,6 @@ public com.google.cloud.language.v1beta2.Entity build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.Entity buildPartial() {
       com.google.cloud.language.v1beta2.Entity result = new com.google.cloud.language.v1beta2.Entity(this);
       int from_bitField0_ = bitField0_;
@@ -1026,39 +1009,32 @@ public com.google.cloud.language.v1beta2.Entity buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1beta2.Entity) {
         return mergeFrom((com.google.cloud.language.v1beta2.Entity)other);
@@ -1116,12 +1092,10 @@ public Builder mergeFrom(com.google.cloud.language.v1beta2.Entity other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1261,7 +1235,6 @@ public Builder setTypeValue(int value) {
      * .google.cloud.language.v1beta2.Entity.Type type = 2;
      */
     public com.google.cloud.language.v1beta2.Entity.Type getType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1beta2.Entity.Type result = com.google.cloud.language.v1beta2.Entity.Type.valueOf(type_);
       return result == null ? com.google.cloud.language.v1beta2.Entity.Type.UNRECOGNIZED : result;
     }
@@ -2019,13 +1992,11 @@ public com.google.cloud.language.v1beta2.SentimentOrBuilder getSentimentOrBuilde
       }
       return sentimentBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2047,12 +2018,11 @@ public static com.google.cloud.language.v1beta2.Entity getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Entity parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Entity(input, extensionRegistry);
+        return new Entity(input, extensionRegistry);
     }
   };
 
@@ -2065,7 +2035,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1beta2.Entity getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/EntityMention.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/EntityMention.java
index bd420545ee40..3b290641525d 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/EntityMention.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/EntityMention.java
@@ -34,9 +34,6 @@ private EntityMention(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private EntityMention(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.language.v1beta2.TextSpan.Builder subBuilder = null;
             if (text_ != null) {
@@ -80,13 +84,6 @@ private EntityMention(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private EntityMention(
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_EntityMention_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_EntityMention_fieldAccessorTable
@@ -300,7 +296,6 @@ public int getTypeValue() {
    * .google.cloud.language.v1beta2.EntityMention.Type type = 2;
    */
   public com.google.cloud.language.v1beta2.EntityMention.Type getType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1beta2.EntityMention.Type result = com.google.cloud.language.v1beta2.EntityMention.Type.valueOf(type_);
     return result == null ? com.google.cloud.language.v1beta2.EntityMention.Type.UNRECOGNIZED : result;
   }
@@ -348,7 +343,6 @@ public com.google.cloud.language.v1beta2.SentimentOrBuilder getSentimentOrBuilde
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -358,7 +352,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (text_ != null) {
@@ -373,7 +366,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -514,7 +506,6 @@ public static com.google.cloud.language.v1beta2.EntityMention parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -522,7 +513,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1beta2.EntityMention prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -551,7 +541,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_EntityMention_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_EntityMention_fieldAccessorTable
@@ -574,7 +563,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (textBuilder_ == null) {
@@ -594,18 +582,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_EntityMention_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.EntityMention getDefaultInstanceForType() {
       return com.google.cloud.language.v1beta2.EntityMention.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.EntityMention build() {
       com.google.cloud.language.v1beta2.EntityMention result = buildPartial();
       if (!result.isInitialized()) {
@@ -614,7 +599,6 @@ public com.google.cloud.language.v1beta2.EntityMention build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.EntityMention buildPartial() {
       com.google.cloud.language.v1beta2.EntityMention result = new com.google.cloud.language.v1beta2.EntityMention(this);
       if (textBuilder_ == null) {
@@ -632,39 +616,32 @@ public com.google.cloud.language.v1beta2.EntityMention buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1beta2.EntityMention) {
         return mergeFrom((com.google.cloud.language.v1beta2.EntityMention)other);
@@ -690,12 +667,10 @@ public Builder mergeFrom(com.google.cloud.language.v1beta2.EntityMention other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -898,7 +873,6 @@ public Builder setTypeValue(int value) {
      * .google.cloud.language.v1beta2.EntityMention.Type type = 2;
      */
     public com.google.cloud.language.v1beta2.EntityMention.Type getType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1beta2.EntityMention.Type result = com.google.cloud.language.v1beta2.EntityMention.Type.valueOf(type_);
       return result == null ? com.google.cloud.language.v1beta2.EntityMention.Type.UNRECOGNIZED : result;
     }
@@ -1111,13 +1085,11 @@ public com.google.cloud.language.v1beta2.SentimentOrBuilder getSentimentOrBuilde
       }
       return sentimentBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1139,12 +1111,11 @@ public static com.google.cloud.language.v1beta2.EntityMention getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public EntityMention parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new EntityMention(input, extensionRegistry);
+        return new EntityMention(input, extensionRegistry);
     }
   };
 
@@ -1157,7 +1128,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1beta2.EntityMention getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceProto.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceProto.java
index 1be9f2899813..e72d5aa509e7 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/LanguageServiceProto.java
@@ -152,7 +152,7 @@ public static void registerAllExtensions(
       "google.cloud.language.v1beta2.Document.T" +
       "ype\022\021\n\007content\030\002 \001(\tH\000\022\031\n\017gcs_content_ur" +
       "i\030\003 \001(\tH\000\022\020\n\010language\030\004 \001(\t\"6\n\004Type\022\024\n\020T" +
-      "YPE_UNSPECIFIED\020\000\022\016\n\nPLAIN_TEXT\020\001\022\010\n\004HTM" +
+      "YPE_UNSPECIFIED\020\000\022\016\n\nPLAIN_TEXT\020\001\022\010\n\004HTM",
       "L\020\002B\010\n\006source\"~\n\010Sentence\0225\n\004text\030\001 \001(\0132" +
       "\'.google.cloud.language.v1beta2.TextSpan" +
       "\022;\n\tsentiment\030\002 \001(\0132(.google.cloud.langu" +
@@ -162,7 +162,7 @@ public static void registerAllExtensions(
       "(\01323.google.cloud.language.v1beta2.Entit" +
       "y.MetadataEntry\022\020\n\010salience\030\004 \001(\002\022>\n\010men" +
       "tions\030\005 \003(\0132,.google.cloud.language.v1be" +
-      "ta2.EntityMention\022;\n\tsentiment\030\006 \001(\0132(.g" +
+      "ta2.EntityMention\022;\n\tsentiment\030\006 \001(\0132(.g",
       "oogle.cloud.language.v1beta2.Sentiment\032/" +
       "\n\rMetadataEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 " +
       "\001(\t:\0028\001\"y\n\004Type\022\013\n\007UNKNOWN\020\000\022\n\n\006PERSON\020\001" +
@@ -172,7 +172,7 @@ public static void registerAllExtensions(
       "gle.cloud.language.v1beta2.TextSpan\022C\n\016p" +
       "art_of_speech\030\002 \001(\0132+.google.cloud.langu" +
       "age.v1beta2.PartOfSpeech\022F\n\017dependency_e" +
-      "dge\030\003 \001(\0132-.google.cloud.language.v1beta" +
+      "dge\030\003 \001(\0132-.google.cloud.language.v1beta",
       "2.DependencyEdge\022\r\n\005lemma\030\004 \001(\t\"-\n\tSenti" +
       "ment\022\021\n\tmagnitude\030\002 \001(\002\022\r\n\005score\030\003 \001(\002\"\337" +
       "\020\n\014PartOfSpeech\022<\n\003tag\030\001 \001(\0162/.google.cl" +
@@ -182,7 +182,7 @@ public static void registerAllExtensions(
       "0.google.cloud.language.v1beta2.PartOfSp" +
       "eech.Case\022>\n\004form\030\004 \001(\01620.google.cloud.l" +
       "anguage.v1beta2.PartOfSpeech.Form\022B\n\006gen" +
-      "der\030\005 \001(\01622.google.cloud.language.v1beta" +
+      "der\030\005 \001(\01622.google.cloud.language.v1beta",
       "2.PartOfSpeech.Gender\022>\n\004mood\030\006 \001(\01620.go" +
       "ogle.cloud.language.v1beta2.PartOfSpeech" +
       ".Mood\022B\n\006number\030\007 \001(\01622.google.cloud.lan" +
@@ -192,7 +192,7 @@ public static void registerAllExtensions(
       "google.cloud.language.v1beta2.PartOfSpee" +
       "ch.Proper\022L\n\013reciprocity\030\n \001(\01627.google." +
       "cloud.language.v1beta2.PartOfSpeech.Reci" +
-      "procity\022@\n\005tense\030\013 \001(\01621.google.cloud.la" +
+      "procity\022@\n\005tense\030\013 \001(\01621.google.cloud.la",
       "nguage.v1beta2.PartOfSpeech.Tense\022@\n\005voi" +
       "ce\030\014 \001(\01621.google.cloud.language.v1beta2" +
       ".PartOfSpeech.Voice\"\215\001\n\003Tag\022\013\n\007UNKNOWN\020\000" +
@@ -202,7 +202,7 @@ public static void registerAllExtensions(
       "X\020\r\"O\n\006Aspect\022\022\n\016ASPECT_UNKNOWN\020\000\022\016\n\nPER" +
       "FECTIVE\020\001\022\020\n\014IMPERFECTIVE\020\002\022\017\n\013PROGRESSI" +
       "VE\020\003\"\370\001\n\004Case\022\020\n\014CASE_UNKNOWN\020\000\022\016\n\nACCUS" +
-      "ATIVE\020\001\022\r\n\tADVERBIAL\020\002\022\021\n\rCOMPLEMENTIVE\020" +
+      "ATIVE\020\001\022\r\n\tADVERBIAL\020\002\022\021\n\rCOMPLEMENTIVE\020",
       "\003\022\n\n\006DATIVE\020\004\022\014\n\010GENITIVE\020\005\022\020\n\014INSTRUMEN" +
       "TAL\020\006\022\014\n\010LOCATIVE\020\007\022\016\n\nNOMINATIVE\020\010\022\013\n\007O" +
       "BLIQUE\020\t\022\r\n\tPARTITIVE\020\n\022\021\n\rPREPOSITIONAL" +
@@ -212,7 +212,7 @@ public static void registerAllExtensions(
       "EMENTIZER\020\003\022\020\n\014FINAL_ENDING\020\004\022\n\n\006GERUND\020" +
       "\005\022\n\n\006REALIS\020\006\022\014\n\010IRREALIS\020\007\022\t\n\005SHORT\020\010\022\010" +
       "\n\004LONG\020\t\022\t\n\005ORDER\020\n\022\014\n\010SPECIFIC\020\013\"E\n\006Gen" +
-      "der\022\022\n\016GENDER_UNKNOWN\020\000\022\014\n\010FEMININE\020\001\022\r\n" +
+      "der\022\022\n\016GENDER_UNKNOWN\020\000\022\014\n\010FEMININE\020\001\022\r\n",
       "\tMASCULINE\020\002\022\n\n\006NEUTER\020\003\"\177\n\004Mood\022\020\n\014MOOD" +
       "_UNKNOWN\020\000\022\024\n\020CONDITIONAL_MOOD\020\001\022\016\n\nIMPE" +
       "RATIVE\020\002\022\016\n\nINDICATIVE\020\003\022\021\n\rINTERROGATIV" +
@@ -222,7 +222,7 @@ public static void registerAllExtensions(
       "UNKNOWN\020\000\022\t\n\005FIRST\020\001\022\n\n\006SECOND\020\002\022\t\n\005THIR" +
       "D\020\003\022\024\n\020REFLEXIVE_PERSON\020\004\"8\n\006Proper\022\022\n\016P" +
       "ROPER_UNKNOWN\020\000\022\n\n\006PROPER\020\001\022\016\n\nNOT_PROPE" +
-      "R\020\002\"J\n\013Reciprocity\022\027\n\023RECIPROCITY_UNKNOW" +
+      "R\020\002\"J\n\013Reciprocity\022\027\n\023RECIPROCITY_UNKNOW",
       "N\020\000\022\016\n\nRECIPROCAL\020\001\022\022\n\016NON_RECIPROCAL\020\002\"" +
       "s\n\005Tense\022\021\n\rTENSE_UNKNOWN\020\000\022\025\n\021CONDITION" +
       "AL_TENSE\020\001\022\n\n\006FUTURE\020\002\022\010\n\004PAST\020\003\022\013\n\007PRES" +
@@ -232,7 +232,7 @@ public static void registerAllExtensions(
       "dge\022\030\n\020head_token_index\030\001 \001(\005\022B\n\005label\030\002" +
       " \001(\01623.google.cloud.language.v1beta2.Dep" +
       "endencyEdge.Label\"\251\007\n\005Label\022\013\n\007UNKNOWN\020\000" +
-      "\022\n\n\006ABBREV\020\001\022\t\n\005ACOMP\020\002\022\t\n\005ADVCL\020\003\022\n\n\006AD" +
+      "\022\n\n\006ABBREV\020\001\022\t\n\005ACOMP\020\002\022\t\n\005ADVCL\020\003\022\n\n\006AD",
       "VMOD\020\004\022\010\n\004AMOD\020\005\022\t\n\005APPOS\020\006\022\010\n\004ATTR\020\007\022\007\n" +
       "\003AUX\020\010\022\013\n\007AUXPASS\020\t\022\006\n\002CC\020\n\022\t\n\005CCOMP\020\013\022\010" +
       "\n\004CONJ\020\014\022\t\n\005CSUBJ\020\r\022\r\n\tCSUBJPASS\020\016\022\007\n\003DE" +
@@ -242,7 +242,7 @@ public static void registerAllExtensions(
       "NPADVMOD\020\033\022\t\n\005NSUBJ\020\034\022\r\n\tNSUBJPASS\020\035\022\007\n\003" +
       "NUM\020\036\022\n\n\006NUMBER\020\037\022\005\n\001P\020 \022\r\n\tPARATAXIS\020!\022" +
       "\013\n\007PARTMOD\020\"\022\t\n\005PCOMP\020#\022\010\n\004POBJ\020$\022\010\n\004POS" +
-      "S\020%\022\013\n\007POSTNEG\020&\022\013\n\007PRECOMP\020\'\022\013\n\007PRECONJ" +
+      "S\020%\022\013\n\007POSTNEG\020&\022\013\n\007PRECOMP\020\'\022\013\n\007PRECONJ",
       "\020(\022\n\n\006PREDET\020)\022\010\n\004PREF\020*\022\010\n\004PREP\020+\022\t\n\005PR" +
       "ONL\020,\022\007\n\003PRT\020-\022\006\n\002PS\020.\022\014\n\010QUANTMOD\020/\022\t\n\005" +
       "RCMOD\0200\022\014\n\010RCMODREL\0201\022\t\n\005RDROP\0202\022\007\n\003REF\020" +
@@ -252,7 +252,7 @@ public static void registerAllExtensions(
       "SUFFIX\020>\022\t\n\005TITLE\020?\022\014\n\010ADVPHMOD\020@\022\013\n\007AUX" +
       "CAUS\020A\022\t\n\005AUXVV\020B\022\t\n\005DTMOD\020C\022\013\n\007FOREIGN\020" +
       "D\022\006\n\002KW\020E\022\010\n\004LIST\020F\022\010\n\004NOMC\020G\022\014\n\010NOMCSUB" +
-      "J\020H\022\020\n\014NOMCSUBJPASS\020I\022\010\n\004NUMC\020J\022\007\n\003COP\020K" +
+      "J\020H\022\020\n\014NOMCSUBJPASS\020I\022\010\n\004NUMC\020J\022\007\n\003COP\020K",
       "\022\016\n\nDISLOCATED\020L\022\007\n\003ASP\020M\022\010\n\004GMOD\020N\022\010\n\004G" +
       "OBJ\020O\022\n\n\006INFMOD\020P\022\007\n\003MES\020Q\022\t\n\005NCOMP\020R\"\366\001" +
       "\n\rEntityMention\0225\n\004text\030\001 \001(\0132\'.google.c" +
@@ -262,7 +262,7 @@ public static void registerAllExtensions(
       "gle.cloud.language.v1beta2.Sentiment\"0\n\004" +
       "Type\022\020\n\014TYPE_UNKNOWN\020\000\022\n\n\006PROPER\020\001\022\n\n\006CO" +
       "MMON\020\002\"1\n\010TextSpan\022\017\n\007content\030\001 \001(\t\022\024\n\014b" +
-      "egin_offset\030\002 \001(\005\":\n\026ClassificationCateg" +
+      "egin_offset\030\002 \001(\005\":\n\026ClassificationCateg",
       "ory\022\014\n\004name\030\001 \001(\t\022\022\n\nconfidence\030\002 \001(\002\"\230\001" +
       "\n\027AnalyzeSentimentRequest\0229\n\010document\030\001 " +
       "\001(\0132\'.google.cloud.language.v1beta2.Docu" +
@@ -272,7 +272,7 @@ public static void registerAllExtensions(
       "ent\030\001 \001(\0132(.google.cloud.language.v1beta" +
       "2.Sentiment\022\020\n\010language\030\002 \001(\t\022:\n\tsentenc" +
       "es\030\003 \003(\0132\'.google.cloud.language.v1beta2" +
-      ".Sentence\"\236\001\n\035AnalyzeEntitySentimentRequ" +
+      ".Sentence\"\236\001\n\035AnalyzeEntitySentimentRequ",
       "est\0229\n\010document\030\001 \001(\0132\'.google.cloud.lan" +
       "guage.v1beta2.Document\022B\n\rencoding_type\030" +
       "\002 \001(\0162+.google.cloud.language.v1beta2.En" +
@@ -282,7 +282,7 @@ public static void registerAllExtensions(
       "\227\001\n\026AnalyzeEntitiesRequest\0229\n\010document\030\001" +
       " \001(\0132\'.google.cloud.language.v1beta2.Doc" +
       "ument\022B\n\rencoding_type\030\002 \001(\0162+.google.cl" +
-      "oud.language.v1beta2.EncodingType\"d\n\027Ana" +
+      "oud.language.v1beta2.EncodingType\"d\n\027Ana",
       "lyzeEntitiesResponse\0227\n\010entities\030\001 \003(\0132%" +
       ".google.cloud.language.v1beta2.Entity\022\020\n" +
       "\010language\030\002 \001(\t\"\225\001\n\024AnalyzeSyntaxRequest" +
@@ -292,7 +292,7 @@ public static void registerAllExtensions(
       "ingType\"\233\001\n\025AnalyzeSyntaxResponse\022:\n\tsen" +
       "tences\030\001 \003(\0132\'.google.cloud.language.v1b" +
       "eta2.Sentence\0224\n\006tokens\030\002 \003(\0132$.google.c" +
-      "loud.language.v1beta2.Token\022\020\n\010language\030" +
+      "loud.language.v1beta2.Token\022\020\n\010language\030",
       "\003 \001(\t\"P\n\023ClassifyTextRequest\0229\n\010document" +
       "\030\001 \001(\0132\'.google.cloud.language.v1beta2.D" +
       "ocument\"a\n\024ClassifyTextResponse\022I\n\ncateg" +
@@ -302,7 +302,7 @@ public static void registerAllExtensions(
       "oud.language.v1beta2.Document\022M\n\010feature" +
       "s\030\002 \001(\0132;.google.cloud.language.v1beta2." +
       "AnnotateTextRequest.Features\022B\n\rencoding" +
-      "_type\030\003 \001(\0162+.google.cloud.language.v1be" +
+      "_type\030\003 \001(\0162+.google.cloud.language.v1be",
       "ta2.EncodingType\032\231\001\n\010Features\022\026\n\016extract" +
       "_syntax\030\001 \001(\010\022\030\n\020extract_entities\030\002 \001(\010\022" +
       "\"\n\032extract_document_sentiment\030\003 \001(\010\022 \n\030e" +
@@ -312,7 +312,7 @@ public static void registerAllExtensions(
       ".v1beta2.Sentence\0224\n\006tokens\030\002 \003(\0132$.goog" +
       "le.cloud.language.v1beta2.Token\0227\n\010entit" +
       "ies\030\003 \003(\0132%.google.cloud.language.v1beta" +
-      "2.Entity\022D\n\022document_sentiment\030\004 \001(\0132(.g" +
+      "2.Entity\022D\n\022document_sentiment\030\004 \001(\0132(.g",
       "oogle.cloud.language.v1beta2.Sentiment\022\020" +
       "\n\010language\030\005 \001(\t\022I\n\ncategories\030\006 \003(\01325.g" +
       "oogle.cloud.language.v1beta2.Classificat" +
@@ -322,7 +322,7 @@ public static void registerAllExtensions(
       "cloud.language.v1beta2.AnalyzeSentimentR" +
       "equest\0327.google.cloud.language.v1beta2.A" +
       "nalyzeSentimentResponse\".\202\323\344\223\002(\"#/v1beta" +
-      "2/documents:analyzeSentiment:\001*\022\257\001\n\017Anal" +
+      "2/documents:analyzeSentiment:\001*\022\257\001\n\017Anal",
       "yzeEntities\0225.google.cloud.language.v1be" +
       "ta2.AnalyzeEntitiesRequest\0326.google.clou" +
       "d.language.v1beta2.AnalyzeEntitiesRespon" +
@@ -332,7 +332,7 @@ public static void registerAllExtensions(
       "tySentimentRequest\032=.google.cloud.langua" +
       "ge.v1beta2.AnalyzeEntitySentimentRespons" +
       "e\"4\202\323\344\223\002.\")/v1beta2/documents:analyzeEnt" +
-      "itySentiment:\001*\022\247\001\n\rAnalyzeSyntax\0223.goog" +
+      "itySentiment:\001*\022\247\001\n\rAnalyzeSyntax\0223.goog",
       "le.cloud.language.v1beta2.AnalyzeSyntaxR" +
       "equest\0324.google.cloud.language.v1beta2.A" +
       "nalyzeSyntaxResponse\"+\202\323\344\223\002%\" /v1beta2/d" +
@@ -342,7 +342,7 @@ public static void registerAllExtensions(
       "1beta2.ClassifyTextResponse\"*\202\323\344\223\002$\"\037/v1" +
       "beta2/documents:classifyText:\001*\022\243\001\n\014Anno" +
       "tateText\0222.google.cloud.language.v1beta2" +
-      ".AnnotateTextRequest\0323.google.cloud.lang" +
+      ".AnnotateTextRequest\0323.google.cloud.lang",
       "uage.v1beta2.AnnotateTextResponse\"*\202\323\344\223\002" +
       "$\"\037/v1beta2/documents:annotateText:\001*B\202\001" +
       "\n!com.google.cloud.language.v1beta2B\024Lan" +
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/PartOfSpeech.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/PartOfSpeech.java
index e3fe0876b461..c176ac4840bd 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/PartOfSpeech.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/PartOfSpeech.java
@@ -44,9 +44,6 @@ private PartOfSpeech(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -58,6 +55,13 @@ private PartOfSpeech(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -130,13 +134,6 @@ private PartOfSpeech(
             voice_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -154,7 +151,6 @@ private PartOfSpeech(
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_PartOfSpeech_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_PartOfSpeech_fieldAccessorTable
@@ -2592,7 +2588,6 @@ public int getTagValue() {
    * .google.cloud.language.v1beta2.PartOfSpeech.Tag tag = 1;
    */
   public com.google.cloud.language.v1beta2.PartOfSpeech.Tag getTag() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1beta2.PartOfSpeech.Tag result = com.google.cloud.language.v1beta2.PartOfSpeech.Tag.valueOf(tag_);
     return result == null ? com.google.cloud.language.v1beta2.PartOfSpeech.Tag.UNRECOGNIZED : result;
   }
@@ -2617,7 +2612,6 @@ public int getAspectValue() {
    * .google.cloud.language.v1beta2.PartOfSpeech.Aspect aspect = 2;
    */
   public com.google.cloud.language.v1beta2.PartOfSpeech.Aspect getAspect() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1beta2.PartOfSpeech.Aspect result = com.google.cloud.language.v1beta2.PartOfSpeech.Aspect.valueOf(aspect_);
     return result == null ? com.google.cloud.language.v1beta2.PartOfSpeech.Aspect.UNRECOGNIZED : result;
   }
@@ -2642,7 +2636,6 @@ public int getCaseValue() {
    * .google.cloud.language.v1beta2.PartOfSpeech.Case case = 3;
    */
   public com.google.cloud.language.v1beta2.PartOfSpeech.Case getCase() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1beta2.PartOfSpeech.Case result = com.google.cloud.language.v1beta2.PartOfSpeech.Case.valueOf(case_);
     return result == null ? com.google.cloud.language.v1beta2.PartOfSpeech.Case.UNRECOGNIZED : result;
   }
@@ -2667,7 +2660,6 @@ public int getFormValue() {
    * .google.cloud.language.v1beta2.PartOfSpeech.Form form = 4;
    */
   public com.google.cloud.language.v1beta2.PartOfSpeech.Form getForm() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1beta2.PartOfSpeech.Form result = com.google.cloud.language.v1beta2.PartOfSpeech.Form.valueOf(form_);
     return result == null ? com.google.cloud.language.v1beta2.PartOfSpeech.Form.UNRECOGNIZED : result;
   }
@@ -2692,7 +2684,6 @@ public int getGenderValue() {
    * .google.cloud.language.v1beta2.PartOfSpeech.Gender gender = 5;
    */
   public com.google.cloud.language.v1beta2.PartOfSpeech.Gender getGender() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1beta2.PartOfSpeech.Gender result = com.google.cloud.language.v1beta2.PartOfSpeech.Gender.valueOf(gender_);
     return result == null ? com.google.cloud.language.v1beta2.PartOfSpeech.Gender.UNRECOGNIZED : result;
   }
@@ -2717,7 +2708,6 @@ public int getMoodValue() {
    * .google.cloud.language.v1beta2.PartOfSpeech.Mood mood = 6;
    */
   public com.google.cloud.language.v1beta2.PartOfSpeech.Mood getMood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1beta2.PartOfSpeech.Mood result = com.google.cloud.language.v1beta2.PartOfSpeech.Mood.valueOf(mood_);
     return result == null ? com.google.cloud.language.v1beta2.PartOfSpeech.Mood.UNRECOGNIZED : result;
   }
@@ -2742,7 +2732,6 @@ public int getNumberValue() {
    * .google.cloud.language.v1beta2.PartOfSpeech.Number number = 7;
    */
   public com.google.cloud.language.v1beta2.PartOfSpeech.Number getNumber() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1beta2.PartOfSpeech.Number result = com.google.cloud.language.v1beta2.PartOfSpeech.Number.valueOf(number_);
     return result == null ? com.google.cloud.language.v1beta2.PartOfSpeech.Number.UNRECOGNIZED : result;
   }
@@ -2767,7 +2756,6 @@ public int getPersonValue() {
    * .google.cloud.language.v1beta2.PartOfSpeech.Person person = 8;
    */
   public com.google.cloud.language.v1beta2.PartOfSpeech.Person getPerson() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1beta2.PartOfSpeech.Person result = com.google.cloud.language.v1beta2.PartOfSpeech.Person.valueOf(person_);
     return result == null ? com.google.cloud.language.v1beta2.PartOfSpeech.Person.UNRECOGNIZED : result;
   }
@@ -2792,7 +2780,6 @@ public int getProperValue() {
    * .google.cloud.language.v1beta2.PartOfSpeech.Proper proper = 9;
    */
   public com.google.cloud.language.v1beta2.PartOfSpeech.Proper getProper() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1beta2.PartOfSpeech.Proper result = com.google.cloud.language.v1beta2.PartOfSpeech.Proper.valueOf(proper_);
     return result == null ? com.google.cloud.language.v1beta2.PartOfSpeech.Proper.UNRECOGNIZED : result;
   }
@@ -2817,7 +2804,6 @@ public int getReciprocityValue() {
    * .google.cloud.language.v1beta2.PartOfSpeech.Reciprocity reciprocity = 10;
    */
   public com.google.cloud.language.v1beta2.PartOfSpeech.Reciprocity getReciprocity() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1beta2.PartOfSpeech.Reciprocity result = com.google.cloud.language.v1beta2.PartOfSpeech.Reciprocity.valueOf(reciprocity_);
     return result == null ? com.google.cloud.language.v1beta2.PartOfSpeech.Reciprocity.UNRECOGNIZED : result;
   }
@@ -2842,7 +2828,6 @@ public int getTenseValue() {
    * .google.cloud.language.v1beta2.PartOfSpeech.Tense tense = 11;
    */
   public com.google.cloud.language.v1beta2.PartOfSpeech.Tense getTense() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1beta2.PartOfSpeech.Tense result = com.google.cloud.language.v1beta2.PartOfSpeech.Tense.valueOf(tense_);
     return result == null ? com.google.cloud.language.v1beta2.PartOfSpeech.Tense.UNRECOGNIZED : result;
   }
@@ -2867,13 +2852,11 @@ public int getVoiceValue() {
    * .google.cloud.language.v1beta2.PartOfSpeech.Voice voice = 12;
    */
   public com.google.cloud.language.v1beta2.PartOfSpeech.Voice getVoice() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.language.v1beta2.PartOfSpeech.Voice result = com.google.cloud.language.v1beta2.PartOfSpeech.Voice.valueOf(voice_);
     return result == null ? com.google.cloud.language.v1beta2.PartOfSpeech.Voice.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -2883,7 +2866,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (tag_ != com.google.cloud.language.v1beta2.PartOfSpeech.Tag.UNKNOWN.getNumber()) {
@@ -2925,7 +2907,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -3117,7 +3098,6 @@ public static com.google.cloud.language.v1beta2.PartOfSpeech parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -3125,7 +3105,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1beta2.PartOfSpeech prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -3153,7 +3132,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_PartOfSpeech_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_PartOfSpeech_fieldAccessorTable
@@ -3176,7 +3154,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       tag_ = 0;
@@ -3206,18 +3183,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_PartOfSpeech_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.PartOfSpeech getDefaultInstanceForType() {
       return com.google.cloud.language.v1beta2.PartOfSpeech.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.PartOfSpeech build() {
       com.google.cloud.language.v1beta2.PartOfSpeech result = buildPartial();
       if (!result.isInitialized()) {
@@ -3226,7 +3200,6 @@ public com.google.cloud.language.v1beta2.PartOfSpeech build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.PartOfSpeech buildPartial() {
       com.google.cloud.language.v1beta2.PartOfSpeech result = new com.google.cloud.language.v1beta2.PartOfSpeech(this);
       result.tag_ = tag_;
@@ -3245,39 +3218,32 @@ public com.google.cloud.language.v1beta2.PartOfSpeech buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1beta2.PartOfSpeech) {
         return mergeFrom((com.google.cloud.language.v1beta2.PartOfSpeech)other);
@@ -3330,12 +3296,10 @@ public Builder mergeFrom(com.google.cloud.language.v1beta2.PartOfSpeech other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3385,7 +3349,6 @@ public Builder setTagValue(int value) {
      * .google.cloud.language.v1beta2.PartOfSpeech.Tag tag = 1;
      */
     public com.google.cloud.language.v1beta2.PartOfSpeech.Tag getTag() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1beta2.PartOfSpeech.Tag result = com.google.cloud.language.v1beta2.PartOfSpeech.Tag.valueOf(tag_);
       return result == null ? com.google.cloud.language.v1beta2.PartOfSpeech.Tag.UNRECOGNIZED : result;
     }
@@ -3450,7 +3413,6 @@ public Builder setAspectValue(int value) {
      * .google.cloud.language.v1beta2.PartOfSpeech.Aspect aspect = 2;
      */
     public com.google.cloud.language.v1beta2.PartOfSpeech.Aspect getAspect() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1beta2.PartOfSpeech.Aspect result = com.google.cloud.language.v1beta2.PartOfSpeech.Aspect.valueOf(aspect_);
       return result == null ? com.google.cloud.language.v1beta2.PartOfSpeech.Aspect.UNRECOGNIZED : result;
     }
@@ -3515,7 +3477,6 @@ public Builder setCaseValue(int value) {
      * .google.cloud.language.v1beta2.PartOfSpeech.Case case = 3;
      */
     public com.google.cloud.language.v1beta2.PartOfSpeech.Case getCase() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1beta2.PartOfSpeech.Case result = com.google.cloud.language.v1beta2.PartOfSpeech.Case.valueOf(case_);
       return result == null ? com.google.cloud.language.v1beta2.PartOfSpeech.Case.UNRECOGNIZED : result;
     }
@@ -3580,7 +3541,6 @@ public Builder setFormValue(int value) {
      * .google.cloud.language.v1beta2.PartOfSpeech.Form form = 4;
      */
     public com.google.cloud.language.v1beta2.PartOfSpeech.Form getForm() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1beta2.PartOfSpeech.Form result = com.google.cloud.language.v1beta2.PartOfSpeech.Form.valueOf(form_);
       return result == null ? com.google.cloud.language.v1beta2.PartOfSpeech.Form.UNRECOGNIZED : result;
     }
@@ -3645,7 +3605,6 @@ public Builder setGenderValue(int value) {
      * .google.cloud.language.v1beta2.PartOfSpeech.Gender gender = 5;
      */
     public com.google.cloud.language.v1beta2.PartOfSpeech.Gender getGender() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1beta2.PartOfSpeech.Gender result = com.google.cloud.language.v1beta2.PartOfSpeech.Gender.valueOf(gender_);
       return result == null ? com.google.cloud.language.v1beta2.PartOfSpeech.Gender.UNRECOGNIZED : result;
     }
@@ -3710,7 +3669,6 @@ public Builder setMoodValue(int value) {
      * .google.cloud.language.v1beta2.PartOfSpeech.Mood mood = 6;
      */
     public com.google.cloud.language.v1beta2.PartOfSpeech.Mood getMood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1beta2.PartOfSpeech.Mood result = com.google.cloud.language.v1beta2.PartOfSpeech.Mood.valueOf(mood_);
       return result == null ? com.google.cloud.language.v1beta2.PartOfSpeech.Mood.UNRECOGNIZED : result;
     }
@@ -3775,7 +3733,6 @@ public Builder setNumberValue(int value) {
      * .google.cloud.language.v1beta2.PartOfSpeech.Number number = 7;
      */
     public com.google.cloud.language.v1beta2.PartOfSpeech.Number getNumber() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1beta2.PartOfSpeech.Number result = com.google.cloud.language.v1beta2.PartOfSpeech.Number.valueOf(number_);
       return result == null ? com.google.cloud.language.v1beta2.PartOfSpeech.Number.UNRECOGNIZED : result;
     }
@@ -3840,7 +3797,6 @@ public Builder setPersonValue(int value) {
      * .google.cloud.language.v1beta2.PartOfSpeech.Person person = 8;
      */
     public com.google.cloud.language.v1beta2.PartOfSpeech.Person getPerson() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1beta2.PartOfSpeech.Person result = com.google.cloud.language.v1beta2.PartOfSpeech.Person.valueOf(person_);
       return result == null ? com.google.cloud.language.v1beta2.PartOfSpeech.Person.UNRECOGNIZED : result;
     }
@@ -3905,7 +3861,6 @@ public Builder setProperValue(int value) {
      * .google.cloud.language.v1beta2.PartOfSpeech.Proper proper = 9;
      */
     public com.google.cloud.language.v1beta2.PartOfSpeech.Proper getProper() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1beta2.PartOfSpeech.Proper result = com.google.cloud.language.v1beta2.PartOfSpeech.Proper.valueOf(proper_);
       return result == null ? com.google.cloud.language.v1beta2.PartOfSpeech.Proper.UNRECOGNIZED : result;
     }
@@ -3970,7 +3925,6 @@ public Builder setReciprocityValue(int value) {
      * .google.cloud.language.v1beta2.PartOfSpeech.Reciprocity reciprocity = 10;
      */
     public com.google.cloud.language.v1beta2.PartOfSpeech.Reciprocity getReciprocity() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1beta2.PartOfSpeech.Reciprocity result = com.google.cloud.language.v1beta2.PartOfSpeech.Reciprocity.valueOf(reciprocity_);
       return result == null ? com.google.cloud.language.v1beta2.PartOfSpeech.Reciprocity.UNRECOGNIZED : result;
     }
@@ -4035,7 +3989,6 @@ public Builder setTenseValue(int value) {
      * .google.cloud.language.v1beta2.PartOfSpeech.Tense tense = 11;
      */
     public com.google.cloud.language.v1beta2.PartOfSpeech.Tense getTense() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1beta2.PartOfSpeech.Tense result = com.google.cloud.language.v1beta2.PartOfSpeech.Tense.valueOf(tense_);
       return result == null ? com.google.cloud.language.v1beta2.PartOfSpeech.Tense.UNRECOGNIZED : result;
     }
@@ -4100,7 +4053,6 @@ public Builder setVoiceValue(int value) {
      * .google.cloud.language.v1beta2.PartOfSpeech.Voice voice = 12;
      */
     public com.google.cloud.language.v1beta2.PartOfSpeech.Voice getVoice() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.language.v1beta2.PartOfSpeech.Voice result = com.google.cloud.language.v1beta2.PartOfSpeech.Voice.valueOf(voice_);
       return result == null ? com.google.cloud.language.v1beta2.PartOfSpeech.Voice.UNRECOGNIZED : result;
     }
@@ -4133,13 +4085,11 @@ public Builder clearVoice() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -4161,12 +4111,11 @@ public static com.google.cloud.language.v1beta2.PartOfSpeech getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PartOfSpeech parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PartOfSpeech(input, extensionRegistry);
+        return new PartOfSpeech(input, extensionRegistry);
     }
   };
 
@@ -4179,7 +4128,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1beta2.PartOfSpeech getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Sentence.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Sentence.java
index 7b9c89fa49ca..12abe84076bf 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Sentence.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Sentence.java
@@ -32,9 +32,6 @@ private Sentence(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private Sentence(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.language.v1beta2.TextSpan.Builder subBuilder = null;
             if (text_ != null) {
@@ -72,13 +76,6 @@ private Sentence(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private Sentence(
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_Sentence_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_Sentence_fieldAccessorTable
@@ -177,7 +173,6 @@ public com.google.cloud.language.v1beta2.SentimentOrBuilder getSentimentOrBuilde
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -187,7 +182,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (text_ != null) {
@@ -199,7 +193,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -333,7 +326,6 @@ public static com.google.cloud.language.v1beta2.Sentence parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -341,7 +333,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1beta2.Sentence prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -369,7 +360,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_Sentence_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_Sentence_fieldAccessorTable
@@ -392,7 +382,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (textBuilder_ == null) {
@@ -410,18 +399,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_Sentence_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.Sentence getDefaultInstanceForType() {
       return com.google.cloud.language.v1beta2.Sentence.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.Sentence build() {
       com.google.cloud.language.v1beta2.Sentence result = buildPartial();
       if (!result.isInitialized()) {
@@ -430,7 +416,6 @@ public com.google.cloud.language.v1beta2.Sentence build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.Sentence buildPartial() {
       com.google.cloud.language.v1beta2.Sentence result = new com.google.cloud.language.v1beta2.Sentence(this);
       if (textBuilder_ == null) {
@@ -447,39 +432,32 @@ public com.google.cloud.language.v1beta2.Sentence buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1beta2.Sentence) {
         return mergeFrom((com.google.cloud.language.v1beta2.Sentence)other);
@@ -502,12 +480,10 @@ public Builder mergeFrom(com.google.cloud.language.v1beta2.Sentence other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -849,13 +825,11 @@ public com.google.cloud.language.v1beta2.SentimentOrBuilder getSentimentOrBuilde
       }
       return sentimentBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -877,12 +851,11 @@ public static com.google.cloud.language.v1beta2.Sentence getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Sentence parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Sentence(input, extensionRegistry);
+        return new Sentence(input, extensionRegistry);
     }
   };
 
@@ -895,7 +868,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1beta2.Sentence getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Sentiment.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Sentiment.java
index 561f7fa71736..9d48453e5e12 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Sentiment.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Sentiment.java
@@ -35,9 +35,6 @@ private Sentiment(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private Sentiment(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 21: {
 
             magnitude_ = input.readFloat();
@@ -59,13 +63,6 @@ private Sentiment(
             score_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private Sentiment(
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_Sentiment_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_Sentiment_fieldAccessorTable
@@ -121,7 +117,6 @@ public float getScore() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -131,7 +126,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (magnitude_ != 0F) {
@@ -143,7 +137,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -273,7 +266,6 @@ public static com.google.cloud.language.v1beta2.Sentiment parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -281,7 +273,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1beta2.Sentiment prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -310,7 +301,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_Sentiment_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_Sentiment_fieldAccessorTable
@@ -333,7 +323,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       magnitude_ = 0F;
@@ -343,18 +332,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_Sentiment_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.Sentiment getDefaultInstanceForType() {
       return com.google.cloud.language.v1beta2.Sentiment.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.Sentiment build() {
       com.google.cloud.language.v1beta2.Sentiment result = buildPartial();
       if (!result.isInitialized()) {
@@ -363,7 +349,6 @@ public com.google.cloud.language.v1beta2.Sentiment build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.Sentiment buildPartial() {
       com.google.cloud.language.v1beta2.Sentiment result = new com.google.cloud.language.v1beta2.Sentiment(this);
       result.magnitude_ = magnitude_;
@@ -372,39 +357,32 @@ public com.google.cloud.language.v1beta2.Sentiment buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1beta2.Sentiment) {
         return mergeFrom((com.google.cloud.language.v1beta2.Sentiment)other);
@@ -427,12 +405,10 @@ public Builder mergeFrom(com.google.cloud.language.v1beta2.Sentiment other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -535,13 +511,11 @@ public Builder clearScore() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -563,12 +537,11 @@ public static com.google.cloud.language.v1beta2.Sentiment getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Sentiment parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Sentiment(input, extensionRegistry);
+        return new Sentiment(input, extensionRegistry);
     }
   };
 
@@ -581,7 +554,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1beta2.Sentiment getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/TextSpan.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/TextSpan.java
index b79f633c30da..fbea42e389e5 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/TextSpan.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/TextSpan.java
@@ -34,9 +34,6 @@ private TextSpan(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private TextSpan(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -59,13 +63,6 @@ private TextSpan(
             beginOffset_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private TextSpan(
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_TextSpan_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_TextSpan_fieldAccessorTable
@@ -148,7 +144,6 @@ public int getBeginOffset() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -158,7 +153,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getContentBytes().isEmpty()) {
@@ -170,7 +164,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -293,7 +286,6 @@ public static com.google.cloud.language.v1beta2.TextSpan parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -301,7 +293,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1beta2.TextSpan prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -329,7 +320,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_TextSpan_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_TextSpan_fieldAccessorTable
@@ -352,7 +342,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       content_ = "";
@@ -362,18 +351,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_TextSpan_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.TextSpan getDefaultInstanceForType() {
       return com.google.cloud.language.v1beta2.TextSpan.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.TextSpan build() {
       com.google.cloud.language.v1beta2.TextSpan result = buildPartial();
       if (!result.isInitialized()) {
@@ -382,7 +368,6 @@ public com.google.cloud.language.v1beta2.TextSpan build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.TextSpan buildPartial() {
       com.google.cloud.language.v1beta2.TextSpan result = new com.google.cloud.language.v1beta2.TextSpan(this);
       result.content_ = content_;
@@ -391,39 +376,32 @@ public com.google.cloud.language.v1beta2.TextSpan buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1beta2.TextSpan) {
         return mergeFrom((com.google.cloud.language.v1beta2.TextSpan)other);
@@ -447,12 +425,10 @@ public Builder mergeFrom(com.google.cloud.language.v1beta2.TextSpan other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -600,13 +576,11 @@ public Builder clearBeginOffset() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -628,12 +602,11 @@ public static com.google.cloud.language.v1beta2.TextSpan getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TextSpan parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TextSpan(input, extensionRegistry);
+        return new TextSpan(input, extensionRegistry);
     }
   };
 
@@ -646,7 +619,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1beta2.TextSpan getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Token.java b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Token.java
index 43b1e223d5d6..95e3b8daf8b3 100644
--- a/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Token.java
+++ b/google-api-grpc/proto-google-cloud-language-v1beta2/src/main/java/com/google/cloud/language/v1beta2/Token.java
@@ -33,9 +33,6 @@ private Token(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private Token(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.language.v1beta2.TextSpan.Builder subBuilder = null;
             if (text_ != null) {
@@ -92,13 +96,6 @@ private Token(
             lemma_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -116,7 +113,6 @@ private Token(
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_Token_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_Token_fieldAccessorTable
@@ -266,7 +262,6 @@ public java.lang.String getLemma() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -276,7 +271,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (text_ != null) {
@@ -294,7 +288,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -448,7 +441,6 @@ public static com.google.cloud.language.v1beta2.Token parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -456,7 +448,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.language.v1beta2.Token prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -484,7 +475,6 @@ public static final class Builder extends
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_Token_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_Token_fieldAccessorTable
@@ -507,7 +497,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (textBuilder_ == null) {
@@ -533,18 +522,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.language.v1beta2.LanguageServiceProto.internal_static_google_cloud_language_v1beta2_Token_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.Token getDefaultInstanceForType() {
       return com.google.cloud.language.v1beta2.Token.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.Token build() {
       com.google.cloud.language.v1beta2.Token result = buildPartial();
       if (!result.isInitialized()) {
@@ -553,7 +539,6 @@ public com.google.cloud.language.v1beta2.Token build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.language.v1beta2.Token buildPartial() {
       com.google.cloud.language.v1beta2.Token result = new com.google.cloud.language.v1beta2.Token(this);
       if (textBuilder_ == null) {
@@ -576,39 +561,32 @@ public com.google.cloud.language.v1beta2.Token buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.language.v1beta2.Token) {
         return mergeFrom((com.google.cloud.language.v1beta2.Token)other);
@@ -638,12 +616,10 @@ public Builder mergeFrom(com.google.cloud.language.v1beta2.Token other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1209,13 +1185,11 @@ public Builder setLemmaBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1237,12 +1211,11 @@ public static com.google.cloud.language.v1beta2.Token getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Token parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Token(input, extensionRegistry);
+        return new Token(input, extensionRegistry);
     }
   };
 
@@ -1255,7 +1228,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.language.v1beta2.Token getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateExclusionRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateExclusionRequest.java
index 77dfd9117fbc..bbfe7165a6c1 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateExclusionRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateExclusionRequest.java
@@ -33,9 +33,6 @@ private CreateExclusionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private CreateExclusionRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private CreateExclusionRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private CreateExclusionRequest(
     return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_CreateExclusionRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_CreateExclusionRequest_fieldAccessorTable
@@ -187,7 +183,6 @@ public com.google.logging.v2.LogExclusionOrBuilder getExclusionOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -197,7 +192,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -209,7 +203,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -337,7 +330,6 @@ public static com.google.logging.v2.CreateExclusionRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -345,7 +337,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.CreateExclusionRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -373,7 +364,6 @@ public static final class Builder extends
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_CreateExclusionRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_CreateExclusionRequest_fieldAccessorTable
@@ -396,7 +386,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -410,18 +399,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_CreateExclusionRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.CreateExclusionRequest getDefaultInstanceForType() {
       return com.google.logging.v2.CreateExclusionRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.CreateExclusionRequest build() {
       com.google.logging.v2.CreateExclusionRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -430,7 +416,6 @@ public com.google.logging.v2.CreateExclusionRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.CreateExclusionRequest buildPartial() {
       com.google.logging.v2.CreateExclusionRequest result = new com.google.logging.v2.CreateExclusionRequest(this);
       result.parent_ = parent_;
@@ -443,39 +428,32 @@ public com.google.logging.v2.CreateExclusionRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.CreateExclusionRequest) {
         return mergeFrom((com.google.logging.v2.CreateExclusionRequest)other);
@@ -499,12 +477,10 @@ public Builder mergeFrom(com.google.logging.v2.CreateExclusionRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -798,13 +774,11 @@ public com.google.logging.v2.LogExclusionOrBuilder getExclusionOrBuilder() {
       }
       return exclusionBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -826,12 +800,11 @@ public static com.google.logging.v2.CreateExclusionRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateExclusionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateExclusionRequest(input, extensionRegistry);
+        return new CreateExclusionRequest(input, extensionRegistry);
     }
   };
 
@@ -844,7 +817,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.CreateExclusionRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateLogMetricRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateLogMetricRequest.java
index 836d17451734..f65cf01daa77 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateLogMetricRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateLogMetricRequest.java
@@ -33,9 +33,6 @@ private CreateLogMetricRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private CreateLogMetricRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private CreateLogMetricRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private CreateLogMetricRequest(
     return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_CreateLogMetricRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_CreateLogMetricRequest_fieldAccessorTable
@@ -181,7 +177,6 @@ public com.google.logging.v2.LogMetricOrBuilder getMetricOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -191,7 +186,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -203,7 +197,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -331,7 +324,6 @@ public static com.google.logging.v2.CreateLogMetricRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -339,7 +331,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.CreateLogMetricRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -367,7 +358,6 @@ public static final class Builder extends
       return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_CreateLogMetricRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_CreateLogMetricRequest_fieldAccessorTable
@@ -390,7 +380,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -404,18 +393,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_CreateLogMetricRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.CreateLogMetricRequest getDefaultInstanceForType() {
       return com.google.logging.v2.CreateLogMetricRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.CreateLogMetricRequest build() {
       com.google.logging.v2.CreateLogMetricRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -424,7 +410,6 @@ public com.google.logging.v2.CreateLogMetricRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.CreateLogMetricRequest buildPartial() {
       com.google.logging.v2.CreateLogMetricRequest result = new com.google.logging.v2.CreateLogMetricRequest(this);
       result.parent_ = parent_;
@@ -437,39 +422,32 @@ public com.google.logging.v2.CreateLogMetricRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.CreateLogMetricRequest) {
         return mergeFrom((com.google.logging.v2.CreateLogMetricRequest)other);
@@ -493,12 +471,10 @@ public Builder mergeFrom(com.google.logging.v2.CreateLogMetricRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -777,13 +753,11 @@ public com.google.logging.v2.LogMetricOrBuilder getMetricOrBuilder() {
       }
       return metricBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -805,12 +779,11 @@ public static com.google.logging.v2.CreateLogMetricRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateLogMetricRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateLogMetricRequest(input, extensionRegistry);
+        return new CreateLogMetricRequest(input, extensionRegistry);
     }
   };
 
@@ -823,7 +796,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.CreateLogMetricRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateSinkRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateSinkRequest.java
index 9dd5482aaf26..8cc1b5693ddb 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateSinkRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateSinkRequest.java
@@ -34,9 +34,6 @@ private CreateSinkRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private CreateSinkRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -72,13 +76,6 @@ private CreateSinkRequest(
             uniqueWriterIdentity_ = input.readBool();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private CreateSinkRequest(
     return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_CreateSinkRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_CreateSinkRequest_fieldAccessorTable
@@ -215,7 +211,6 @@ public boolean getUniqueWriterIdentity() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -225,7 +220,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -240,7 +234,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -377,7 +370,6 @@ public static com.google.logging.v2.CreateSinkRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -385,7 +377,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.CreateSinkRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -413,7 +404,6 @@ public static final class Builder extends
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_CreateSinkRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_CreateSinkRequest_fieldAccessorTable
@@ -436,7 +426,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -452,18 +441,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_CreateSinkRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.CreateSinkRequest getDefaultInstanceForType() {
       return com.google.logging.v2.CreateSinkRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.CreateSinkRequest build() {
       com.google.logging.v2.CreateSinkRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -472,7 +458,6 @@ public com.google.logging.v2.CreateSinkRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.CreateSinkRequest buildPartial() {
       com.google.logging.v2.CreateSinkRequest result = new com.google.logging.v2.CreateSinkRequest(this);
       result.parent_ = parent_;
@@ -486,39 +471,32 @@ public com.google.logging.v2.CreateSinkRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.CreateSinkRequest) {
         return mergeFrom((com.google.logging.v2.CreateSinkRequest)other);
@@ -545,12 +523,10 @@ public Builder mergeFrom(com.google.logging.v2.CreateSinkRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -909,13 +885,11 @@ public Builder clearUniqueWriterIdentity() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -937,12 +911,11 @@ public static com.google.logging.v2.CreateSinkRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateSinkRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateSinkRequest(input, extensionRegistry);
+        return new CreateSinkRequest(input, extensionRegistry);
     }
   };
 
@@ -955,7 +928,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.CreateSinkRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteExclusionRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteExclusionRequest.java
index 3bda797775c7..7bfd786684a0 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteExclusionRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteExclusionRequest.java
@@ -33,9 +33,6 @@ private DeleteExclusionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteExclusionRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteExclusionRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteExclusionRequest(
     return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_DeleteExclusionRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_DeleteExclusionRequest_fieldAccessorTable
@@ -138,7 +134,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -148,7 +143,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -157,7 +151,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -272,7 +265,6 @@ public static com.google.logging.v2.DeleteExclusionRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -280,7 +272,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.DeleteExclusionRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -308,7 +299,6 @@ public static final class Builder extends
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_DeleteExclusionRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_DeleteExclusionRequest_fieldAccessorTable
@@ -331,7 +321,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -339,18 +328,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_DeleteExclusionRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.DeleteExclusionRequest getDefaultInstanceForType() {
       return com.google.logging.v2.DeleteExclusionRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.DeleteExclusionRequest build() {
       com.google.logging.v2.DeleteExclusionRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -359,7 +345,6 @@ public com.google.logging.v2.DeleteExclusionRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.DeleteExclusionRequest buildPartial() {
       com.google.logging.v2.DeleteExclusionRequest result = new com.google.logging.v2.DeleteExclusionRequest(this);
       result.name_ = name_;
@@ -367,39 +352,32 @@ public com.google.logging.v2.DeleteExclusionRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.DeleteExclusionRequest) {
         return mergeFrom((com.google.logging.v2.DeleteExclusionRequest)other);
@@ -420,12 +398,10 @@ public Builder mergeFrom(com.google.logging.v2.DeleteExclusionRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -557,13 +533,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -585,12 +559,11 @@ public static com.google.logging.v2.DeleteExclusionRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteExclusionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteExclusionRequest(input, extensionRegistry);
+        return new DeleteExclusionRequest(input, extensionRegistry);
     }
   };
 
@@ -603,7 +576,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.DeleteExclusionRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogMetricRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogMetricRequest.java
index efc313242363..7499b31e2245 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogMetricRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogMetricRequest.java
@@ -33,9 +33,6 @@ private DeleteLogMetricRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteLogMetricRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            metricName_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteLogMetricRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            metricName_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteLogMetricRequest(
     return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_DeleteLogMetricRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_DeleteLogMetricRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getMetricName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getMetricNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.logging.v2.DeleteLogMetricRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.DeleteLogMetricRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_DeleteLogMetricRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_DeleteLogMetricRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       metricName_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_DeleteLogMetricRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.DeleteLogMetricRequest getDefaultInstanceForType() {
       return com.google.logging.v2.DeleteLogMetricRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.DeleteLogMetricRequest build() {
       com.google.logging.v2.DeleteLogMetricRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.logging.v2.DeleteLogMetricRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.DeleteLogMetricRequest buildPartial() {
       com.google.logging.v2.DeleteLogMetricRequest result = new com.google.logging.v2.DeleteLogMetricRequest(this);
       result.metricName_ = metricName_;
@@ -359,39 +344,32 @@ public com.google.logging.v2.DeleteLogMetricRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.DeleteLogMetricRequest) {
         return mergeFrom((com.google.logging.v2.DeleteLogMetricRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.logging.v2.DeleteLogMetricRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setMetricNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.logging.v2.DeleteLogMetricRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteLogMetricRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteLogMetricRequest(input, extensionRegistry);
+        return new DeleteLogMetricRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.DeleteLogMetricRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogRequest.java
index df99d2ba7247..0ff95c5f34a1 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogRequest.java
@@ -33,9 +33,6 @@ private DeleteLogRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteLogRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            logName_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteLogRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            logName_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteLogRequest(
     return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_DeleteLogRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_DeleteLogRequest_fieldAccessorTable
@@ -146,7 +142,6 @@ public java.lang.String getLogName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -156,7 +151,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getLogNameBytes().isEmpty()) {
@@ -165,7 +159,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -280,7 +273,6 @@ public static com.google.logging.v2.DeleteLogRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -288,7 +280,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.DeleteLogRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -316,7 +307,6 @@ public static final class Builder extends
       return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_DeleteLogRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_DeleteLogRequest_fieldAccessorTable
@@ -339,7 +329,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       logName_ = "";
@@ -347,18 +336,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_DeleteLogRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.DeleteLogRequest getDefaultInstanceForType() {
       return com.google.logging.v2.DeleteLogRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.DeleteLogRequest build() {
       com.google.logging.v2.DeleteLogRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -367,7 +353,6 @@ public com.google.logging.v2.DeleteLogRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.DeleteLogRequest buildPartial() {
       com.google.logging.v2.DeleteLogRequest result = new com.google.logging.v2.DeleteLogRequest(this);
       result.logName_ = logName_;
@@ -375,39 +360,32 @@ public com.google.logging.v2.DeleteLogRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.DeleteLogRequest) {
         return mergeFrom((com.google.logging.v2.DeleteLogRequest)other);
@@ -428,12 +406,10 @@ public Builder mergeFrom(com.google.logging.v2.DeleteLogRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -585,13 +561,11 @@ public Builder setLogNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -613,12 +587,11 @@ public static com.google.logging.v2.DeleteLogRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteLogRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteLogRequest(input, extensionRegistry);
+        return new DeleteLogRequest(input, extensionRegistry);
     }
   };
 
@@ -631,7 +604,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.DeleteLogRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteSinkRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteSinkRequest.java
index 4e272fd1eee7..a488fa6f350c 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteSinkRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteSinkRequest.java
@@ -33,9 +33,6 @@ private DeleteSinkRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteSinkRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            sinkName_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteSinkRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            sinkName_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteSinkRequest(
     return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_DeleteSinkRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_DeleteSinkRequest_fieldAccessorTable
@@ -140,7 +136,6 @@ public java.lang.String getSinkName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -150,7 +145,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getSinkNameBytes().isEmpty()) {
@@ -159,7 +153,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -274,7 +267,6 @@ public static com.google.logging.v2.DeleteSinkRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -282,7 +274,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.DeleteSinkRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -310,7 +301,6 @@ public static final class Builder extends
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_DeleteSinkRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_DeleteSinkRequest_fieldAccessorTable
@@ -333,7 +323,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       sinkName_ = "";
@@ -341,18 +330,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_DeleteSinkRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.DeleteSinkRequest getDefaultInstanceForType() {
       return com.google.logging.v2.DeleteSinkRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.DeleteSinkRequest build() {
       com.google.logging.v2.DeleteSinkRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -361,7 +347,6 @@ public com.google.logging.v2.DeleteSinkRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.DeleteSinkRequest buildPartial() {
       com.google.logging.v2.DeleteSinkRequest result = new com.google.logging.v2.DeleteSinkRequest(this);
       result.sinkName_ = sinkName_;
@@ -369,39 +354,32 @@ public com.google.logging.v2.DeleteSinkRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.DeleteSinkRequest) {
         return mergeFrom((com.google.logging.v2.DeleteSinkRequest)other);
@@ -422,12 +400,10 @@ public Builder mergeFrom(com.google.logging.v2.DeleteSinkRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -564,13 +540,11 @@ public Builder setSinkNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -592,12 +566,11 @@ public static com.google.logging.v2.DeleteSinkRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteSinkRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteSinkRequest(input, extensionRegistry);
+        return new DeleteSinkRequest(input, extensionRegistry);
     }
   };
 
@@ -610,7 +583,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.DeleteSinkRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetExclusionRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetExclusionRequest.java
index 26b7bc78d6be..dab38bc9eee3 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetExclusionRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetExclusionRequest.java
@@ -33,9 +33,6 @@ private GetExclusionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetExclusionRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetExclusionRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetExclusionRequest(
     return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_GetExclusionRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_GetExclusionRequest_fieldAccessorTable
@@ -138,7 +134,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -148,7 +143,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -157,7 +151,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -272,7 +265,6 @@ public static com.google.logging.v2.GetExclusionRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -280,7 +272,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.GetExclusionRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -308,7 +299,6 @@ public static final class Builder extends
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_GetExclusionRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_GetExclusionRequest_fieldAccessorTable
@@ -331,7 +321,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -339,18 +328,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_GetExclusionRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.GetExclusionRequest getDefaultInstanceForType() {
       return com.google.logging.v2.GetExclusionRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.GetExclusionRequest build() {
       com.google.logging.v2.GetExclusionRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -359,7 +345,6 @@ public com.google.logging.v2.GetExclusionRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.GetExclusionRequest buildPartial() {
       com.google.logging.v2.GetExclusionRequest result = new com.google.logging.v2.GetExclusionRequest(this);
       result.name_ = name_;
@@ -367,39 +352,32 @@ public com.google.logging.v2.GetExclusionRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.GetExclusionRequest) {
         return mergeFrom((com.google.logging.v2.GetExclusionRequest)other);
@@ -420,12 +398,10 @@ public Builder mergeFrom(com.google.logging.v2.GetExclusionRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -557,13 +533,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -585,12 +559,11 @@ public static com.google.logging.v2.GetExclusionRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetExclusionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetExclusionRequest(input, extensionRegistry);
+        return new GetExclusionRequest(input, extensionRegistry);
     }
   };
 
@@ -603,7 +576,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.GetExclusionRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetLogMetricRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetLogMetricRequest.java
index 0d750e73a754..8d13a7e8ab94 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetLogMetricRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetLogMetricRequest.java
@@ -33,9 +33,6 @@ private GetLogMetricRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetLogMetricRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            metricName_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetLogMetricRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            metricName_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetLogMetricRequest(
     return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_GetLogMetricRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_GetLogMetricRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getMetricName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getMetricNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.logging.v2.GetLogMetricRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.GetLogMetricRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_GetLogMetricRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_GetLogMetricRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       metricName_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_GetLogMetricRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.GetLogMetricRequest getDefaultInstanceForType() {
       return com.google.logging.v2.GetLogMetricRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.GetLogMetricRequest build() {
       com.google.logging.v2.GetLogMetricRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.logging.v2.GetLogMetricRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.GetLogMetricRequest buildPartial() {
       com.google.logging.v2.GetLogMetricRequest result = new com.google.logging.v2.GetLogMetricRequest(this);
       result.metricName_ = metricName_;
@@ -359,39 +344,32 @@ public com.google.logging.v2.GetLogMetricRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.GetLogMetricRequest) {
         return mergeFrom((com.google.logging.v2.GetLogMetricRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.logging.v2.GetLogMetricRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setMetricNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.logging.v2.GetLogMetricRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetLogMetricRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetLogMetricRequest(input, extensionRegistry);
+        return new GetLogMetricRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.GetLogMetricRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetSinkRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetSinkRequest.java
index d7b0c10b53a6..3767b17fc053 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetSinkRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetSinkRequest.java
@@ -33,9 +33,6 @@ private GetSinkRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetSinkRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            sinkName_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetSinkRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            sinkName_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetSinkRequest(
     return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_GetSinkRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_GetSinkRequest_fieldAccessorTable
@@ -138,7 +134,6 @@ public java.lang.String getSinkName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -148,7 +143,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getSinkNameBytes().isEmpty()) {
@@ -157,7 +151,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -272,7 +265,6 @@ public static com.google.logging.v2.GetSinkRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -280,7 +272,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.GetSinkRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -308,7 +299,6 @@ public static final class Builder extends
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_GetSinkRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_GetSinkRequest_fieldAccessorTable
@@ -331,7 +321,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       sinkName_ = "";
@@ -339,18 +328,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_GetSinkRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.GetSinkRequest getDefaultInstanceForType() {
       return com.google.logging.v2.GetSinkRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.GetSinkRequest build() {
       com.google.logging.v2.GetSinkRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -359,7 +345,6 @@ public com.google.logging.v2.GetSinkRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.GetSinkRequest buildPartial() {
       com.google.logging.v2.GetSinkRequest result = new com.google.logging.v2.GetSinkRequest(this);
       result.sinkName_ = sinkName_;
@@ -367,39 +352,32 @@ public com.google.logging.v2.GetSinkRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.GetSinkRequest) {
         return mergeFrom((com.google.logging.v2.GetSinkRequest)other);
@@ -420,12 +398,10 @@ public Builder mergeFrom(com.google.logging.v2.GetSinkRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -557,13 +533,11 @@ public Builder setSinkNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -585,12 +559,11 @@ public static com.google.logging.v2.GetSinkRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetSinkRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetSinkRequest(input, extensionRegistry);
+        return new GetSinkRequest(input, extensionRegistry);
     }
   };
 
@@ -603,7 +576,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.GetSinkRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsRequest.java
index 16cfd7602c47..4349841ec337 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsRequest.java
@@ -35,9 +35,6 @@ private ListExclusionsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListExclusionsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ListExclusionsRequest(
             pageSize_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListExclusionsRequest(
     return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListExclusionsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListExclusionsRequest_fieldAccessorTable
@@ -212,7 +208,6 @@ public int getPageSize() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -222,7 +217,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -237,7 +231,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -367,7 +360,6 @@ public static com.google.logging.v2.ListExclusionsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -375,7 +367,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.ListExclusionsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -403,7 +394,6 @@ public static final class Builder extends
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListExclusionsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListExclusionsRequest_fieldAccessorTable
@@ -426,7 +416,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -438,18 +427,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListExclusionsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListExclusionsRequest getDefaultInstanceForType() {
       return com.google.logging.v2.ListExclusionsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListExclusionsRequest build() {
       com.google.logging.v2.ListExclusionsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -458,7 +444,6 @@ public com.google.logging.v2.ListExclusionsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListExclusionsRequest buildPartial() {
       com.google.logging.v2.ListExclusionsRequest result = new com.google.logging.v2.ListExclusionsRequest(this);
       result.parent_ = parent_;
@@ -468,39 +453,32 @@ public com.google.logging.v2.ListExclusionsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.ListExclusionsRequest) {
         return mergeFrom((com.google.logging.v2.ListExclusionsRequest)other);
@@ -528,12 +506,10 @@ public Builder mergeFrom(com.google.logging.v2.ListExclusionsRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -808,13 +784,11 @@ public Builder clearPageSize() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -836,12 +810,11 @@ public static com.google.logging.v2.ListExclusionsRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListExclusionsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListExclusionsRequest(input, extensionRegistry);
+        return new ListExclusionsRequest(input, extensionRegistry);
     }
   };
 
@@ -854,7 +827,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.ListExclusionsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsResponse.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsResponse.java
index 9ed3778aa72c..8267723b8d47 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsResponse.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsResponse.java
@@ -34,9 +34,6 @@ private ListExclusionsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListExclusionsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               exclusions_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListExclusionsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListExclusionsResponse(
     return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListExclusionsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListExclusionsResponse_fieldAccessorTable
@@ -201,7 +197,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -211,7 +206,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < exclusions_.size(); i++) {
@@ -223,7 +217,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.logging.v2.ListExclusionsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.ListExclusionsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListExclusionsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListExclusionsResponse_fieldAccessorTable
@@ -408,7 +398,6 @@ private void maybeForceBuilderInitialization() {
         getExclusionsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (exclusionsBuilder_ == null) {
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListExclusionsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListExclusionsResponse getDefaultInstanceForType() {
       return com.google.logging.v2.ListExclusionsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListExclusionsResponse build() {
       com.google.logging.v2.ListExclusionsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public com.google.logging.v2.ListExclusionsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListExclusionsResponse buildPartial() {
       com.google.logging.v2.ListExclusionsResponse result = new com.google.logging.v2.ListExclusionsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -462,39 +447,32 @@ public com.google.logging.v2.ListExclusionsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.ListExclusionsResponse) {
         return mergeFrom((com.google.logging.v2.ListExclusionsResponse)other);
@@ -541,12 +519,10 @@ public Builder mergeFrom(com.google.logging.v2.ListExclusionsResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -976,13 +952,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1004,12 +978,11 @@ public static com.google.logging.v2.ListExclusionsResponse getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListExclusionsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListExclusionsResponse(input, extensionRegistry);
+        return new ListExclusionsResponse(input, extensionRegistry);
     }
   };
 
@@ -1022,7 +995,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.ListExclusionsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesRequest.java
index 3ad50866f4f4..a447456598ea 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesRequest.java
@@ -38,9 +38,6 @@ private ListLogEntriesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private ListLogEntriesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -93,13 +97,6 @@ private ListLogEntriesRequest(
             resourceNames_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -123,7 +120,6 @@ private ListLogEntriesRequest(
     return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogEntriesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogEntriesRequest_fieldAccessorTable
@@ -432,7 +428,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -442,7 +437,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < projectIds_.size(); i++) {
@@ -466,7 +460,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -631,7 +624,6 @@ public static com.google.logging.v2.ListLogEntriesRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -639,7 +631,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.ListLogEntriesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -667,7 +658,6 @@ public static final class Builder extends
       return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogEntriesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogEntriesRequest_fieldAccessorTable
@@ -690,7 +680,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectIds_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -708,18 +697,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogEntriesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListLogEntriesRequest getDefaultInstanceForType() {
       return com.google.logging.v2.ListLogEntriesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListLogEntriesRequest build() {
       com.google.logging.v2.ListLogEntriesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -728,7 +714,6 @@ public com.google.logging.v2.ListLogEntriesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListLogEntriesRequest buildPartial() {
       com.google.logging.v2.ListLogEntriesRequest result = new com.google.logging.v2.ListLogEntriesRequest(this);
       int from_bitField0_ = bitField0_;
@@ -752,39 +737,32 @@ public com.google.logging.v2.ListLogEntriesRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.ListLogEntriesRequest) {
         return mergeFrom((com.google.logging.v2.ListLogEntriesRequest)other);
@@ -836,12 +814,10 @@ public Builder mergeFrom(com.google.logging.v2.ListLogEntriesRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1591,13 +1567,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1619,12 +1593,11 @@ public static com.google.logging.v2.ListLogEntriesRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListLogEntriesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListLogEntriesRequest(input, extensionRegistry);
+        return new ListLogEntriesRequest(input, extensionRegistry);
     }
   };
 
@@ -1637,7 +1610,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.ListLogEntriesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesResponse.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesResponse.java
index 30344960d4ab..1b883041b69e 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesResponse.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesResponse.java
@@ -34,9 +34,6 @@ private ListLogEntriesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListLogEntriesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               entries_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListLogEntriesResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListLogEntriesResponse(
     return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogEntriesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogEntriesResponse_fieldAccessorTable
@@ -223,7 +219,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -233,7 +228,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < entries_.size(); i++) {
@@ -245,7 +239,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -370,7 +363,6 @@ public static com.google.logging.v2.ListLogEntriesResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -378,7 +370,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.ListLogEntriesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -406,7 +397,6 @@ public static final class Builder extends
       return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogEntriesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogEntriesResponse_fieldAccessorTable
@@ -430,7 +420,6 @@ private void maybeForceBuilderInitialization() {
         getEntriesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (entriesBuilder_ == null) {
@@ -444,18 +433,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogEntriesResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListLogEntriesResponse getDefaultInstanceForType() {
       return com.google.logging.v2.ListLogEntriesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListLogEntriesResponse build() {
       com.google.logging.v2.ListLogEntriesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -464,7 +450,6 @@ public com.google.logging.v2.ListLogEntriesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListLogEntriesResponse buildPartial() {
       com.google.logging.v2.ListLogEntriesResponse result = new com.google.logging.v2.ListLogEntriesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -484,39 +469,32 @@ public com.google.logging.v2.ListLogEntriesResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.ListLogEntriesResponse) {
         return mergeFrom((com.google.logging.v2.ListLogEntriesResponse)other);
@@ -563,12 +541,10 @@ public Builder mergeFrom(com.google.logging.v2.ListLogEntriesResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1064,13 +1040,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1092,12 +1066,11 @@ public static com.google.logging.v2.ListLogEntriesResponse getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListLogEntriesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListLogEntriesResponse(input, extensionRegistry);
+        return new ListLogEntriesResponse(input, extensionRegistry);
     }
   };
 
@@ -1110,7 +1083,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.ListLogEntriesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsRequest.java
index 8f1ca7795f52..10ca988f6926 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsRequest.java
@@ -35,9 +35,6 @@ private ListLogMetricsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListLogMetricsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ListLogMetricsRequest(
             pageSize_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListLogMetricsRequest(
     return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_ListLogMetricsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_ListLogMetricsRequest_fieldAccessorTable
@@ -206,7 +202,6 @@ public int getPageSize() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -216,7 +211,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -231,7 +225,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -361,7 +354,6 @@ public static com.google.logging.v2.ListLogMetricsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -369,7 +361,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.ListLogMetricsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -397,7 +388,6 @@ public static final class Builder extends
       return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_ListLogMetricsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_ListLogMetricsRequest_fieldAccessorTable
@@ -420,7 +410,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -432,18 +421,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_ListLogMetricsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListLogMetricsRequest getDefaultInstanceForType() {
       return com.google.logging.v2.ListLogMetricsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListLogMetricsRequest build() {
       com.google.logging.v2.ListLogMetricsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -452,7 +438,6 @@ public com.google.logging.v2.ListLogMetricsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListLogMetricsRequest buildPartial() {
       com.google.logging.v2.ListLogMetricsRequest result = new com.google.logging.v2.ListLogMetricsRequest(this);
       result.parent_ = parent_;
@@ -462,39 +447,32 @@ public com.google.logging.v2.ListLogMetricsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.ListLogMetricsRequest) {
         return mergeFrom((com.google.logging.v2.ListLogMetricsRequest)other);
@@ -522,12 +500,10 @@ public Builder mergeFrom(com.google.logging.v2.ListLogMetricsRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -787,13 +763,11 @@ public Builder clearPageSize() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -815,12 +789,11 @@ public static com.google.logging.v2.ListLogMetricsRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListLogMetricsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListLogMetricsRequest(input, extensionRegistry);
+        return new ListLogMetricsRequest(input, extensionRegistry);
     }
   };
 
@@ -833,7 +806,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.ListLogMetricsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsResponse.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsResponse.java
index 88a5299afb9c..56b9590191f7 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsResponse.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsResponse.java
@@ -34,9 +34,6 @@ private ListLogMetricsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListLogMetricsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               metrics_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListLogMetricsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListLogMetricsResponse(
     return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_ListLogMetricsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_ListLogMetricsResponse_fieldAccessorTable
@@ -201,7 +197,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -211,7 +206,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < metrics_.size(); i++) {
@@ -223,7 +217,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.logging.v2.ListLogMetricsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.ListLogMetricsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_ListLogMetricsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_ListLogMetricsResponse_fieldAccessorTable
@@ -408,7 +398,6 @@ private void maybeForceBuilderInitialization() {
         getMetricsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (metricsBuilder_ == null) {
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_ListLogMetricsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListLogMetricsResponse getDefaultInstanceForType() {
       return com.google.logging.v2.ListLogMetricsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListLogMetricsResponse build() {
       com.google.logging.v2.ListLogMetricsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public com.google.logging.v2.ListLogMetricsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListLogMetricsResponse buildPartial() {
       com.google.logging.v2.ListLogMetricsResponse result = new com.google.logging.v2.ListLogMetricsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -462,39 +447,32 @@ public com.google.logging.v2.ListLogMetricsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.ListLogMetricsResponse) {
         return mergeFrom((com.google.logging.v2.ListLogMetricsResponse)other);
@@ -541,12 +519,10 @@ public Builder mergeFrom(com.google.logging.v2.ListLogMetricsResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -976,13 +952,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1004,12 +978,11 @@ public static com.google.logging.v2.ListLogMetricsResponse getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListLogMetricsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListLogMetricsResponse(input, extensionRegistry);
+        return new ListLogMetricsResponse(input, extensionRegistry);
     }
   };
 
@@ -1022,7 +995,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.ListLogMetricsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsRequest.java
index 3fbdc57bcc53..e68cdf52ca19 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsRequest.java
@@ -35,9 +35,6 @@ private ListLogsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListLogsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ListLogsRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListLogsRequest(
     return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogsRequest_fieldAccessorTable
@@ -212,7 +208,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -222,7 +217,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -237,7 +231,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -367,7 +360,6 @@ public static com.google.logging.v2.ListLogsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -375,7 +367,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.ListLogsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -403,7 +394,6 @@ public static final class Builder extends
       return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogsRequest_fieldAccessorTable
@@ -426,7 +416,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -438,18 +427,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListLogsRequest getDefaultInstanceForType() {
       return com.google.logging.v2.ListLogsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListLogsRequest build() {
       com.google.logging.v2.ListLogsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -458,7 +444,6 @@ public com.google.logging.v2.ListLogsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListLogsRequest buildPartial() {
       com.google.logging.v2.ListLogsRequest result = new com.google.logging.v2.ListLogsRequest(this);
       result.parent_ = parent_;
@@ -468,39 +453,32 @@ public com.google.logging.v2.ListLogsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.ListLogsRequest) {
         return mergeFrom((com.google.logging.v2.ListLogsRequest)other);
@@ -528,12 +506,10 @@ public Builder mergeFrom(com.google.logging.v2.ListLogsRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -808,13 +784,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -836,12 +810,11 @@ public static com.google.logging.v2.ListLogsRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListLogsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListLogsRequest(input, extensionRegistry);
+        return new ListLogsRequest(input, extensionRegistry);
     }
   };
 
@@ -854,7 +827,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.ListLogsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsResponse.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsResponse.java
index 9f95d1fab938..52ce6088ee72 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsResponse.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsResponse.java
@@ -34,9 +34,6 @@ private ListLogsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListLogsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -63,13 +67,6 @@ private ListLogsResponse(
             logNames_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListLogsResponse(
     return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogsResponse_fieldAccessorTable
@@ -199,7 +195,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -209,7 +204,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNextPageTokenBytes().isEmpty()) {
@@ -221,7 +215,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -350,7 +343,6 @@ public static com.google.logging.v2.ListLogsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -358,7 +350,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.ListLogsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -386,7 +377,6 @@ public static final class Builder extends
       return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogsResponse_fieldAccessorTable
@@ -409,7 +399,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       logNames_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -419,18 +408,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListLogsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListLogsResponse getDefaultInstanceForType() {
       return com.google.logging.v2.ListLogsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListLogsResponse build() {
       com.google.logging.v2.ListLogsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -439,7 +425,6 @@ public com.google.logging.v2.ListLogsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListLogsResponse buildPartial() {
       com.google.logging.v2.ListLogsResponse result = new com.google.logging.v2.ListLogsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -455,39 +440,32 @@ public com.google.logging.v2.ListLogsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.ListLogsResponse) {
         return mergeFrom((com.google.logging.v2.ListLogsResponse)other);
@@ -518,12 +496,10 @@ public Builder mergeFrom(com.google.logging.v2.ListLogsResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -789,13 +765,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -817,12 +791,11 @@ public static com.google.logging.v2.ListLogsResponse getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListLogsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListLogsResponse(input, extensionRegistry);
+        return new ListLogsResponse(input, extensionRegistry);
     }
   };
 
@@ -835,7 +808,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.ListLogsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsRequest.java
index 74b81c0d39f4..d541c0351439 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsRequest.java
@@ -34,9 +34,6 @@ private ListMonitoredResourceDescriptorsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListMonitoredResourceDescriptorsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
 
             pageSize_ = input.readInt32();
@@ -59,13 +63,6 @@ private ListMonitoredResourceDescriptorsRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private ListMonitoredResourceDescriptorsRequest(
     return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListMonitoredResourceDescriptorsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListMonitoredResourceDescriptorsRequest_fieldAccessorTable
@@ -155,7 +151,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -165,7 +160,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (pageSize_ != 0) {
@@ -177,7 +171,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -300,7 +293,6 @@ public static com.google.logging.v2.ListMonitoredResourceDescriptorsRequest pars
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -308,7 +300,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.ListMonitoredResourceDescriptorsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -336,7 +327,6 @@ public static final class Builder extends
       return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListMonitoredResourceDescriptorsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListMonitoredResourceDescriptorsRequest_fieldAccessorTable
@@ -359,7 +349,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       pageSize_ = 0;
@@ -369,18 +358,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListMonitoredResourceDescriptorsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListMonitoredResourceDescriptorsRequest getDefaultInstanceForType() {
       return com.google.logging.v2.ListMonitoredResourceDescriptorsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListMonitoredResourceDescriptorsRequest build() {
       com.google.logging.v2.ListMonitoredResourceDescriptorsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -389,7 +375,6 @@ public com.google.logging.v2.ListMonitoredResourceDescriptorsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListMonitoredResourceDescriptorsRequest buildPartial() {
       com.google.logging.v2.ListMonitoredResourceDescriptorsRequest result = new com.google.logging.v2.ListMonitoredResourceDescriptorsRequest(this);
       result.pageSize_ = pageSize_;
@@ -398,39 +383,32 @@ public com.google.logging.v2.ListMonitoredResourceDescriptorsRequest buildPartia
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.ListMonitoredResourceDescriptorsRequest) {
         return mergeFrom((com.google.logging.v2.ListMonitoredResourceDescriptorsRequest)other);
@@ -454,12 +432,10 @@ public Builder mergeFrom(com.google.logging.v2.ListMonitoredResourceDescriptorsR
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -625,13 +601,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -653,12 +627,11 @@ public static com.google.logging.v2.ListMonitoredResourceDescriptorsRequest getD
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListMonitoredResourceDescriptorsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListMonitoredResourceDescriptorsRequest(input, extensionRegistry);
+        return new ListMonitoredResourceDescriptorsRequest(input, extensionRegistry);
     }
   };
 
@@ -671,7 +644,6 @@ public com.google.protobuf.Parser getPa
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.ListMonitoredResourceDescriptorsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsResponse.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsResponse.java
index e70a38005dee..d65fd6978763 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsResponse.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsResponse.java
@@ -34,9 +34,6 @@ private ListMonitoredResourceDescriptorsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListMonitoredResourceDescriptorsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               resourceDescriptors_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListMonitoredResourceDescriptorsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListMonitoredResourceDescriptorsResponse(
     return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListMonitoredResourceDescriptorsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListMonitoredResourceDescriptorsResponse_fieldAccessorTable
@@ -201,7 +197,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -211,7 +206,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < resourceDescriptors_.size(); i++) {
@@ -223,7 +217,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.logging.v2.ListMonitoredResourceDescriptorsResponse par
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.ListMonitoredResourceDescriptorsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListMonitoredResourceDescriptorsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListMonitoredResourceDescriptorsResponse_fieldAccessorTable
@@ -408,7 +398,6 @@ private void maybeForceBuilderInitialization() {
         getResourceDescriptorsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (resourceDescriptorsBuilder_ == null) {
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_ListMonitoredResourceDescriptorsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListMonitoredResourceDescriptorsResponse getDefaultInstanceForType() {
       return com.google.logging.v2.ListMonitoredResourceDescriptorsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListMonitoredResourceDescriptorsResponse build() {
       com.google.logging.v2.ListMonitoredResourceDescriptorsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public com.google.logging.v2.ListMonitoredResourceDescriptorsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListMonitoredResourceDescriptorsResponse buildPartial() {
       com.google.logging.v2.ListMonitoredResourceDescriptorsResponse result = new com.google.logging.v2.ListMonitoredResourceDescriptorsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -462,39 +447,32 @@ public com.google.logging.v2.ListMonitoredResourceDescriptorsResponse buildParti
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.ListMonitoredResourceDescriptorsResponse) {
         return mergeFrom((com.google.logging.v2.ListMonitoredResourceDescriptorsResponse)other);
@@ -541,12 +519,10 @@ public Builder mergeFrom(com.google.logging.v2.ListMonitoredResourceDescriptorsR
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -976,13 +952,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1004,12 +978,11 @@ public static com.google.logging.v2.ListMonitoredResourceDescriptorsResponse get
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListMonitoredResourceDescriptorsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListMonitoredResourceDescriptorsResponse(input, extensionRegistry);
+        return new ListMonitoredResourceDescriptorsResponse(input, extensionRegistry);
     }
   };
 
@@ -1022,7 +995,6 @@ public com.google.protobuf.Parser getP
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.ListMonitoredResourceDescriptorsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksRequest.java
index fe3bfa4c1f0d..0481c46c6317 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksRequest.java
@@ -35,9 +35,6 @@ private ListSinksRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListSinksRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ListSinksRequest(
             pageSize_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListSinksRequest(
     return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListSinksRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListSinksRequest_fieldAccessorTable
@@ -212,7 +208,6 @@ public int getPageSize() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -222,7 +217,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -237,7 +231,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -367,7 +360,6 @@ public static com.google.logging.v2.ListSinksRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -375,7 +367,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.ListSinksRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -403,7 +394,6 @@ public static final class Builder extends
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListSinksRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListSinksRequest_fieldAccessorTable
@@ -426,7 +416,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -438,18 +427,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListSinksRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListSinksRequest getDefaultInstanceForType() {
       return com.google.logging.v2.ListSinksRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListSinksRequest build() {
       com.google.logging.v2.ListSinksRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -458,7 +444,6 @@ public com.google.logging.v2.ListSinksRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListSinksRequest buildPartial() {
       com.google.logging.v2.ListSinksRequest result = new com.google.logging.v2.ListSinksRequest(this);
       result.parent_ = parent_;
@@ -468,39 +453,32 @@ public com.google.logging.v2.ListSinksRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.ListSinksRequest) {
         return mergeFrom((com.google.logging.v2.ListSinksRequest)other);
@@ -528,12 +506,10 @@ public Builder mergeFrom(com.google.logging.v2.ListSinksRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -808,13 +784,11 @@ public Builder clearPageSize() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -836,12 +810,11 @@ public static com.google.logging.v2.ListSinksRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListSinksRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListSinksRequest(input, extensionRegistry);
+        return new ListSinksRequest(input, extensionRegistry);
     }
   };
 
@@ -854,7 +827,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.ListSinksRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksResponse.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksResponse.java
index 602b6b98c5bf..bba086fb3ec0 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksResponse.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksResponse.java
@@ -34,9 +34,6 @@ private ListSinksResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListSinksResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               sinks_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListSinksResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListSinksResponse(
     return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListSinksResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListSinksResponse_fieldAccessorTable
@@ -201,7 +197,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -211,7 +206,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < sinks_.size(); i++) {
@@ -223,7 +217,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.logging.v2.ListSinksResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.ListSinksResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListSinksResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListSinksResponse_fieldAccessorTable
@@ -408,7 +398,6 @@ private void maybeForceBuilderInitialization() {
         getSinksFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (sinksBuilder_ == null) {
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_ListSinksResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListSinksResponse getDefaultInstanceForType() {
       return com.google.logging.v2.ListSinksResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListSinksResponse build() {
       com.google.logging.v2.ListSinksResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public com.google.logging.v2.ListSinksResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.ListSinksResponse buildPartial() {
       com.google.logging.v2.ListSinksResponse result = new com.google.logging.v2.ListSinksResponse(this);
       int from_bitField0_ = bitField0_;
@@ -462,39 +447,32 @@ public com.google.logging.v2.ListSinksResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.ListSinksResponse) {
         return mergeFrom((com.google.logging.v2.ListSinksResponse)other);
@@ -541,12 +519,10 @@ public Builder mergeFrom(com.google.logging.v2.ListSinksResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -976,13 +952,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1004,12 +978,11 @@ public static com.google.logging.v2.ListSinksResponse getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListSinksResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListSinksResponse(input, extensionRegistry);
+        return new ListSinksResponse(input, extensionRegistry);
     }
   };
 
@@ -1022,7 +995,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.ListSinksResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntry.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntry.java
index 374ad8a5b193..8dd84de62e55 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntry.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntry.java
@@ -37,9 +37,6 @@ private LogEntry(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private LogEntry(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             com.google.protobuf.Any.Builder subBuilder = null;
             if (payloadCase_ == 2) {
@@ -219,13 +223,6 @@ private LogEntry(
             spanId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -244,7 +241,6 @@ private LogEntry(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -255,7 +251,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LogEntryProto.internal_static_google_logging_v2_LogEntry_fieldAccessorTable
@@ -679,7 +674,6 @@ public int getSeverityValue() {
    * .google.logging.type.LogSeverity severity = 10;
    */
   public com.google.logging.type.LogSeverity getSeverity() {
-    @SuppressWarnings("deprecation")
     com.google.logging.type.LogSeverity result = com.google.logging.type.LogSeverity.valueOf(severity_);
     return result == null ? com.google.logging.type.LogSeverity.UNRECOGNIZED : result;
   }
@@ -1076,7 +1070,6 @@ public com.google.logging.v2.LogEntrySourceLocationOrBuilder getSourceLocationOr
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1086,7 +1079,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (payloadCase_ == 2) {
@@ -1143,7 +1135,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1439,7 +1430,6 @@ public static com.google.logging.v2.LogEntry parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1447,7 +1437,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.LogEntry prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1497,7 +1486,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LogEntryProto.internal_static_google_logging_v2_LogEntry_fieldAccessorTable
@@ -1520,7 +1508,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       logName_ = "";
@@ -1581,18 +1568,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LogEntryProto.internal_static_google_logging_v2_LogEntry_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.LogEntry getDefaultInstanceForType() {
       return com.google.logging.v2.LogEntry.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.LogEntry build() {
       com.google.logging.v2.LogEntry result = buildPartial();
       if (!result.isInitialized()) {
@@ -1601,7 +1585,6 @@ public com.google.logging.v2.LogEntry build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.LogEntry buildPartial() {
       com.google.logging.v2.LogEntry result = new com.google.logging.v2.LogEntry(this);
       int from_bitField0_ = bitField0_;
@@ -1671,39 +1654,32 @@ public com.google.logging.v2.LogEntry buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.LogEntry) {
         return mergeFrom((com.google.logging.v2.LogEntry)other);
@@ -1781,12 +1757,10 @@ public Builder mergeFrom(com.google.logging.v2.LogEntry other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3085,7 +3059,6 @@ public Builder setSeverityValue(int value) {
      * .google.logging.type.LogSeverity severity = 10;
      */
     public com.google.logging.type.LogSeverity getSeverity() {
-      @SuppressWarnings("deprecation")
       com.google.logging.type.LogSeverity result = com.google.logging.type.LogSeverity.valueOf(severity_);
       return result == null ? com.google.logging.type.LogSeverity.UNRECOGNIZED : result;
     }
@@ -4257,13 +4230,11 @@ public com.google.logging.v2.LogEntrySourceLocationOrBuilder getSourceLocationOr
       }
       return sourceLocationBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -4285,12 +4256,11 @@ public static com.google.logging.v2.LogEntry getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LogEntry parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LogEntry(input, extensionRegistry);
+        return new LogEntry(input, extensionRegistry);
     }
   };
 
@@ -4303,7 +4273,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.LogEntry getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryOperation.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryOperation.java
index 38c0ffcb9b31..a8cd0003f86b 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryOperation.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryOperation.java
@@ -37,9 +37,6 @@ private LogEntryOperation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private LogEntryOperation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private LogEntryOperation(
             last_ = input.readBool();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private LogEntryOperation(
     return com.google.logging.v2.LogEntryProto.internal_static_google_logging_v2_LogEntryOperation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LogEntryProto.internal_static_google_logging_v2_LogEntryOperation_fieldAccessorTable
@@ -222,7 +218,6 @@ public boolean getLast() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -232,7 +227,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getIdBytes().isEmpty()) {
@@ -250,7 +244,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -390,7 +383,6 @@ public static com.google.logging.v2.LogEntryOperation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -398,7 +390,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.LogEntryOperation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -427,7 +418,6 @@ public static final class Builder extends
       return com.google.logging.v2.LogEntryProto.internal_static_google_logging_v2_LogEntryOperation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LogEntryProto.internal_static_google_logging_v2_LogEntryOperation_fieldAccessorTable
@@ -450,7 +440,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       id_ = "";
@@ -464,18 +453,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LogEntryProto.internal_static_google_logging_v2_LogEntryOperation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.LogEntryOperation getDefaultInstanceForType() {
       return com.google.logging.v2.LogEntryOperation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.LogEntryOperation build() {
       com.google.logging.v2.LogEntryOperation result = buildPartial();
       if (!result.isInitialized()) {
@@ -484,7 +470,6 @@ public com.google.logging.v2.LogEntryOperation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.LogEntryOperation buildPartial() {
       com.google.logging.v2.LogEntryOperation result = new com.google.logging.v2.LogEntryOperation(this);
       result.id_ = id_;
@@ -495,39 +480,32 @@ public com.google.logging.v2.LogEntryOperation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.LogEntryOperation) {
         return mergeFrom((com.google.logging.v2.LogEntryOperation)other);
@@ -558,12 +536,10 @@ public Builder mergeFrom(com.google.logging.v2.LogEntryOperation other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -850,13 +826,11 @@ public Builder clearLast() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -878,12 +852,11 @@ public static com.google.logging.v2.LogEntryOperation getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LogEntryOperation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LogEntryOperation(input, extensionRegistry);
+        return new LogEntryOperation(input, extensionRegistry);
     }
   };
 
@@ -896,7 +869,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.LogEntryOperation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryProto.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryProto.java
index b9379914d819..41f975810dea 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryProto.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryProto.java
@@ -52,7 +52,7 @@ public static void registerAllExtensions(
       "tobuf/struct.proto\032\037google/protobuf/time" +
       "stamp.proto\"\363\005\n\010LogEntry\022\020\n\010log_name\030\014 \001" +
       "(\t\022/\n\010resource\030\010 \001(\0132\035.google.api.Monito" +
-      "redResource\022-\n\rproto_payload\030\002 \001(\0132\024.goo" +
+      "redResource\022-\n\rproto_payload\030\002 \001(\0132\024.goo",
       "gle.protobuf.AnyH\000\022\026\n\014text_payload\030\003 \001(\t" +
       "H\000\022/\n\014json_payload\030\006 \001(\0132\027.google.protob" +
       "uf.StructH\000\022-\n\ttimestamp\030\t \001(\0132\032.google." +
@@ -62,7 +62,7 @@ public static void registerAllExtensions(
       "erity\022\021\n\tinsert_id\030\004 \001(\t\0226\n\014http_request" +
       "\030\007 \001(\0132 .google.logging.type.HttpRequest" +
       "\0227\n\006labels\030\013 \003(\0132\'.google.logging.v2.Log" +
-      "Entry.LabelsEntry\0227\n\010metadata\030\031 \001(\0132%.go" +
+      "Entry.LabelsEntry\0227\n\010metadata\030\031 \001(\0132%.go",
       "ogle.api.MonitoredResourceMetadata\0227\n\top" +
       "eration\030\017 \001(\0132$.google.logging.v2.LogEnt" +
       "ryOperation\022\r\n\005trace\030\026 \001(\t\022\017\n\007span_id\030\033 " +
@@ -72,7 +72,7 @@ public static void registerAllExtensions(
       "\n\007payload\"N\n\021LogEntryOperation\022\n\n\002id\030\001 \001" +
       "(\t\022\020\n\010producer\030\002 \001(\t\022\r\n\005first\030\003 \001(\010\022\014\n\004l" +
       "ast\030\004 \001(\010\"F\n\026LogEntrySourceLocation\022\014\n\004f" +
-      "ile\030\001 \001(\t\022\014\n\004line\030\002 \001(\003\022\020\n\010function\030\003 \001(" +
+      "ile\030\001 \001(\t\022\014\n\004line\030\002 \001(\003\022\020\n\010function\030\003 \001(",
       "\tB\231\001\n\025com.google.logging.v2B\rLogEntryPro" +
       "toP\001Z8google.golang.org/genproto/googlea" +
       "pis/logging/v2;logging\370\001\001\252\002\027Google.Cloud" +
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntrySourceLocation.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntrySourceLocation.java
index abed2c2ed6ce..bcd091d2038b 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntrySourceLocation.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntrySourceLocation.java
@@ -36,9 +36,6 @@ private LogEntrySourceLocation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private LogEntrySourceLocation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -67,13 +71,6 @@ private LogEntrySourceLocation(
             function_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private LogEntrySourceLocation(
     return com.google.logging.v2.LogEntryProto.internal_static_google_logging_v2_LogEntrySourceLocation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LogEntryProto.internal_static_google_logging_v2_LogEntrySourceLocation_fieldAccessorTable
@@ -210,7 +206,6 @@ public java.lang.String getFunction() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -220,7 +215,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getFileBytes().isEmpty()) {
@@ -235,7 +229,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -366,7 +359,6 @@ public static com.google.logging.v2.LogEntrySourceLocation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -374,7 +366,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.LogEntrySourceLocation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -403,7 +394,6 @@ public static final class Builder extends
       return com.google.logging.v2.LogEntryProto.internal_static_google_logging_v2_LogEntrySourceLocation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LogEntryProto.internal_static_google_logging_v2_LogEntrySourceLocation_fieldAccessorTable
@@ -426,7 +416,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       file_ = "";
@@ -438,18 +427,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LogEntryProto.internal_static_google_logging_v2_LogEntrySourceLocation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.LogEntrySourceLocation getDefaultInstanceForType() {
       return com.google.logging.v2.LogEntrySourceLocation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.LogEntrySourceLocation build() {
       com.google.logging.v2.LogEntrySourceLocation result = buildPartial();
       if (!result.isInitialized()) {
@@ -458,7 +444,6 @@ public com.google.logging.v2.LogEntrySourceLocation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.LogEntrySourceLocation buildPartial() {
       com.google.logging.v2.LogEntrySourceLocation result = new com.google.logging.v2.LogEntrySourceLocation(this);
       result.file_ = file_;
@@ -468,39 +453,32 @@ public com.google.logging.v2.LogEntrySourceLocation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.LogEntrySourceLocation) {
         return mergeFrom((com.google.logging.v2.LogEntrySourceLocation)other);
@@ -528,12 +506,10 @@ public Builder mergeFrom(com.google.logging.v2.LogEntrySourceLocation other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -800,13 +776,11 @@ public Builder setFunctionBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -828,12 +802,11 @@ public static com.google.logging.v2.LogEntrySourceLocation getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LogEntrySourceLocation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LogEntrySourceLocation(input, extensionRegistry);
+        return new LogEntrySourceLocation(input, extensionRegistry);
     }
   };
 
@@ -846,7 +819,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.LogEntrySourceLocation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusion.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusion.java
index 72a08e50dcf4..fd6f2e084f7d 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusion.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusion.java
@@ -41,9 +41,6 @@ private LogExclusion(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -55,6 +52,13 @@ private LogExclusion(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -78,13 +82,6 @@ private LogExclusion(
             disabled_ = input.readBool();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -102,7 +99,6 @@ private LogExclusion(
     return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_LogExclusion_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_LogExclusion_fieldAccessorTable
@@ -271,7 +267,6 @@ public boolean getDisabled() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -281,7 +276,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -299,7 +293,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -437,7 +430,6 @@ public static com.google.logging.v2.LogExclusion parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -445,7 +437,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.LogExclusion prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -478,7 +469,6 @@ public static final class Builder extends
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_LogExclusion_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_LogExclusion_fieldAccessorTable
@@ -501,7 +491,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -515,18 +504,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_LogExclusion_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.LogExclusion getDefaultInstanceForType() {
       return com.google.logging.v2.LogExclusion.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.LogExclusion build() {
       com.google.logging.v2.LogExclusion result = buildPartial();
       if (!result.isInitialized()) {
@@ -535,7 +521,6 @@ public com.google.logging.v2.LogExclusion build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.LogExclusion buildPartial() {
       com.google.logging.v2.LogExclusion result = new com.google.logging.v2.LogExclusion(this);
       result.name_ = name_;
@@ -546,39 +531,32 @@ public com.google.logging.v2.LogExclusion buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.LogExclusion) {
         return mergeFrom((com.google.logging.v2.LogExclusion)other);
@@ -610,12 +588,10 @@ public Builder mergeFrom(com.google.logging.v2.LogExclusion other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -992,13 +968,11 @@ public Builder clearDisabled() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1020,12 +994,11 @@ public static com.google.logging.v2.LogExclusion getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LogExclusion parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LogExclusion(input, extensionRegistry);
+        return new LogExclusion(input, extensionRegistry);
     }
   };
 
@@ -1038,7 +1011,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.LogExclusion getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetric.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetric.java
index 800a86b07ce4..3edddce77241 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetric.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetric.java
@@ -42,9 +42,6 @@ private LogMetric(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -56,6 +53,13 @@ private LogMetric(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -125,13 +129,6 @@ private LogMetric(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -150,7 +147,6 @@ private LogMetric(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -161,7 +157,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_LogMetric_fieldAccessorTable
@@ -798,13 +793,11 @@ public com.google.api.Distribution.BucketOptionsOrBuilder getBucketOptionsOrBuil
    * .google.logging.v2.LogMetric.ApiVersion version = 4 [deprecated = true];
    */
   @java.lang.Deprecated public com.google.logging.v2.LogMetric.ApiVersion getVersion() {
-    @SuppressWarnings("deprecation")
     com.google.logging.v2.LogMetric.ApiVersion result = com.google.logging.v2.LogMetric.ApiVersion.valueOf(version_);
     return result == null ? com.google.logging.v2.LogMetric.ApiVersion.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -814,7 +807,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -847,7 +839,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1032,7 +1023,6 @@ public static com.google.logging.v2.LogMetric parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1040,7 +1030,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.LogMetric prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1095,7 +1084,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_LogMetric_fieldAccessorTable
@@ -1118,7 +1106,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -1147,18 +1134,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_LogMetric_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.LogMetric getDefaultInstanceForType() {
       return com.google.logging.v2.LogMetric.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.LogMetric build() {
       com.google.logging.v2.LogMetric result = buildPartial();
       if (!result.isInitialized()) {
@@ -1167,7 +1151,6 @@ public com.google.logging.v2.LogMetric build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.LogMetric buildPartial() {
       com.google.logging.v2.LogMetric result = new com.google.logging.v2.LogMetric(this);
       int from_bitField0_ = bitField0_;
@@ -1194,39 +1177,32 @@ public com.google.logging.v2.LogMetric buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.LogMetric) {
         return mergeFrom((com.google.logging.v2.LogMetric)other);
@@ -1270,12 +1246,10 @@ public Builder mergeFrom(com.google.logging.v2.LogMetric other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2541,7 +2515,6 @@ public com.google.api.Distribution.BucketOptionsOrBuilder getBucketOptionsOrBuil
      * .google.logging.v2.LogMetric.ApiVersion version = 4 [deprecated = true];
      */
     @java.lang.Deprecated public com.google.logging.v2.LogMetric.ApiVersion getVersion() {
-      @SuppressWarnings("deprecation")
       com.google.logging.v2.LogMetric.ApiVersion result = com.google.logging.v2.LogMetric.ApiVersion.valueOf(version_);
       return result == null ? com.google.logging.v2.LogMetric.ApiVersion.UNRECOGNIZED : result;
     }
@@ -2576,13 +2549,11 @@ public com.google.api.Distribution.BucketOptionsOrBuilder getBucketOptionsOrBuil
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2604,12 +2575,11 @@ public static com.google.logging.v2.LogMetric getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LogMetric parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LogMetric(input, extensionRegistry);
+        return new LogMetric(input, extensionRegistry);
     }
   };
 
@@ -2622,7 +2592,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.LogMetric getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSink.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSink.java
index 1df7360f6fa0..459eeee2dd9d 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSink.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSink.java
@@ -42,9 +42,6 @@ private LogSink(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -56,6 +53,13 @@ private LogSink(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -117,13 +121,6 @@ private LogSink(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -141,7 +138,6 @@ private LogSink(
     return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_LogSink_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_LogSink_fieldAccessorTable
@@ -464,7 +460,6 @@ public java.lang.String getFilter() {
    * .google.logging.v2.LogSink.VersionFormat output_version_format = 6 [deprecated = true];
    */
   @java.lang.Deprecated public com.google.logging.v2.LogSink.VersionFormat getOutputVersionFormat() {
-    @SuppressWarnings("deprecation")
     com.google.logging.v2.LogSink.VersionFormat result = com.google.logging.v2.LogSink.VersionFormat.valueOf(outputVersionFormat_);
     return result == null ? com.google.logging.v2.LogSink.VersionFormat.UNRECOGNIZED : result;
   }
@@ -626,7 +621,6 @@ public boolean getIncludeChildren() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -636,7 +630,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -666,7 +659,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -844,7 +836,6 @@ public static com.google.logging.v2.LogSink parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -852,7 +843,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.LogSink prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -884,7 +874,6 @@ public static final class Builder extends
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_LogSink_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_LogSink_fieldAccessorTable
@@ -907,7 +896,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -937,18 +925,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_LogSink_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.LogSink getDefaultInstanceForType() {
       return com.google.logging.v2.LogSink.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.LogSink build() {
       com.google.logging.v2.LogSink result = buildPartial();
       if (!result.isInitialized()) {
@@ -957,7 +942,6 @@ public com.google.logging.v2.LogSink build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.LogSink buildPartial() {
       com.google.logging.v2.LogSink result = new com.google.logging.v2.LogSink(this);
       result.name_ = name_;
@@ -980,39 +964,32 @@ public com.google.logging.v2.LogSink buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.LogSink) {
         return mergeFrom((com.google.logging.v2.LogSink)other);
@@ -1057,12 +1034,10 @@ public Builder mergeFrom(com.google.logging.v2.LogSink other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1457,7 +1432,6 @@ public Builder setFilterBytes(
      * .google.logging.v2.LogSink.VersionFormat output_version_format = 6 [deprecated = true];
      */
     @java.lang.Deprecated public com.google.logging.v2.LogSink.VersionFormat getOutputVersionFormat() {
-      @SuppressWarnings("deprecation")
       com.google.logging.v2.LogSink.VersionFormat result = com.google.logging.v2.LogSink.VersionFormat.valueOf(outputVersionFormat_);
       return result == null ? com.google.logging.v2.LogSink.VersionFormat.UNRECOGNIZED : result;
     }
@@ -2018,13 +1992,11 @@ public Builder clearIncludeChildren() {
       }
       return endTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2046,12 +2018,11 @@ public static com.google.logging.v2.LogSink getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LogSink parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LogSink(input, extensionRegistry);
+        return new LogSink(input, extensionRegistry);
     }
   };
 
@@ -2064,7 +2035,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.LogSink getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingConfigProto.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingConfigProto.java
index 48e9f25dcc53..171c0fdee739 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingConfigProto.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingConfigProto.java
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "er\030\005 \001(\t\022K\n\025output_version_format\030\006 \001(\0162" +
       "(.google.logging.v2.LogSink.VersionForma" +
       "tB\002\030\001\022\027\n\017writer_identity\030\010 \001(\t\022\030\n\020includ" +
-      "e_children\030\t \001(\010\0222\n\nstart_time\030\n \001(\0132\032.g" +
+      "e_children\030\t \001(\010\0222\n\nstart_time\030\n \001(\0132\032.g",
       "oogle.protobuf.TimestampB\002\030\001\0220\n\010end_time" +
       "\030\013 \001(\0132\032.google.protobuf.TimestampB\002\030\001\"?" +
       "\n\rVersionFormat\022\036\n\032VERSION_FORMAT_UNSPEC" +
@@ -112,7 +112,7 @@ public static void registerAllExtensions(
       ")\n\005sinks\030\001 \003(\0132\032.google.logging.v2.LogSi" +
       "nk\022\027\n\017next_page_token\030\002 \001(\t\"#\n\016GetSinkRe" +
       "quest\022\021\n\tsink_name\030\001 \001(\t\"m\n\021CreateSinkRe" +
-      "quest\022\016\n\006parent\030\001 \001(\t\022(\n\004sink\030\002 \001(\0132\032.go" +
+      "quest\022\016\n\006parent\030\001 \001(\t\022(\n\004sink\030\002 \001(\0132\032.go",
       "ogle.logging.v2.LogSink\022\036\n\026unique_writer" +
       "_identity\030\003 \001(\010\"\241\001\n\021UpdateSinkRequest\022\021\n" +
       "\tsink_name\030\001 \001(\t\022(\n\004sink\030\002 \001(\0132\032.google." +
@@ -122,7 +122,7 @@ public static void registerAllExtensions(
       "\022\021\n\tsink_name\030\001 \001(\t\"S\n\014LogExclusion\022\014\n\004n" +
       "ame\030\001 \001(\t\022\023\n\013description\030\002 \001(\t\022\016\n\006filter" +
       "\030\003 \001(\t\022\020\n\010disabled\030\004 \001(\010\"N\n\025ListExclusio" +
-      "nsRequest\022\016\n\006parent\030\001 \001(\t\022\022\n\npage_token\030" +
+      "nsRequest\022\016\n\006parent\030\001 \001(\t\022\022\n\npage_token\030",
       "\002 \001(\t\022\021\n\tpage_size\030\003 \001(\005\"f\n\026ListExclusio" +
       "nsResponse\0223\n\nexclusions\030\001 \003(\0132\037.google." +
       "logging.v2.LogExclusion\022\027\n\017next_page_tok" +
@@ -132,7 +132,7 @@ public static void registerAllExtensions(
       "ing.v2.LogExclusion\"\213\001\n\026UpdateExclusionR" +
       "equest\022\014\n\004name\030\001 \001(\t\0222\n\texclusion\030\002 \001(\0132" +
       "\037.google.logging.v2.LogExclusion\022/\n\013upda" +
-      "te_mask\030\003 \001(\0132\032.google.protobuf.FieldMas" +
+      "te_mask\030\003 \001(\0132\032.google.protobuf.FieldMas",
       "k\"&\n\026DeleteExclusionRequest\022\014\n\004name\030\001 \001(" +
       "\t2\224\031\n\017ConfigServiceV2\022\207\002\n\tListSinks\022#.go" +
       "ogle.logging.v2.ListSinksRequest\032$.googl" +
@@ -142,7 +142,7 @@ public static void registerAllExtensions(
       "ations/*}/sinksZ\036\022\034/v2/{parent=folders/*" +
       "}/sinksZ&\022$/v2/{parent=billingAccounts/*" +
       "}/sinks\022\222\002\n\007GetSink\022!.google.logging.v2." +
-      "GetSinkRequest\032\032.google.logging.v2.LogSi" +
+      "GetSinkRequest\032\032.google.logging.v2.LogSi",
       "nk\"\307\001\202\323\344\223\002\300\001\022\033/v2/{sink_name=*/*/sinks/*" +
       "}Z$\022\"/v2/{sink_name=projects/*/sinks/*}Z" +
       ")\022\'/v2/{sink_name=organizations/*/sinks/" +
@@ -152,7 +152,7 @@ public static void registerAllExtensions(
       "CreateSinkRequest\032\032.google.logging.v2.Lo" +
       "gSink\"\314\001\202\323\344\223\002\305\001\"\026/v2/{parent=*/*}/sinks:" +
       "\004sinkZ%\"\035/v2/{parent=projects/*}/sinks:\004" +
-      "sinkZ*\"\"/v2/{parent=organizations/*}/sin" +
+      "sinkZ*\"\"/v2/{parent=organizations/*}/sin",
       "ks:\004sinkZ$\"\034/v2/{parent=folders/*}/sinks" +
       ":\004sinkZ,\"$/v2/{parent=billingAccounts/*}" +
       "/sinks:\004sink\022\361\003\n\nUpdateSink\022$.google.log" +
@@ -162,7 +162,7 @@ public static void registerAllExtensions(
       "jects/*/sinks/*}:\004sinkZ/\032\'/v2/{sink_name" +
       "=organizations/*/sinks/*}:\004sinkZ)\032!/v2/{" +
       "sink_name=folders/*/sinks/*}:\004sinkZ1\032)/v" +
-      "2/{sink_name=billingAccounts/*/sinks/*}:" +
+      "2/{sink_name=billingAccounts/*/sinks/*}:",
       "\004sinkZ*2\"/v2/{sink_name=projects/*/sinks" +
       "/*}:\004sinkZ/2\'/v2/{sink_name=organization" +
       "s/*/sinks/*}:\004sinkZ)2!/v2/{sink_name=fol" +
@@ -172,7 +172,7 @@ public static void registerAllExtensions(
       "quest\032\026.google.protobuf.Empty\"\307\001\202\323\344\223\002\300\001*" +
       "\033/v2/{sink_name=*/*/sinks/*}Z$*\"/v2/{sin" +
       "k_name=projects/*/sinks/*}Z)*\'/v2/{sink_" +
-      "name=organizations/*/sinks/*}Z#*!/v2/{si" +
+      "name=organizations/*/sinks/*}Z#*!/v2/{si",
       "nk_name=folders/*/sinks/*}Z+*)/v2/{sink_" +
       "name=billingAccounts/*/sinks/*}\022\257\002\n\016List" +
       "Exclusions\022(.google.logging.v2.ListExclu" +
@@ -182,7 +182,7 @@ public static void registerAllExtensions(
       "}/exclusionsZ)\022\'/v2/{parent=organization" +
       "s/*}/exclusionsZ#\022!/v2/{parent=folders/*" +
       "}/exclusionsZ+\022)/v2/{parent=billingAccou" +
-      "nts/*}/exclusions\022\241\002\n\014GetExclusion\022&.goo" +
+      "nts/*}/exclusions\022\241\002\n\014GetExclusion\022&.goo",
       "gle.logging.v2.GetExclusionRequest\032\037.goo" +
       "gle.logging.v2.LogExclusion\"\307\001\202\323\344\223\002\300\001\022\033/" +
       "v2/{name=*/*/exclusions/*}Z$\022\"/v2/{name=" +
@@ -192,7 +192,7 @@ public static void registerAllExtensions(
       "llingAccounts/*/exclusions/*}\022\336\002\n\017Create" +
       "Exclusion\022).google.logging.v2.CreateExcl" +
       "usionRequest\032\037.google.logging.v2.LogExcl" +
-      "usion\"\376\001\202\323\344\223\002\367\001\"\033/v2/{parent=*/*}/exclus" +
+      "usion\"\376\001\202\323\344\223\002\367\001\"\033/v2/{parent=*/*}/exclus",
       "ions:\texclusionZ/\"\"/v2/{parent=projects/" +
       "*}/exclusions:\texclusionZ4\"\'/v2/{parent=" +
       "organizations/*}/exclusions:\texclusionZ." +
@@ -202,7 +202,7 @@ public static void registerAllExtensions(
       "on\022).google.logging.v2.UpdateExclusionRe" +
       "quest\032\037.google.logging.v2.LogExclusion\"\376" +
       "\001\202\323\344\223\002\367\0012\033/v2/{name=*/*/exclusions/*}:\te" +
-      "xclusionZ/2\"/v2/{name=projects/*/exclusi" +
+      "xclusionZ/2\"/v2/{name=projects/*/exclusi",
       "ons/*}:\texclusionZ42\'/v2/{name=organizat" +
       "ions/*/exclusions/*}:\texclusionZ.2!/v2/{" +
       "name=folders/*/exclusions/*}:\texclusionZ" +
@@ -212,7 +212,7 @@ public static void registerAllExtensions(
       ".google.protobuf.Empty\"\307\001\202\323\344\223\002\300\001*\033/v2/{n" +
       "ame=*/*/exclusions/*}Z$*\"/v2/{name=proje" +
       "cts/*/exclusions/*}Z)*\'/v2/{name=organiz" +
-      "ations/*/exclusions/*}Z#*!/v2/{name=fold" +
+      "ations/*/exclusions/*}Z#*!/v2/{name=fold",
       "ers/*/exclusions/*}Z+*)/v2/{name=billing" +
       "Accounts/*/exclusions/*}B\236\001\n\025com.google." +
       "logging.v2B\022LoggingConfigProtoP\001Z8google" +
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingMetricsProto.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingMetricsProto.java
index 1ce3e1b01320..ededde613901 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingMetricsProto.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingMetricsProto.java
@@ -72,7 +72,7 @@ public static void registerAllExtensions(
       "\013description\030\002 \001(\t\022\016\n\006filter\030\003 \001(\t\0227\n\021me" +
       "tric_descriptor\030\005 \001(\0132\034.google.api.Metri" +
       "cDescriptor\022\027\n\017value_extractor\030\006 \001(\t\022K\n\020" +
-      "label_extractors\030\007 \003(\01321.google.logging." +
+      "label_extractors\030\007 \003(\01321.google.logging.",
       "v2.LogMetric.LabelExtractorsEntry\022>\n\016buc" +
       "ket_options\030\010 \001(\0132&.google.api.Distribut" +
       "ion.BucketOptions\022<\n\007version\030\004 \001(\0162\'.goo" +
@@ -82,7 +82,7 @@ public static void registerAllExtensions(
       "\002V1\020\001\"N\n\025ListLogMetricsRequest\022\016\n\006parent" +
       "\030\001 \001(\t\022\022\n\npage_token\030\002 \001(\t\022\021\n\tpage_size\030" +
       "\003 \001(\005\"`\n\026ListLogMetricsResponse\022-\n\007metri" +
-      "cs\030\001 \003(\0132\034.google.logging.v2.LogMetric\022\027" +
+      "cs\030\001 \003(\0132\034.google.logging.v2.LogMetric\022\027",
       "\n\017next_page_token\030\002 \001(\t\"*\n\023GetLogMetricR" +
       "equest\022\023\n\013metric_name\030\001 \001(\t\"V\n\026CreateLog" +
       "MetricRequest\022\016\n\006parent\030\001 \001(\t\022,\n\006metric\030" +
@@ -92,7 +92,7 @@ public static void registerAllExtensions(
       "ogMetric\"-\n\026DeleteLogMetricRequest\022\023\n\013me" +
       "tric_name\030\001 \001(\t2\324\005\n\020MetricsServiceV2\022\216\001\n" +
       "\016ListLogMetrics\022(.google.logging.v2.List" +
-      "LogMetricsRequest\032).google.logging.v2.Li" +
+      "LogMetricsRequest\032).google.logging.v2.Li",
       "stLogMetricsResponse\"\'\202\323\344\223\002!\022\037/v2/{paren" +
       "t=projects/*}/metrics\022\204\001\n\014GetLogMetric\022&" +
       ".google.logging.v2.GetLogMetricRequest\032\034" +
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "ateLogMetricRequest\032\034.google.logging.v2." +
       "LogMetric\"/\202\323\344\223\002)\"\037/v2/{parent=projects/" +
       "*}/metrics:\006metric\022\222\001\n\017UpdateLogMetric\022)" +
-      ".google.logging.v2.UpdateLogMetricReques" +
+      ".google.logging.v2.UpdateLogMetricReques",
       "t\032\034.google.logging.v2.LogMetric\"6\202\323\344\223\0020\032" +
       "&/v2/{metric_name=projects/*/metrics/*}:" +
       "\006metric\022\204\001\n\017DeleteLogMetric\022).google.log" +
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingProto.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingProto.java
index 5d493db25f79..012332552b75 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingProto.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingProto.java
@@ -92,7 +92,7 @@ public static void registerAllExtensions(
       "mp.proto\032\027google/rpc/status.proto\"$\n\020Del" +
       "eteLogRequest\022\020\n\010log_name\030\001 \001(\t\"\251\002\n\026Writ" +
       "eLogEntriesRequest\022\020\n\010log_name\030\001 \001(\t\022/\n\010" +
-      "resource\030\002 \001(\0132\035.google.api.MonitoredRes" +
+      "resource\030\002 \001(\0132\035.google.api.MonitoredRes",
       "ource\022E\n\006labels\030\003 \003(\01325.google.logging.v" +
       "2.WriteLogEntriesRequest.LabelsEntry\022,\n\007" +
       "entries\030\004 \003(\0132\033.google.logging.v2.LogEnt" +
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "\001\n\034WriteLogEntriesPartialErrors\022]\n\020log_e" +
       "ntry_errors\030\001 \003(\0132C.google.logging.v2.Wr" +
       "iteLogEntriesPartialErrors.LogEntryError" +
-      "sEntry\032I\n\023LogEntryErrorsEntry\022\013\n\003key\030\001 \001" +
+      "sEntry\032I\n\023LogEntryErrorsEntry\022\013\n\003key\030\001 \001",
       "(\005\022!\n\005value\030\002 \001(\0132\022.google.rpc.Status:\0028" +
       "\001\"\221\001\n\025ListLogEntriesRequest\022\027\n\013project_i" +
       "ds\030\001 \003(\tB\002\030\001\022\026\n\016resource_names\030\010 \003(\t\022\016\n\006" +
@@ -112,7 +112,7 @@ public static void registerAllExtensions(
       "e.logging.v2.LogEntry\022\027\n\017next_page_token" +
       "\030\002 \001(\t\"P\n\'ListMonitoredResourceDescripto" +
       "rsRequest\022\021\n\tpage_size\030\001 \001(\005\022\022\n\npage_tok" +
-      "en\030\002 \001(\t\"\212\001\n(ListMonitoredResourceDescri" +
+      "en\030\002 \001(\t\"\212\001\n(ListMonitoredResourceDescri",
       "ptorsResponse\022E\n\024resource_descriptors\030\001 " +
       "\003(\0132\'.google.api.MonitoredResourceDescri" +
       "ptor\022\027\n\017next_page_token\030\002 \001(\t\"H\n\017ListLog" +
@@ -122,7 +122,7 @@ public static void registerAllExtensions(
       "n\030\002 \001(\t2\330\007\n\020LoggingServiceV2\022\353\001\n\tDeleteL" +
       "og\022#.google.logging.v2.DeleteLogRequest\032" +
       "\026.google.protobuf.Empty\"\240\001\202\323\344\223\002\231\001* /v2/{" +
-      "log_name=projects/*/logs/*}Z\'*%/v2/{log_" +
+      "log_name=projects/*/logs/*}Z\'*%/v2/{log_",
       "name=organizations/*/logs/*}Z!*\037/v2/{log" +
       "_name=folders/*/logs/*}Z)*\'/v2/{log_name" +
       "=billingAccounts/*/logs/*}\022\206\001\n\017WriteLogE" +
@@ -132,7 +132,7 @@ public static void registerAllExtensions(
       ":\001*\022\202\001\n\016ListLogEntries\022(.google.logging." +
       "v2.ListLogEntriesRequest\032).google.loggin" +
       "g.v2.ListLogEntriesResponse\"\033\202\323\344\223\002\025\"\020/v2" +
-      "/entries:list:\001*\022\305\001\n ListMonitoredResour" +
+      "/entries:list:\001*\022\305\001\n ListMonitoredResour",
       "ceDescriptors\022:.google.logging.v2.ListMo" +
       "nitoredResourceDescriptorsRequest\032;.goog" +
       "le.logging.v2.ListMonitoredResourceDescr" +
@@ -142,7 +142,7 @@ public static void registerAllExtensions(
       "ng.v2.ListLogsResponse\"\251\001\202\323\344\223\002\242\001\022\025/v2/{p" +
       "arent=*/*}/logsZ\036\022\034/v2/{parent=projects/" +
       "*}/logsZ#\022!/v2/{parent=organizations/*}/" +
-      "logsZ\035\022\033/v2/{parent=folders/*}/logsZ%\022#/" +
+      "logsZ\035\022\033/v2/{parent=folders/*}/logsZ%\022#/",
       "v2/{parent=billingAccounts/*}/logsB\230\001\n\025c" +
       "om.google.logging.v2B\014LoggingProtoP\001Z8go" +
       "ogle.golang.org/genproto/googleapis/logg" +
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateExclusionRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateExclusionRequest.java
index 7555b729a5f8..4f64d149b867 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateExclusionRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateExclusionRequest.java
@@ -33,9 +33,6 @@ private UpdateExclusionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private UpdateExclusionRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -79,13 +83,6 @@ private UpdateExclusionRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private UpdateExclusionRequest(
     return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_UpdateExclusionRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_UpdateExclusionRequest_fieldAccessorTable
@@ -248,7 +244,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -258,7 +253,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -273,7 +267,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -414,7 +407,6 @@ public static com.google.logging.v2.UpdateExclusionRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -422,7 +414,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.UpdateExclusionRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -450,7 +441,6 @@ public static final class Builder extends
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_UpdateExclusionRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_UpdateExclusionRequest_fieldAccessorTable
@@ -473,7 +463,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -493,18 +482,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_UpdateExclusionRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.UpdateExclusionRequest getDefaultInstanceForType() {
       return com.google.logging.v2.UpdateExclusionRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.UpdateExclusionRequest build() {
       com.google.logging.v2.UpdateExclusionRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -513,7 +499,6 @@ public com.google.logging.v2.UpdateExclusionRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.UpdateExclusionRequest buildPartial() {
       com.google.logging.v2.UpdateExclusionRequest result = new com.google.logging.v2.UpdateExclusionRequest(this);
       result.name_ = name_;
@@ -531,39 +516,32 @@ public com.google.logging.v2.UpdateExclusionRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.UpdateExclusionRequest) {
         return mergeFrom((com.google.logging.v2.UpdateExclusionRequest)other);
@@ -590,12 +568,10 @@ public Builder mergeFrom(com.google.logging.v2.UpdateExclusionRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1087,13 +1063,11 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
       }
       return updateMaskBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1115,12 +1089,11 @@ public static com.google.logging.v2.UpdateExclusionRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateExclusionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateExclusionRequest(input, extensionRegistry);
+        return new UpdateExclusionRequest(input, extensionRegistry);
     }
   };
 
@@ -1133,7 +1106,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.UpdateExclusionRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateLogMetricRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateLogMetricRequest.java
index 90d91a58ed42..22996586022f 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateLogMetricRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateLogMetricRequest.java
@@ -33,9 +33,6 @@ private UpdateLogMetricRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private UpdateLogMetricRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private UpdateLogMetricRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private UpdateLogMetricRequest(
     return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_UpdateLogMetricRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_UpdateLogMetricRequest_fieldAccessorTable
@@ -182,7 +178,6 @@ public com.google.logging.v2.LogMetricOrBuilder getMetricOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -192,7 +187,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getMetricNameBytes().isEmpty()) {
@@ -204,7 +198,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -332,7 +325,6 @@ public static com.google.logging.v2.UpdateLogMetricRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -340,7 +332,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.UpdateLogMetricRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -368,7 +359,6 @@ public static final class Builder extends
       return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_UpdateLogMetricRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_UpdateLogMetricRequest_fieldAccessorTable
@@ -391,7 +381,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       metricName_ = "";
@@ -405,18 +394,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LoggingMetricsProto.internal_static_google_logging_v2_UpdateLogMetricRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.UpdateLogMetricRequest getDefaultInstanceForType() {
       return com.google.logging.v2.UpdateLogMetricRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.UpdateLogMetricRequest build() {
       com.google.logging.v2.UpdateLogMetricRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -425,7 +411,6 @@ public com.google.logging.v2.UpdateLogMetricRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.UpdateLogMetricRequest buildPartial() {
       com.google.logging.v2.UpdateLogMetricRequest result = new com.google.logging.v2.UpdateLogMetricRequest(this);
       result.metricName_ = metricName_;
@@ -438,39 +423,32 @@ public com.google.logging.v2.UpdateLogMetricRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.UpdateLogMetricRequest) {
         return mergeFrom((com.google.logging.v2.UpdateLogMetricRequest)other);
@@ -494,12 +472,10 @@ public Builder mergeFrom(com.google.logging.v2.UpdateLogMetricRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -779,13 +755,11 @@ public com.google.logging.v2.LogMetricOrBuilder getMetricOrBuilder() {
       }
       return metricBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -807,12 +781,11 @@ public static com.google.logging.v2.UpdateLogMetricRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateLogMetricRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateLogMetricRequest(input, extensionRegistry);
+        return new UpdateLogMetricRequest(input, extensionRegistry);
     }
   };
 
@@ -825,7 +798,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.UpdateLogMetricRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateSinkRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateSinkRequest.java
index 89c1f152ebaf..f9004154bd43 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateSinkRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateSinkRequest.java
@@ -34,9 +34,6 @@ private UpdateSinkRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private UpdateSinkRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -85,13 +89,6 @@ private UpdateSinkRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -109,7 +106,6 @@ private UpdateSinkRequest(
     return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_UpdateSinkRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_UpdateSinkRequest_fieldAccessorTable
@@ -294,7 +290,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -304,7 +299,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getSinkNameBytes().isEmpty()) {
@@ -322,7 +316,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -472,7 +465,6 @@ public static com.google.logging.v2.UpdateSinkRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -480,7 +472,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.UpdateSinkRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -508,7 +499,6 @@ public static final class Builder extends
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_UpdateSinkRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_UpdateSinkRequest_fieldAccessorTable
@@ -531,7 +521,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       sinkName_ = "";
@@ -553,18 +542,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LoggingConfigProto.internal_static_google_logging_v2_UpdateSinkRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.UpdateSinkRequest getDefaultInstanceForType() {
       return com.google.logging.v2.UpdateSinkRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.UpdateSinkRequest build() {
       com.google.logging.v2.UpdateSinkRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -573,7 +559,6 @@ public com.google.logging.v2.UpdateSinkRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.UpdateSinkRequest buildPartial() {
       com.google.logging.v2.UpdateSinkRequest result = new com.google.logging.v2.UpdateSinkRequest(this);
       result.sinkName_ = sinkName_;
@@ -592,39 +577,32 @@ public com.google.logging.v2.UpdateSinkRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.UpdateSinkRequest) {
         return mergeFrom((com.google.logging.v2.UpdateSinkRequest)other);
@@ -654,12 +632,10 @@ public Builder mergeFrom(com.google.logging.v2.UpdateSinkRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1269,13 +1245,11 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
       }
       return updateMaskBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1297,12 +1271,11 @@ public static com.google.logging.v2.UpdateSinkRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateSinkRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateSinkRequest(input, extensionRegistry);
+        return new UpdateSinkRequest(input, extensionRegistry);
     }
   };
 
@@ -1315,7 +1288,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.UpdateSinkRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesPartialErrors.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesPartialErrors.java
index 95bd67b20fea..f032eb954ed3 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesPartialErrors.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesPartialErrors.java
@@ -32,9 +32,6 @@ private WriteLogEntriesPartialErrors(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private WriteLogEntriesPartialErrors(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               logEntryErrors_ = com.google.protobuf.MapField.newMapField(
@@ -59,13 +63,6 @@ private WriteLogEntriesPartialErrors(
                 logEntryErrors__.getKey(), logEntryErrors__.getValue());
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private WriteLogEntriesPartialErrors(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -95,7 +91,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_WriteLogEntriesPartialErrors_fieldAccessorTable
@@ -212,7 +207,6 @@ public com.google.rpc.Status getLogEntryErrorsOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -222,7 +216,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     com.google.protobuf.GeneratedMessageV3
@@ -234,7 +227,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -358,7 +350,6 @@ public static com.google.logging.v2.WriteLogEntriesPartialErrors parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -366,7 +357,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.WriteLogEntriesPartialErrors prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -416,7 +406,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_WriteLogEntriesPartialErrors_fieldAccessorTable
@@ -439,25 +428,21 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       internalGetMutableLogEntryErrors().clear();
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_WriteLogEntriesPartialErrors_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.WriteLogEntriesPartialErrors getDefaultInstanceForType() {
       return com.google.logging.v2.WriteLogEntriesPartialErrors.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.WriteLogEntriesPartialErrors build() {
       com.google.logging.v2.WriteLogEntriesPartialErrors result = buildPartial();
       if (!result.isInitialized()) {
@@ -466,7 +451,6 @@ public com.google.logging.v2.WriteLogEntriesPartialErrors build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.WriteLogEntriesPartialErrors buildPartial() {
       com.google.logging.v2.WriteLogEntriesPartialErrors result = new com.google.logging.v2.WriteLogEntriesPartialErrors(this);
       int from_bitField0_ = bitField0_;
@@ -476,39 +460,32 @@ public com.google.logging.v2.WriteLogEntriesPartialErrors buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.WriteLogEntriesPartialErrors) {
         return mergeFrom((com.google.logging.v2.WriteLogEntriesPartialErrors)other);
@@ -527,12 +504,10 @@ public Builder mergeFrom(com.google.logging.v2.WriteLogEntriesPartialErrors othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -730,13 +705,11 @@ public Builder putAllLogEntryErrors(
           .putAll(values);
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -758,12 +731,11 @@ public static com.google.logging.v2.WriteLogEntriesPartialErrors getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public WriteLogEntriesPartialErrors parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WriteLogEntriesPartialErrors(input, extensionRegistry);
+        return new WriteLogEntriesPartialErrors(input, extensionRegistry);
     }
   };
 
@@ -776,7 +748,6 @@ public com.google.protobuf.Parser getParserForType
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.WriteLogEntriesPartialErrors getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequest.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequest.java
index 8dfbbed515a4..09499d60e306 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequest.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequest.java
@@ -36,9 +36,6 @@ private WriteLogEntriesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private WriteLogEntriesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -101,13 +105,6 @@ private WriteLogEntriesRequest(
             dryRun_ = input.readBool();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -129,7 +126,6 @@ private WriteLogEntriesRequest(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -140,7 +136,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_WriteLogEntriesRequest_fieldAccessorTable
@@ -546,7 +541,6 @@ public boolean getDryRun() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -556,7 +550,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getLogNameBytes().isEmpty()) {
@@ -583,7 +576,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -755,7 +747,6 @@ public static com.google.logging.v2.WriteLogEntriesRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -763,7 +754,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.WriteLogEntriesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -813,7 +803,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_WriteLogEntriesRequest_fieldAccessorTable
@@ -837,7 +826,6 @@ private void maybeForceBuilderInitialization() {
         getEntriesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       logName_ = "";
@@ -862,18 +850,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_WriteLogEntriesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.WriteLogEntriesRequest getDefaultInstanceForType() {
       return com.google.logging.v2.WriteLogEntriesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.WriteLogEntriesRequest build() {
       com.google.logging.v2.WriteLogEntriesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -882,7 +867,6 @@ public com.google.logging.v2.WriteLogEntriesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.WriteLogEntriesRequest buildPartial() {
       com.google.logging.v2.WriteLogEntriesRequest result = new com.google.logging.v2.WriteLogEntriesRequest(this);
       int from_bitField0_ = bitField0_;
@@ -911,39 +895,32 @@ public com.google.logging.v2.WriteLogEntriesRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.WriteLogEntriesRequest) {
         return mergeFrom((com.google.logging.v2.WriteLogEntriesRequest)other);
@@ -1001,12 +978,10 @@ public Builder mergeFrom(com.google.logging.v2.WriteLogEntriesRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2282,13 +2257,11 @@ public Builder clearDryRun() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2310,12 +2283,11 @@ public static com.google.logging.v2.WriteLogEntriesRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public WriteLogEntriesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WriteLogEntriesRequest(input, extensionRegistry);
+        return new WriteLogEntriesRequest(input, extensionRegistry);
     }
   };
 
@@ -2328,7 +2300,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.WriteLogEntriesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesResponse.java b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesResponse.java
index 3325ea3548d1..cdae8e7349a7 100644
--- a/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesResponse.java
+++ b/google-api-grpc/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesResponse.java
@@ -33,9 +33,6 @@ private WriteLogEntriesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -70,7 +67,6 @@ private WriteLogEntriesResponse(
     return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_WriteLogEntriesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_WriteLogEntriesResponse_fieldAccessorTable
@@ -79,7 +75,6 @@ private WriteLogEntriesResponse(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -89,13 +84,11 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -203,7 +196,6 @@ public static com.google.logging.v2.WriteLogEntriesResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -211,7 +203,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.logging.v2.WriteLogEntriesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -240,7 +231,6 @@ public static final class Builder extends
       return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_WriteLogEntriesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_WriteLogEntriesResponse_fieldAccessorTable
@@ -263,24 +253,20 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.logging.v2.LoggingProto.internal_static_google_logging_v2_WriteLogEntriesResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.WriteLogEntriesResponse getDefaultInstanceForType() {
       return com.google.logging.v2.WriteLogEntriesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.logging.v2.WriteLogEntriesResponse build() {
       com.google.logging.v2.WriteLogEntriesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -289,46 +275,38 @@ public com.google.logging.v2.WriteLogEntriesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.logging.v2.WriteLogEntriesResponse buildPartial() {
       com.google.logging.v2.WriteLogEntriesResponse result = new com.google.logging.v2.WriteLogEntriesResponse(this);
       onBuilt();
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.logging.v2.WriteLogEntriesResponse) {
         return mergeFrom((com.google.logging.v2.WriteLogEntriesResponse)other);
@@ -345,12 +323,10 @@ public Builder mergeFrom(com.google.logging.v2.WriteLogEntriesResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -368,13 +344,11 @@ public Builder mergeFrom(
       }
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -396,12 +370,11 @@ public static com.google.logging.v2.WriteLogEntriesResponse getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public WriteLogEntriesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WriteLogEntriesResponse(input, extensionRegistry);
+        return new WriteLogEntriesResponse(input, extensionRegistry);
     }
   };
 
@@ -414,7 +387,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.logging.v2.WriteLogEntriesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/Aggregation.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/Aggregation.java
index a1e60c631fd7..dc82280a418a 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/Aggregation.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/Aggregation.java
@@ -40,9 +40,6 @@ private Aggregation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -54,6 +51,13 @@ private Aggregation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.protobuf.Duration.Builder subBuilder = null;
             if (alignmentPeriod_ != null) {
@@ -88,13 +92,6 @@ private Aggregation(
             groupByFields_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -115,7 +112,6 @@ private Aggregation(
     return com.google.monitoring.v3.CommonProto.internal_static_google_monitoring_v3_Aggregation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.CommonProto.internal_static_google_monitoring_v3_Aggregation_fieldAccessorTable
@@ -1209,7 +1205,6 @@ public int getPerSeriesAlignerValue() {
    * .google.monitoring.v3.Aggregation.Aligner per_series_aligner = 2;
    */
   public com.google.monitoring.v3.Aggregation.Aligner getPerSeriesAligner() {
-    @SuppressWarnings("deprecation")
     com.google.monitoring.v3.Aggregation.Aligner result = com.google.monitoring.v3.Aggregation.Aligner.valueOf(perSeriesAligner_);
     return result == null ? com.google.monitoring.v3.Aggregation.Aligner.UNRECOGNIZED : result;
   }
@@ -1252,7 +1247,6 @@ public int getCrossSeriesReducerValue() {
    * .google.monitoring.v3.Aggregation.Reducer cross_series_reducer = 4;
    */
   public com.google.monitoring.v3.Aggregation.Reducer getCrossSeriesReducer() {
-    @SuppressWarnings("deprecation")
     com.google.monitoring.v3.Aggregation.Reducer result = com.google.monitoring.v3.Aggregation.Reducer.valueOf(crossSeriesReducer_);
     return result == null ? com.google.monitoring.v3.Aggregation.Reducer.UNRECOGNIZED : result;
   }
@@ -1355,7 +1349,6 @@ public java.lang.String getGroupByFields(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1365,7 +1358,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (alignmentPeriod_ != null) {
@@ -1383,7 +1375,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1532,7 +1523,6 @@ public static com.google.monitoring.v3.Aggregation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1540,7 +1530,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.Aggregation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1573,7 +1562,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.CommonProto.internal_static_google_monitoring_v3_Aggregation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.CommonProto.internal_static_google_monitoring_v3_Aggregation_fieldAccessorTable
@@ -1596,7 +1584,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (alignmentPeriodBuilder_ == null) {
@@ -1614,18 +1601,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.CommonProto.internal_static_google_monitoring_v3_Aggregation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.Aggregation getDefaultInstanceForType() {
       return com.google.monitoring.v3.Aggregation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.Aggregation build() {
       com.google.monitoring.v3.Aggregation result = buildPartial();
       if (!result.isInitialized()) {
@@ -1634,7 +1618,6 @@ public com.google.monitoring.v3.Aggregation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.Aggregation buildPartial() {
       com.google.monitoring.v3.Aggregation result = new com.google.monitoring.v3.Aggregation(this);
       int from_bitField0_ = bitField0_;
@@ -1656,39 +1639,32 @@ public com.google.monitoring.v3.Aggregation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.Aggregation) {
         return mergeFrom((com.google.monitoring.v3.Aggregation)other);
@@ -1724,12 +1700,10 @@ public Builder mergeFrom(com.google.monitoring.v3.Aggregation other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2023,7 +1997,6 @@ public Builder setPerSeriesAlignerValue(int value) {
      * .google.monitoring.v3.Aggregation.Aligner per_series_aligner = 2;
      */
     public com.google.monitoring.v3.Aggregation.Aligner getPerSeriesAligner() {
-      @SuppressWarnings("deprecation")
       com.google.monitoring.v3.Aggregation.Aligner result = com.google.monitoring.v3.Aggregation.Aligner.valueOf(perSeriesAligner_);
       return result == null ? com.google.monitoring.v3.Aggregation.Aligner.UNRECOGNIZED : result;
     }
@@ -2133,7 +2106,6 @@ public Builder setCrossSeriesReducerValue(int value) {
      * .google.monitoring.v3.Aggregation.Reducer cross_series_reducer = 4;
      */
     public com.google.monitoring.v3.Aggregation.Reducer getCrossSeriesReducer() {
-      @SuppressWarnings("deprecation")
       com.google.monitoring.v3.Aggregation.Reducer result = com.google.monitoring.v3.Aggregation.Reducer.valueOf(crossSeriesReducer_);
       return result == null ? com.google.monitoring.v3.Aggregation.Reducer.UNRECOGNIZED : result;
     }
@@ -2431,13 +2403,11 @@ public Builder addGroupByFieldsBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2459,12 +2429,11 @@ public static com.google.monitoring.v3.Aggregation getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Aggregation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Aggregation(input, extensionRegistry);
+        return new Aggregation(input, extensionRegistry);
     }
   };
 
@@ -2477,7 +2446,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.Aggregation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertPolicy.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertPolicy.java
index a5b1e0196ba4..44acf37b0a5e 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertPolicy.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertPolicy.java
@@ -40,9 +40,6 @@ private AlertPolicy(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -54,6 +51,13 @@ private AlertPolicy(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -155,13 +159,6 @@ private AlertPolicy(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -186,7 +183,6 @@ private AlertPolicy(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -197,7 +193,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.AlertProto.internal_static_google_monitoring_v3_AlertPolicy_fieldAccessorTable
@@ -451,9 +446,6 @@ private Documentation(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -465,6 +457,13 @@ private Documentation(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -477,13 +476,6 @@ private Documentation(
               mimeType_ = s;
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -501,7 +493,6 @@ private Documentation(
       return com.google.monitoring.v3.AlertProto.internal_static_google_monitoring_v3_AlertPolicy_Documentation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.AlertProto.internal_static_google_monitoring_v3_AlertPolicy_Documentation_fieldAccessorTable
@@ -604,7 +595,6 @@ public java.lang.String getMimeType() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -614,7 +604,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getContentBytes().isEmpty()) {
@@ -626,7 +615,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -748,7 +736,6 @@ public static com.google.monitoring.v3.AlertPolicy.Documentation parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -756,7 +743,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.monitoring.v3.AlertPolicy.Documentation prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -785,7 +771,6 @@ public static final class Builder extends
         return com.google.monitoring.v3.AlertProto.internal_static_google_monitoring_v3_AlertPolicy_Documentation_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.monitoring.v3.AlertProto.internal_static_google_monitoring_v3_AlertPolicy_Documentation_fieldAccessorTable
@@ -808,7 +793,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         content_ = "";
@@ -818,18 +802,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.monitoring.v3.AlertProto.internal_static_google_monitoring_v3_AlertPolicy_Documentation_descriptor;
       }
 
-      @java.lang.Override
       public com.google.monitoring.v3.AlertPolicy.Documentation getDefaultInstanceForType() {
         return com.google.monitoring.v3.AlertPolicy.Documentation.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.monitoring.v3.AlertPolicy.Documentation build() {
         com.google.monitoring.v3.AlertPolicy.Documentation result = buildPartial();
         if (!result.isInitialized()) {
@@ -838,7 +819,6 @@ public com.google.monitoring.v3.AlertPolicy.Documentation build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.monitoring.v3.AlertPolicy.Documentation buildPartial() {
         com.google.monitoring.v3.AlertPolicy.Documentation result = new com.google.monitoring.v3.AlertPolicy.Documentation(this);
         result.content_ = content_;
@@ -847,39 +827,32 @@ public com.google.monitoring.v3.AlertPolicy.Documentation buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.monitoring.v3.AlertPolicy.Documentation) {
           return mergeFrom((com.google.monitoring.v3.AlertPolicy.Documentation)other);
@@ -904,12 +877,10 @@ public Builder mergeFrom(com.google.monitoring.v3.AlertPolicy.Documentation othe
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1130,13 +1101,11 @@ public Builder setMimeTypeBytes(
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1158,12 +1127,11 @@ public static com.google.monitoring.v3.AlertPolicy.Documentation getDefaultInsta
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Documentation parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Documentation(input, extensionRegistry);
+          return new Documentation(input, extensionRegistry);
       }
     };
 
@@ -1176,7 +1144,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.AlertPolicy.Documentation getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1353,9 +1320,6 @@ private Condition(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1367,6 +1331,13 @@ private Condition(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               com.google.monitoring.v3.AlertPolicy.Condition.MetricThreshold.Builder subBuilder = null;
               if (conditionCase_ == 1) {
@@ -1407,13 +1378,6 @@ private Condition(
               name_ = s;
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1431,7 +1395,6 @@ private Condition(
       return com.google.monitoring.v3.AlertProto.internal_static_google_monitoring_v3_AlertPolicy_Condition_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.AlertProto.internal_static_google_monitoring_v3_AlertPolicy_Condition_fieldAccessorTable
@@ -1495,9 +1458,6 @@ private Trigger(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1509,6 +1469,13 @@ private Trigger(
               case 0:
                 done = true;
                 break;
+              default: {
+                if (!parseUnknownFieldProto3(
+                    input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
               case 8: {
                 typeCase_ = 1;
                 type_ = input.readInt32();
@@ -1519,13 +1486,6 @@ private Trigger(
                 type_ = input.readDouble();
                 break;
               }
-              default: {
-                if (!parseUnknownFieldProto3(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
             }
           }
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1543,7 +1503,6 @@ private Trigger(
         return com.google.monitoring.v3.AlertProto.internal_static_google_monitoring_v3_AlertPolicy_Condition_Trigger_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.monitoring.v3.AlertProto.internal_static_google_monitoring_v3_AlertPolicy_Condition_Trigger_fieldAccessorTable
@@ -1622,7 +1581,6 @@ public double getPercent() {
       }
 
       private byte memoizedIsInitialized = -1;
-      @java.lang.Override
       public final boolean isInitialized() {
         byte isInitialized = memoizedIsInitialized;
         if (isInitialized == 1) return true;
@@ -1632,7 +1590,6 @@ public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public void writeTo(com.google.protobuf.CodedOutputStream output)
                           throws java.io.IOException {
         if (typeCase_ == 1) {
@@ -1646,7 +1603,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         unknownFields.writeTo(output);
       }
 
-      @java.lang.Override
       public int getSerializedSize() {
         int size = memoizedSize;
         if (size != -1) return size;
@@ -1794,7 +1750,6 @@ public static com.google.monitoring.v3.AlertPolicy.Condition.Trigger parseFrom(
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
-      @java.lang.Override
       public Builder newBuilderForType() { return newBuilder(); }
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
@@ -1802,7 +1757,6 @@ public static Builder newBuilder() {
       public static Builder newBuilder(com.google.monitoring.v3.AlertPolicy.Condition.Trigger prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
-      @java.lang.Override
       public Builder toBuilder() {
         return this == DEFAULT_INSTANCE
             ? new Builder() : new Builder().mergeFrom(this);
@@ -1831,7 +1785,6 @@ public static final class Builder extends
           return com.google.monitoring.v3.AlertProto.internal_static_google_monitoring_v3_AlertPolicy_Condition_Trigger_descriptor;
         }
 
-        @java.lang.Override
         protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
           return com.google.monitoring.v3.AlertProto.internal_static_google_monitoring_v3_AlertPolicy_Condition_Trigger_fieldAccessorTable
@@ -1854,7 +1807,6 @@ private void maybeForceBuilderInitialization() {
                   .alwaysUseFieldBuilders) {
           }
         }
-        @java.lang.Override
         public Builder clear() {
           super.clear();
           typeCase_ = 0;
@@ -1862,18 +1814,15 @@ public Builder clear() {
           return this;
         }
 
-        @java.lang.Override
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
           return com.google.monitoring.v3.AlertProto.internal_static_google_monitoring_v3_AlertPolicy_Condition_Trigger_descriptor;
         }
 
-        @java.lang.Override
         public com.google.monitoring.v3.AlertPolicy.Condition.Trigger getDefaultInstanceForType() {
           return com.google.monitoring.v3.AlertPolicy.Condition.Trigger.getDefaultInstance();
         }
 
-        @java.lang.Override
         public com.google.monitoring.v3.AlertPolicy.Condition.Trigger build() {
           com.google.monitoring.v3.AlertPolicy.Condition.Trigger result = buildPartial();
           if (!result.isInitialized()) {
@@ -1882,7 +1831,6 @@ public com.google.monitoring.v3.AlertPolicy.Condition.Trigger build() {
           return result;
         }
 
-        @java.lang.Override
         public com.google.monitoring.v3.AlertPolicy.Condition.Trigger buildPartial() {
           com.google.monitoring.v3.AlertPolicy.Condition.Trigger result = new com.google.monitoring.v3.AlertPolicy.Condition.Trigger(this);
           if (typeCase_ == 1) {
@@ -1896,39 +1844,32 @@ public com.google.monitoring.v3.AlertPolicy.Condition.Trigger buildPartial() {
           return result;
         }
 
-        @java.lang.Override
         public Builder clone() {
           return (Builder) super.clone();
         }
-        @java.lang.Override
         public Builder setField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.setField(field, value);
         }
-        @java.lang.Override
         public Builder clearField(
             com.google.protobuf.Descriptors.FieldDescriptor field) {
           return (Builder) super.clearField(field);
         }
-        @java.lang.Override
         public Builder clearOneof(
             com.google.protobuf.Descriptors.OneofDescriptor oneof) {
           return (Builder) super.clearOneof(oneof);
         }
-        @java.lang.Override
         public Builder setRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return (Builder) super.setRepeatedField(field, index, value);
         }
-        @java.lang.Override
         public Builder addRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.addRepeatedField(field, value);
         }
-        @java.lang.Override
         public Builder mergeFrom(com.google.protobuf.Message other) {
           if (other instanceof com.google.monitoring.v3.AlertPolicy.Condition.Trigger) {
             return mergeFrom((com.google.monitoring.v3.AlertPolicy.Condition.Trigger)other);
@@ -1958,12 +1899,10 @@ public Builder mergeFrom(com.google.monitoring.v3.AlertPolicy.Condition.Trigger
           return this;
         }
 
-        @java.lang.Override
         public final boolean isInitialized() {
           return true;
         }
 
-        @java.lang.Override
         public Builder mergeFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2086,13 +2025,11 @@ public Builder clearPercent() {
           }
           return this;
         }
-        @java.lang.Override
         public final Builder setUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.setUnknownFieldsProto3(unknownFields);
         }
 
-        @java.lang.Override
         public final Builder mergeUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
@@ -2114,12 +2051,11 @@ public static com.google.monitoring.v3.AlertPolicy.Condition.Trigger getDefaultI
 
       private static final com.google.protobuf.Parser
           PARSER = new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
         public Trigger parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Trigger(input, extensionRegistry);
+            return new Trigger(input, extensionRegistry);
         }
       };
 
@@ -2132,7 +2068,6 @@ public com.google.protobuf.Parser getParserForType() {
         return PARSER;
       }
 
-      @java.lang.Override
       public com.google.monitoring.v3.AlertPolicy.Condition.Trigger getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
@@ -2572,9 +2507,6 @@ private MetricThreshold(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2586,6 +2518,13 @@ private MetricThreshold(
               case 0:
                 done = true;
                 break;
+              default: {
+                if (!parseUnknownFieldProto3(
+                    input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
               case 18: {
                 java.lang.String s = input.readStringRequireUtf8();
 
@@ -2653,13 +2592,6 @@ private MetricThreshold(
                     input.readMessage(com.google.monitoring.v3.Aggregation.parser(), extensionRegistry));
                 break;
               }
-              default: {
-                if (!parseUnknownFieldProto3(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
             }
           }
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -2683,7 +2615,6 @@ private MetricThreshold(
         return com.google.monitoring.v3.AlertProto.internal_static_google_monitoring_v3_AlertPolicy_Condition_MetricThreshold_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.monitoring.v3.AlertProto.internal_static_google_monitoring_v3_AlertPolicy_Condition_MetricThreshold_fieldAccessorTable
@@ -3057,7 +2988,6 @@ public int getComparisonValue() {
        * .google.monitoring.v3.ComparisonType comparison = 4;
        */
       public com.google.monitoring.v3.ComparisonType getComparison() {
-        @SuppressWarnings("deprecation")
         com.google.monitoring.v3.ComparisonType result = com.google.monitoring.v3.ComparisonType.valueOf(comparison_);
         return result == null ? com.google.monitoring.v3.ComparisonType.UNRECOGNIZED : result;
       }
@@ -3184,7 +3114,6 @@ public com.google.monitoring.v3.AlertPolicy.Condition.TriggerOrBuilder getTrigge
       }
 
       private byte memoizedIsInitialized = -1;
-      @java.lang.Override
       public final boolean isInitialized() {
         byte isInitialized = memoizedIsInitialized;
         if (isInitialized == 1) return true;
@@ -3194,7 +3123,6 @@ public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public void writeTo(com.google.protobuf.CodedOutputStream output)
                           throws java.io.IOException {
         if (!getFilterBytes().isEmpty()) {
@@ -3224,7 +3152,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         unknownFields.writeTo(output);
       }
 
-      @java.lang.Override
       public int getSerializedSize() {
         int size = memoizedSize;
         if (size != -1) return size;
@@ -3410,7 +3337,6 @@ public static com.google.monitoring.v3.AlertPolicy.Condition.MetricThreshold par
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
-      @java.lang.Override
       public Builder newBuilderForType() { return newBuilder(); }
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
@@ -3418,7 +3344,6 @@ public static Builder newBuilder() {
       public static Builder newBuilder(com.google.monitoring.v3.AlertPolicy.Condition.MetricThreshold prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
-      @java.lang.Override
       public Builder toBuilder() {
         return this == DEFAULT_INSTANCE
             ? new Builder() : new Builder().mergeFrom(this);
@@ -3447,7 +3372,6 @@ public static final class Builder extends
           return com.google.monitoring.v3.AlertProto.internal_static_google_monitoring_v3_AlertPolicy_Condition_MetricThreshold_descriptor;
         }
 
-        @java.lang.Override
         protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
           return com.google.monitoring.v3.AlertProto.internal_static_google_monitoring_v3_AlertPolicy_Condition_MetricThreshold_fieldAccessorTable
@@ -3472,7 +3396,6 @@ private void maybeForceBuilderInitialization() {
             getDenominatorAggregationsFieldBuilder();
           }
         }
-        @java.lang.Override
         public Builder clear() {
           super.clear();
           filter_ = "";
@@ -3510,18 +3433,15 @@ public Builder clear() {
           return this;
         }
 
-        @java.lang.Override
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
           return com.google.monitoring.v3.AlertProto.internal_static_google_monitoring_v3_AlertPolicy_Condition_MetricThreshold_descriptor;
         }
 
-        @java.lang.Override
         public com.google.monitoring.v3.AlertPolicy.Condition.MetricThreshold getDefaultInstanceForType() {
           return com.google.monitoring.v3.AlertPolicy.Condition.MetricThreshold.getDefaultInstance();
         }
 
-        @java.lang.Override
         public com.google.monitoring.v3.AlertPolicy.Condition.MetricThreshold build() {
           com.google.monitoring.v3.AlertPolicy.Condition.MetricThreshold result = buildPartial();
           if (!result.isInitialized()) {
@@ -3530,7 +3450,6 @@ public com.google.monitoring.v3.AlertPolicy.Condition.MetricThreshold build() {
           return result;
         }
 
-        @java.lang.Override
         public com.google.monitoring.v3.AlertPolicy.Condition.MetricThreshold buildPartial() {
           com.google.monitoring.v3.AlertPolicy.Condition.MetricThreshold result = new com.google.monitoring.v3.AlertPolicy.Condition.MetricThreshold(this);
           int from_bitField0_ = bitField0_;
@@ -3572,39 +3491,32 @@ public com.google.monitoring.v3.AlertPolicy.Condition.MetricThreshold buildParti
           return result;
         }
 
-        @java.lang.Override
         public Builder clone() {
           return (Builder) super.clone();
         }
-        @java.lang.Override
         public Builder setField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.setField(field, value);
         }
-        @java.lang.Override
         public Builder clearField(
             com.google.protobuf.Descriptors.FieldDescriptor field) {
           return (Builder) super.clearField(field);
         }
-        @java.lang.Override
         public Builder clearOneof(
             com.google.protobuf.Descriptors.OneofDescriptor oneof) {
           return (Builder) super.clearOneof(oneof);
         }
-        @java.lang.Override
         public Builder setRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return (Builder) super.setRepeatedField(field, index, value);
         }
-        @java.lang.Override
         public Builder addRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.addRepeatedField(field, value);
         }
-        @java.lang.Override
         public Builder mergeFrom(com.google.protobuf.Message other) {
           if (other instanceof com.google.monitoring.v3.AlertPolicy.Condition.MetricThreshold) {
             return mergeFrom((com.google.monitoring.v3.AlertPolicy.Condition.MetricThreshold)other);
@@ -3693,12 +3605,10 @@ public Builder mergeFrom(com.google.monitoring.v3.AlertPolicy.Condition.MetricTh
           return this;
         }
 
-        @java.lang.Override
         public final boolean isInitialized() {
           return true;
         }
 
-        @java.lang.Override
         public Builder mergeFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -5036,7 +4946,6 @@ public Builder setComparisonValue(int value) {
          * .google.monitoring.v3.ComparisonType comparison = 4;
          */
         public com.google.monitoring.v3.ComparisonType getComparison() {
-          @SuppressWarnings("deprecation")
           com.google.monitoring.v3.ComparisonType result = com.google.monitoring.v3.ComparisonType.valueOf(comparison_);
           return result == null ? com.google.monitoring.v3.ComparisonType.UNRECOGNIZED : result;
         }
@@ -5547,13 +5456,11 @@ public com.google.monitoring.v3.AlertPolicy.Condition.TriggerOrBuilder getTrigge
           }
           return triggerBuilder_;
         }
-        @java.lang.Override
         public final Builder setUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.setUnknownFieldsProto3(unknownFields);
         }
 
-        @java.lang.Override
         public final Builder mergeUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
@@ -5575,12 +5482,11 @@ public static com.google.monitoring.v3.AlertPolicy.Condition.MetricThreshold get
 
       private static final com.google.protobuf.Parser
           PARSER = new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
         public MetricThreshold parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new MetricThreshold(input, extensionRegistry);
+            return new MetricThreshold(input, extensionRegistry);
         }
       };
 
@@ -5593,7 +5499,6 @@ public com.google.protobuf.Parser getParserForType() {
         return PARSER;
       }
 
-      @java.lang.Override
       public com.google.monitoring.v3.AlertPolicy.Condition.MetricThreshold getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
@@ -5831,9 +5736,6 @@ private MetricAbsence(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -5845,6 +5747,13 @@ private MetricAbsence(
               case 0:
                 done = true;
                 break;
+              default: {
+                if (!parseUnknownFieldProto3(
+                    input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
               case 10: {
                 java.lang.String s = input.readStringRequireUtf8();
 
@@ -5886,13 +5795,6 @@ private MetricAbsence(
                     input.readMessage(com.google.monitoring.v3.Aggregation.parser(), extensionRegistry));
                 break;
               }
-              default: {
-                if (!parseUnknownFieldProto3(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
             }
           }
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -5913,7 +5815,6 @@ private MetricAbsence(
         return com.google.monitoring.v3.AlertProto.internal_static_google_monitoring_v3_AlertPolicy_Condition_MetricAbsence_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.monitoring.v3.AlertProto.internal_static_google_monitoring_v3_AlertPolicy_Condition_MetricAbsence_fieldAccessorTable
@@ -6166,7 +6067,6 @@ public com.google.monitoring.v3.AlertPolicy.Condition.TriggerOrBuilder getTrigge
       }
 
       private byte memoizedIsInitialized = -1;
-      @java.lang.Override
       public final boolean isInitialized() {
         byte isInitialized = memoizedIsInitialized;
         if (isInitialized == 1) return true;
@@ -6176,7 +6076,6 @@ public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public void writeTo(com.google.protobuf.CodedOutputStream output)
                           throws java.io.IOException {
         if (!getFilterBytes().isEmpty()) {
@@ -6194,7 +6093,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         unknownFields.writeTo(output);
       }
 
-      @java.lang.Override
       public int getSerializedSize() {
         int size = memoizedSize;
         if (size != -1) return size;
@@ -6345,7 +6243,6 @@ public static com.google.monitoring.v3.AlertPolicy.Condition.MetricAbsence parse
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
-      @java.lang.Override
       public Builder newBuilderForType() { return newBuilder(); }
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
@@ -6353,7 +6250,6 @@ public static Builder newBuilder() {
       public static Builder newBuilder(com.google.monitoring.v3.AlertPolicy.Condition.MetricAbsence prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
-      @java.lang.Override
       public Builder toBuilder() {
         return this == DEFAULT_INSTANCE
             ? new Builder() : new Builder().mergeFrom(this);
@@ -6385,7 +6281,6 @@ public static final class Builder extends
           return com.google.monitoring.v3.AlertProto.internal_static_google_monitoring_v3_AlertPolicy_Condition_MetricAbsence_descriptor;
         }
 
-        @java.lang.Override
         protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
           return com.google.monitoring.v3.AlertProto.internal_static_google_monitoring_v3_AlertPolicy_Condition_MetricAbsence_fieldAccessorTable
@@ -6409,7 +6304,6 @@ private void maybeForceBuilderInitialization() {
             getAggregationsFieldBuilder();
           }
         }
-        @java.lang.Override
         public Builder clear() {
           super.clear();
           filter_ = "";
@@ -6435,18 +6329,15 @@ public Builder clear() {
           return this;
         }
 
-        @java.lang.Override
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
           return com.google.monitoring.v3.AlertProto.internal_static_google_monitoring_v3_AlertPolicy_Condition_MetricAbsence_descriptor;
         }
 
-        @java.lang.Override
         public com.google.monitoring.v3.AlertPolicy.Condition.MetricAbsence getDefaultInstanceForType() {
           return com.google.monitoring.v3.AlertPolicy.Condition.MetricAbsence.getDefaultInstance();
         }
 
-        @java.lang.Override
         public com.google.monitoring.v3.AlertPolicy.Condition.MetricAbsence build() {
           com.google.monitoring.v3.AlertPolicy.Condition.MetricAbsence result = buildPartial();
           if (!result.isInitialized()) {
@@ -6455,7 +6346,6 @@ public com.google.monitoring.v3.AlertPolicy.Condition.MetricAbsence build() {
           return result;
         }
 
-        @java.lang.Override
         public com.google.monitoring.v3.AlertPolicy.Condition.MetricAbsence buildPartial() {
           com.google.monitoring.v3.AlertPolicy.Condition.MetricAbsence result = new com.google.monitoring.v3.AlertPolicy.Condition.MetricAbsence(this);
           int from_bitField0_ = bitField0_;
@@ -6485,39 +6375,32 @@ public com.google.monitoring.v3.AlertPolicy.Condition.MetricAbsence buildPartial
           return result;
         }
 
-        @java.lang.Override
         public Builder clone() {
           return (Builder) super.clone();
         }
-        @java.lang.Override
         public Builder setField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.setField(field, value);
         }
-        @java.lang.Override
         public Builder clearField(
             com.google.protobuf.Descriptors.FieldDescriptor field) {
           return (Builder) super.clearField(field);
         }
-        @java.lang.Override
         public Builder clearOneof(
             com.google.protobuf.Descriptors.OneofDescriptor oneof) {
           return (Builder) super.clearOneof(oneof);
         }
-        @java.lang.Override
         public Builder setRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return (Builder) super.setRepeatedField(field, index, value);
         }
-        @java.lang.Override
         public Builder addRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.addRepeatedField(field, value);
         }
-        @java.lang.Override
         public Builder mergeFrom(com.google.protobuf.Message other) {
           if (other instanceof com.google.monitoring.v3.AlertPolicy.Condition.MetricAbsence) {
             return mergeFrom((com.google.monitoring.v3.AlertPolicy.Condition.MetricAbsence)other);
@@ -6570,12 +6453,10 @@ public Builder mergeFrom(com.google.monitoring.v3.AlertPolicy.Condition.MetricAb
           return this;
         }
 
-        @java.lang.Override
         public final boolean isInitialized() {
           return true;
         }
 
-        @java.lang.Override
         public Builder mergeFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -7557,13 +7438,11 @@ public com.google.monitoring.v3.AlertPolicy.Condition.TriggerOrBuilder getTrigge
           }
           return triggerBuilder_;
         }
-        @java.lang.Override
         public final Builder setUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.setUnknownFieldsProto3(unknownFields);
         }
 
-        @java.lang.Override
         public final Builder mergeUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
@@ -7585,12 +7464,11 @@ public static com.google.monitoring.v3.AlertPolicy.Condition.MetricAbsence getDe
 
       private static final com.google.protobuf.Parser
           PARSER = new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
         public MetricAbsence parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new MetricAbsence(input, extensionRegistry);
+            return new MetricAbsence(input, extensionRegistry);
         }
       };
 
@@ -7603,7 +7481,6 @@ public com.google.protobuf.Parser getParserForType() {
         return PARSER;
       }
 
-      @java.lang.Override
       public com.google.monitoring.v3.AlertPolicy.Condition.MetricAbsence getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
@@ -7854,7 +7731,6 @@ public com.google.monitoring.v3.AlertPolicy.Condition.MetricAbsenceOrBuilder get
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -7864,7 +7740,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (conditionCase_ == 1) {
@@ -7882,7 +7757,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -8039,7 +7913,6 @@ public static com.google.monitoring.v3.AlertPolicy.Condition parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -8047,7 +7920,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.monitoring.v3.AlertPolicy.Condition prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -8077,7 +7949,6 @@ public static final class Builder extends
         return com.google.monitoring.v3.AlertProto.internal_static_google_monitoring_v3_AlertPolicy_Condition_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.monitoring.v3.AlertProto.internal_static_google_monitoring_v3_AlertPolicy_Condition_fieldAccessorTable
@@ -8100,7 +7971,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         name_ = "";
@@ -8112,18 +7982,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.monitoring.v3.AlertProto.internal_static_google_monitoring_v3_AlertPolicy_Condition_descriptor;
       }
 
-      @java.lang.Override
       public com.google.monitoring.v3.AlertPolicy.Condition getDefaultInstanceForType() {
         return com.google.monitoring.v3.AlertPolicy.Condition.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.monitoring.v3.AlertPolicy.Condition build() {
         com.google.monitoring.v3.AlertPolicy.Condition result = buildPartial();
         if (!result.isInitialized()) {
@@ -8132,7 +7999,6 @@ public com.google.monitoring.v3.AlertPolicy.Condition build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.monitoring.v3.AlertPolicy.Condition buildPartial() {
         com.google.monitoring.v3.AlertPolicy.Condition result = new com.google.monitoring.v3.AlertPolicy.Condition(this);
         result.name_ = name_;
@@ -8156,39 +8022,32 @@ public com.google.monitoring.v3.AlertPolicy.Condition buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.monitoring.v3.AlertPolicy.Condition) {
           return mergeFrom((com.google.monitoring.v3.AlertPolicy.Condition)other);
@@ -8226,12 +8085,10 @@ public Builder mergeFrom(com.google.monitoring.v3.AlertPolicy.Condition other) {
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -8900,13 +8757,11 @@ public com.google.monitoring.v3.AlertPolicy.Condition.MetricAbsenceOrBuilder get
         onChanged();;
         return conditionAbsentBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -8928,12 +8783,11 @@ public static com.google.monitoring.v3.AlertPolicy.Condition getDefaultInstance(
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Condition parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Condition(input, extensionRegistry);
+          return new Condition(input, extensionRegistry);
       }
     };
 
@@ -8946,7 +8800,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.AlertPolicy.Condition getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -9307,7 +9160,6 @@ public int getCombinerValue() {
    * .google.monitoring.v3.AlertPolicy.ConditionCombinerType combiner = 6;
    */
   public com.google.monitoring.v3.AlertPolicy.ConditionCombinerType getCombiner() {
-    @SuppressWarnings("deprecation")
     com.google.monitoring.v3.AlertPolicy.ConditionCombinerType result = com.google.monitoring.v3.AlertPolicy.ConditionCombinerType.valueOf(combiner_);
     return result == null ? com.google.monitoring.v3.AlertPolicy.ConditionCombinerType.UNRECOGNIZED : result;
   }
@@ -9507,7 +9359,6 @@ public com.google.monitoring.v3.MutationRecordOrBuilder getMutationRecordOrBuild
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -9517,7 +9368,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -9556,7 +9406,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -9777,7 +9626,6 @@ public static com.google.monitoring.v3.AlertPolicy parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -9785,7 +9633,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.AlertPolicy prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -9838,7 +9685,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.AlertProto.internal_static_google_monitoring_v3_AlertPolicy_fieldAccessorTable
@@ -9862,7 +9708,6 @@ private void maybeForceBuilderInitialization() {
         getConditionsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -9907,18 +9752,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.AlertProto.internal_static_google_monitoring_v3_AlertPolicy_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.AlertPolicy getDefaultInstanceForType() {
       return com.google.monitoring.v3.AlertPolicy.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.AlertPolicy build() {
       com.google.monitoring.v3.AlertPolicy result = buildPartial();
       if (!result.isInitialized()) {
@@ -9927,7 +9769,6 @@ public com.google.monitoring.v3.AlertPolicy build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.AlertPolicy buildPartial() {
       com.google.monitoring.v3.AlertPolicy result = new com.google.monitoring.v3.AlertPolicy(this);
       int from_bitField0_ = bitField0_;
@@ -9976,39 +9817,32 @@ public com.google.monitoring.v3.AlertPolicy buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.AlertPolicy) {
         return mergeFrom((com.google.monitoring.v3.AlertPolicy)other);
@@ -10086,12 +9920,10 @@ public Builder mergeFrom(com.google.monitoring.v3.AlertPolicy other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -11114,7 +10946,6 @@ public Builder setCombinerValue(int value) {
      * .google.monitoring.v3.AlertPolicy.ConditionCombinerType combiner = 6;
      */
     public com.google.monitoring.v3.AlertPolicy.ConditionCombinerType getCombiner() {
-      @SuppressWarnings("deprecation")
       com.google.monitoring.v3.AlertPolicy.ConditionCombinerType result = com.google.monitoring.v3.AlertPolicy.ConditionCombinerType.valueOf(combiner_);
       return result == null ? com.google.monitoring.v3.AlertPolicy.ConditionCombinerType.UNRECOGNIZED : result;
     }
@@ -11864,13 +11695,11 @@ public com.google.monitoring.v3.MutationRecordOrBuilder getMutationRecordOrBuild
       }
       return mutationRecordBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -11892,12 +11721,11 @@ public static com.google.monitoring.v3.AlertPolicy getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AlertPolicy parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AlertPolicy(input, extensionRegistry);
+        return new AlertPolicy(input, extensionRegistry);
     }
   };
 
@@ -11910,7 +11738,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.AlertPolicy getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertProto.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertProto.java
index 4ee2f2a315e6..63889369663c 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertProto.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertProto.java
@@ -67,7 +67,7 @@ public static void registerAllExtensions(
       "olicy\022\014\n\004name\030\001 \001(\t\022\024\n\014display_name\030\002 \001(" +
       "\t\022F\n\rdocumentation\030\r \001(\0132/.google.monito" +
       "ring.v3.AlertPolicy.Documentation\022F\n\013use" +
-      "r_labels\030\020 \003(\01321.google.monitoring.v3.Al" +
+      "r_labels\030\020 \003(\01321.google.monitoring.v3.Al",
       "ertPolicy.UserLabelsEntry\022?\n\nconditions\030" +
       "\014 \003(\0132+.google.monitoring.v3.AlertPolicy" +
       ".Condition\022I\n\010combiner\030\006 \001(\01627.google.mo" +
@@ -77,7 +77,7 @@ public static void registerAllExtensions(
       "\t\022=\n\017creation_record\030\n \001(\0132$.google.moni" +
       "toring.v3.MutationRecord\022=\n\017mutation_rec" +
       "ord\030\013 \001(\0132$.google.monitoring.v3.Mutatio" +
-      "nRecord\0323\n\rDocumentation\022\017\n\007content\030\001 \001(" +
+      "nRecord\0323\n\rDocumentation\022\017\n\007content\030\001 \001(",
       "\t\022\021\n\tmime_type\030\002 \001(\t\032\370\006\n\tCondition\022\014\n\004na" +
       "me\030\014 \001(\t\022\024\n\014display_name\030\006 \001(\t\022Z\n\023condit" +
       "ion_threshold\030\001 \001(\0132;.google.monitoring." +
@@ -87,7 +87,7 @@ public static void registerAllExtensions(
       "AbsenceH\000\0325\n\007Trigger\022\017\n\005count\030\001 \001(\005H\000\022\021\n" +
       "\007percent\030\002 \001(\001H\000B\006\n\004type\032\201\003\n\017MetricThres" +
       "hold\022\016\n\006filter\030\002 \001(\t\0227\n\014aggregations\030\010 \003" +
-      "(\0132!.google.monitoring.v3.Aggregation\022\032\n" +
+      "(\0132!.google.monitoring.v3.Aggregation\022\032\n",
       "\022denominator_filter\030\t \001(\t\022C\n\030denominator" +
       "_aggregations\030\n \003(\0132!.google.monitoring." +
       "v3.Aggregation\0228\n\ncomparison\030\004 \001(\0162$.goo" +
@@ -97,7 +97,7 @@ public static void registerAllExtensions(
       "3.google.monitoring.v3.AlertPolicy.Condi" +
       "tion.Trigger\032\313\001\n\rMetricAbsence\022\016\n\006filter" +
       "\030\001 \001(\t\0227\n\014aggregations\030\005 \003(\0132!.google.mo" +
-      "nitoring.v3.Aggregation\022+\n\010duration\030\002 \001(" +
+      "nitoring.v3.Aggregation\022+\n\010duration\030\002 \001(",
       "\0132\031.google.protobuf.Duration\022D\n\007trigger\030" +
       "\003 \001(\01323.google.monitoring.v3.AlertPolicy" +
       ".Condition.TriggerB\013\n\tcondition\0321\n\017UserL" +
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "H_MATCHING_RESOURCE\020\003B\242\001\n\030com.google.mon" +
       "itoring.v3B\nAlertProtoP\001Z>google.golang." +
       "org/genproto/googleapis/monitoring/v3;mo" +
-      "nitoring\252\002\032Google.Cloud.Monitoring.V3\312\002\032" +
+      "nitoring\252\002\032Google.Cloud.Monitoring.V3\312\002\032",
       "Google\\Cloud\\Monitoring\\V3b\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertServiceProto.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertServiceProto.java
index 837023389d00..0f74cecc60f5 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/AlertServiceProto.java
@@ -62,7 +62,7 @@ public static void registerAllExtensions(
       "rt_policy\030\002 \001(\0132!.google.monitoring.v3.A" +
       "lertPolicy\"%\n\025GetAlertPolicyRequest\022\014\n\004n" +
       "ame\030\003 \001(\t\"q\n\030ListAlertPoliciesRequest\022\014\n" +
-      "\004name\030\004 \001(\t\022\016\n\006filter\030\005 \001(\t\022\020\n\010order_by\030" +
+      "\004name\030\004 \001(\t\022\016\n\006filter\030\005 \001(\t\022\020\n\010order_by\030",
       "\006 \001(\t\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_token\030\003" +
       " \001(\t\"o\n\031ListAlertPoliciesResponse\0229\n\016ale" +
       "rt_policies\030\003 \003(\0132!.google.monitoring.v3" +
@@ -72,7 +72,7 @@ public static void registerAllExtensions(
       "lert_policy\030\003 \001(\0132!.google.monitoring.v3" +
       ".AlertPolicy\"(\n\030DeleteAlertPolicyRequest" +
       "\022\014\n\004name\030\003 \001(\t2\256\006\n\022AlertPolicyService\022\241\001" +
-      "\n\021ListAlertPolicies\022..google.monitoring." +
+      "\n\021ListAlertPolicies\022..google.monitoring.",
       "v3.ListAlertPoliciesRequest\032/.google.mon" +
       "itoring.v3.ListAlertPoliciesResponse\"+\202\323" +
       "\344\223\002%\022#/v3/{name=projects/*}/alertPolicie" +
@@ -82,7 +82,7 @@ public static void registerAllExtensions(
       "projects/*/alertPolicies/*}\022\241\001\n\021CreateAl" +
       "ertPolicy\022..google.monitoring.v3.CreateA" +
       "lertPolicyRequest\032!.google.monitoring.v3" +
-      ".AlertPolicy\"9\202\323\344\223\0023\"#/v3/{name=projects" +
+      ".AlertPolicy\"9\202\323\344\223\0023\"#/v3/{name=projects",
       "/*}/alertPolicies:\014alert_policy\022\212\001\n\021Dele" +
       "teAlertPolicy\022..google.monitoring.v3.Del" +
       "eteAlertPolicyRequest\032\026.google.protobuf." +
@@ -92,7 +92,7 @@ public static void registerAllExtensions(
       "st\032!.google.monitoring.v3.AlertPolicy\"H\202" +
       "\323\344\223\002B22/v3/{alert_policy.name=projects/*" +
       "/alertPolicies/*}:\014alert_policyB\251\001\n\030com." +
-      "google.monitoring.v3B\021AlertServiceProtoP" +
+      "google.monitoring.v3B\021AlertServiceProtoP",
       "\001Z>google.golang.org/genproto/googleapis" +
       "/monitoring/v3;monitoring\252\002\032Google.Cloud" +
       ".Monitoring.V3\312\002\032Google\\Cloud\\Monitoring" +
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CommonProto.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CommonProto.java
index 7a24506174f9..cca8fc1f6e37 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CommonProto.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CommonProto.java
@@ -47,7 +47,7 @@ public static void registerAllExtensions(
       "\003H\000\022\026\n\014double_value\030\003 \001(\001H\000\022\026\n\014string_va" +
       "lue\030\004 \001(\tH\000\0226\n\022distribution_value\030\005 \001(\0132" +
       "\030.google.api.DistributionH\000B\007\n\005value\"l\n\014" +
-      "TimeInterval\022,\n\010end_time\030\002 \001(\0132\032.google." +
+      "TimeInterval\022,\n\010end_time\030\002 \001(\0132\032.google.",
       "protobuf.Timestamp\022.\n\nstart_time\030\001 \001(\0132\032" +
       ".google.protobuf.Timestamp\"\255\007\n\013Aggregati" +
       "on\0223\n\020alignment_period\030\001 \001(\0132\031.google.pr" +
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "oogle.monitoring.v3.Aggregation.Reducer\022" +
       "\027\n\017group_by_fields\030\005 \003(\t\"\213\003\n\007Aligner\022\016\n\n" +
       "ALIGN_NONE\020\000\022\017\n\013ALIGN_DELTA\020\001\022\016\n\nALIGN_R" +
-      "ATE\020\002\022\025\n\021ALIGN_INTERPOLATE\020\003\022\024\n\020ALIGN_NE" +
+      "ATE\020\002\022\025\n\021ALIGN_INTERPOLATE\020\003\022\024\n\020ALIGN_NE",
       "XT_OLDER\020\004\022\r\n\tALIGN_MIN\020\n\022\r\n\tALIGN_MAX\020\013" +
       "\022\016\n\nALIGN_MEAN\020\014\022\017\n\013ALIGN_COUNT\020\r\022\r\n\tALI" +
       "GN_SUM\020\016\022\020\n\014ALIGN_STDDEV\020\017\022\024\n\020ALIGN_COUN" +
@@ -67,7 +67,7 @@ public static void registerAllExtensions(
       "ENTILE_50\020\024\022\027\n\023ALIGN_PERCENTILE_05\020\025\022\030\n\024" +
       "ALIGN_PERCENT_CHANGE\020\027\"\261\002\n\007Reducer\022\017\n\013RE" +
       "DUCE_NONE\020\000\022\017\n\013REDUCE_MEAN\020\001\022\016\n\nREDUCE_M" +
-      "IN\020\002\022\016\n\nREDUCE_MAX\020\003\022\016\n\nREDUCE_SUM\020\004\022\021\n\r" +
+      "IN\020\002\022\016\n\nREDUCE_MAX\020\003\022\016\n\nREDUCE_SUM\020\004\022\021\n\r",
       "REDUCE_STDDEV\020\005\022\020\n\014REDUCE_COUNT\020\006\022\025\n\021RED" +
       "UCE_COUNT_TRUE\020\007\022\026\n\022REDUCE_COUNT_FALSE\020\017" +
       "\022\030\n\024REDUCE_FRACTION_TRUE\020\010\022\030\n\024REDUCE_PER" +
@@ -77,7 +77,7 @@ public static void registerAllExtensions(
       "SON_UNSPECIFIED\020\000\022\021\n\rCOMPARISON_GT\020\001\022\021\n\r" +
       "COMPARISON_GE\020\002\022\021\n\rCOMPARISON_LT\020\003\022\021\n\rCO" +
       "MPARISON_LE\020\004\022\021\n\rCOMPARISON_EQ\020\005\022\021\n\rCOMP" +
-      "ARISON_NE\020\006*a\n\013ServiceTier\022\034\n\030SERVICE_TI" +
+      "ARISON_NE\020\006*a\n\013ServiceTier\022\034\n\030SERVICE_TI",
       "ER_UNSPECIFIED\020\000\022\026\n\022SERVICE_TIER_BASIC\020\001" +
       "\022\030\n\024SERVICE_TIER_PREMIUM\020\002\032\002\030\001B\243\001\n\030com.g" +
       "oogle.monitoring.v3B\013CommonProtoP\001Z>goog" +
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateAlertPolicyRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateAlertPolicyRequest.java
index 3e7c856c25dd..7d494be19984 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateAlertPolicyRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateAlertPolicyRequest.java
@@ -33,9 +33,6 @@ private CreateAlertPolicyRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private CreateAlertPolicyRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             com.google.monitoring.v3.AlertPolicy.Builder subBuilder = null;
             if (alertPolicy_ != null) {
@@ -66,13 +70,6 @@ private CreateAlertPolicyRequest(
             name_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private CreateAlertPolicyRequest(
     return com.google.monitoring.v3.AlertServiceProto.internal_static_google_monitoring_v3_CreateAlertPolicyRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.AlertServiceProto.internal_static_google_monitoring_v3_CreateAlertPolicyRequest_fieldAccessorTable
@@ -192,7 +188,6 @@ public com.google.monitoring.v3.AlertPolicyOrBuilder getAlertPolicyOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -202,7 +197,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (alertPolicy_ != null) {
@@ -214,7 +208,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -342,7 +335,6 @@ public static com.google.monitoring.v3.CreateAlertPolicyRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -350,7 +342,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.CreateAlertPolicyRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -378,7 +369,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.AlertServiceProto.internal_static_google_monitoring_v3_CreateAlertPolicyRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.AlertServiceProto.internal_static_google_monitoring_v3_CreateAlertPolicyRequest_fieldAccessorTable
@@ -401,7 +391,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -415,18 +404,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.AlertServiceProto.internal_static_google_monitoring_v3_CreateAlertPolicyRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.CreateAlertPolicyRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.CreateAlertPolicyRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.CreateAlertPolicyRequest build() {
       com.google.monitoring.v3.CreateAlertPolicyRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -435,7 +421,6 @@ public com.google.monitoring.v3.CreateAlertPolicyRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.CreateAlertPolicyRequest buildPartial() {
       com.google.monitoring.v3.CreateAlertPolicyRequest result = new com.google.monitoring.v3.CreateAlertPolicyRequest(this);
       result.name_ = name_;
@@ -448,39 +433,32 @@ public com.google.monitoring.v3.CreateAlertPolicyRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.CreateAlertPolicyRequest) {
         return mergeFrom((com.google.monitoring.v3.CreateAlertPolicyRequest)other);
@@ -504,12 +482,10 @@ public Builder mergeFrom(com.google.monitoring.v3.CreateAlertPolicyRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -817,13 +793,11 @@ public com.google.monitoring.v3.AlertPolicyOrBuilder getAlertPolicyOrBuilder() {
       }
       return alertPolicyBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -845,12 +819,11 @@ public static com.google.monitoring.v3.CreateAlertPolicyRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateAlertPolicyRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateAlertPolicyRequest(input, extensionRegistry);
+        return new CreateAlertPolicyRequest(input, extensionRegistry);
     }
   };
 
@@ -863,7 +836,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.CreateAlertPolicyRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateGroupRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateGroupRequest.java
index 792a7e9720ed..0952822647a1 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateGroupRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateGroupRequest.java
@@ -34,9 +34,6 @@ private CreateGroupRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private CreateGroupRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             com.google.monitoring.v3.Group.Builder subBuilder = null;
             if (group_ != null) {
@@ -72,13 +76,6 @@ private CreateGroupRequest(
             name_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private CreateGroupRequest(
     return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_CreateGroupRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_CreateGroupRequest_fieldAccessorTable
@@ -198,7 +194,6 @@ public boolean getValidateOnly() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -208,7 +203,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (group_ != null) {
@@ -223,7 +217,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -360,7 +353,6 @@ public static com.google.monitoring.v3.CreateGroupRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -368,7 +360,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.CreateGroupRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -396,7 +387,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_CreateGroupRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_CreateGroupRequest_fieldAccessorTable
@@ -419,7 +409,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -435,18 +424,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_CreateGroupRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.CreateGroupRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.CreateGroupRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.CreateGroupRequest build() {
       com.google.monitoring.v3.CreateGroupRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -455,7 +441,6 @@ public com.google.monitoring.v3.CreateGroupRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.CreateGroupRequest buildPartial() {
       com.google.monitoring.v3.CreateGroupRequest result = new com.google.monitoring.v3.CreateGroupRequest(this);
       result.name_ = name_;
@@ -469,39 +454,32 @@ public com.google.monitoring.v3.CreateGroupRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.CreateGroupRequest) {
         return mergeFrom((com.google.monitoring.v3.CreateGroupRequest)other);
@@ -528,12 +506,10 @@ public Builder mergeFrom(com.google.monitoring.v3.CreateGroupRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -845,13 +821,11 @@ public Builder clearValidateOnly() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -873,12 +847,11 @@ public static com.google.monitoring.v3.CreateGroupRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateGroupRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateGroupRequest(input, extensionRegistry);
+        return new CreateGroupRequest(input, extensionRegistry);
     }
   };
 
@@ -891,7 +864,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.CreateGroupRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateMetricDescriptorRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateMetricDescriptorRequest.java
index fba89e0e7288..290fe3546a8a 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateMetricDescriptorRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateMetricDescriptorRequest.java
@@ -33,9 +33,6 @@ private CreateMetricDescriptorRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private CreateMetricDescriptorRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             com.google.api.MetricDescriptor.Builder subBuilder = null;
             if (metricDescriptor_ != null) {
@@ -66,13 +70,6 @@ private CreateMetricDescriptorRequest(
             name_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private CreateMetricDescriptorRequest(
     return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_CreateMetricDescriptorRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_CreateMetricDescriptorRequest_fieldAccessorTable
@@ -179,7 +175,6 @@ public com.google.api.MetricDescriptorOrBuilder getMetricDescriptorOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -189,7 +184,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (metricDescriptor_ != null) {
@@ -201,7 +195,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -329,7 +322,6 @@ public static com.google.monitoring.v3.CreateMetricDescriptorRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -337,7 +329,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.CreateMetricDescriptorRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -365,7 +356,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_CreateMetricDescriptorRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_CreateMetricDescriptorRequest_fieldAccessorTable
@@ -388,7 +378,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -402,18 +391,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_CreateMetricDescriptorRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.CreateMetricDescriptorRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.CreateMetricDescriptorRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.CreateMetricDescriptorRequest build() {
       com.google.monitoring.v3.CreateMetricDescriptorRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -422,7 +408,6 @@ public com.google.monitoring.v3.CreateMetricDescriptorRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.CreateMetricDescriptorRequest buildPartial() {
       com.google.monitoring.v3.CreateMetricDescriptorRequest result = new com.google.monitoring.v3.CreateMetricDescriptorRequest(this);
       result.name_ = name_;
@@ -435,39 +420,32 @@ public com.google.monitoring.v3.CreateMetricDescriptorRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.CreateMetricDescriptorRequest) {
         return mergeFrom((com.google.monitoring.v3.CreateMetricDescriptorRequest)other);
@@ -491,12 +469,10 @@ public Builder mergeFrom(com.google.monitoring.v3.CreateMetricDescriptorRequest
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -770,13 +746,11 @@ public com.google.api.MetricDescriptorOrBuilder getMetricDescriptorOrBuilder() {
       }
       return metricDescriptorBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -798,12 +772,11 @@ public static com.google.monitoring.v3.CreateMetricDescriptorRequest getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateMetricDescriptorRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateMetricDescriptorRequest(input, extensionRegistry);
+        return new CreateMetricDescriptorRequest(input, extensionRegistry);
     }
   };
 
@@ -816,7 +789,6 @@ public com.google.protobuf.Parser getParserForTyp
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.CreateMetricDescriptorRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateNotificationChannelRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateNotificationChannelRequest.java
index eefe146b77eb..bb358507c05c 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateNotificationChannelRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateNotificationChannelRequest.java
@@ -33,9 +33,6 @@ private CreateNotificationChannelRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private CreateNotificationChannelRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             com.google.monitoring.v3.NotificationChannel.Builder subBuilder = null;
             if (notificationChannel_ != null) {
@@ -66,13 +70,6 @@ private CreateNotificationChannelRequest(
             name_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private CreateNotificationChannelRequest(
     return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_CreateNotificationChannelRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_CreateNotificationChannelRequest_fieldAccessorTable
@@ -184,7 +180,6 @@ public com.google.monitoring.v3.NotificationChannelOrBuilder getNotificationChan
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -194,7 +189,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (notificationChannel_ != null) {
@@ -206,7 +200,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -334,7 +327,6 @@ public static com.google.monitoring.v3.CreateNotificationChannelRequest parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -342,7 +334,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.CreateNotificationChannelRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -370,7 +361,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_CreateNotificationChannelRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_CreateNotificationChannelRequest_fieldAccessorTable
@@ -393,7 +383,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -407,18 +396,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_CreateNotificationChannelRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.CreateNotificationChannelRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.CreateNotificationChannelRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.CreateNotificationChannelRequest build() {
       com.google.monitoring.v3.CreateNotificationChannelRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -427,7 +413,6 @@ public com.google.monitoring.v3.CreateNotificationChannelRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.CreateNotificationChannelRequest buildPartial() {
       com.google.monitoring.v3.CreateNotificationChannelRequest result = new com.google.monitoring.v3.CreateNotificationChannelRequest(this);
       result.name_ = name_;
@@ -440,39 +425,32 @@ public com.google.monitoring.v3.CreateNotificationChannelRequest buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.CreateNotificationChannelRequest) {
         return mergeFrom((com.google.monitoring.v3.CreateNotificationChannelRequest)other);
@@ -496,12 +474,10 @@ public Builder mergeFrom(com.google.monitoring.v3.CreateNotificationChannelReque
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -786,13 +762,11 @@ public com.google.monitoring.v3.NotificationChannelOrBuilder getNotificationChan
       }
       return notificationChannelBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -814,12 +788,11 @@ public static com.google.monitoring.v3.CreateNotificationChannelRequest getDefau
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateNotificationChannelRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateNotificationChannelRequest(input, extensionRegistry);
+        return new CreateNotificationChannelRequest(input, extensionRegistry);
     }
   };
 
@@ -832,7 +805,6 @@ public com.google.protobuf.Parser getParserFor
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.CreateNotificationChannelRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateTimeSeriesError.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateTimeSeriesError.java
index 89a03b424a10..0d0935cdcdf4 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateTimeSeriesError.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateTimeSeriesError.java
@@ -32,9 +32,6 @@ private CreateTimeSeriesError(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private CreateTimeSeriesError(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.monitoring.v3.TimeSeries.Builder subBuilder = null;
             if (timeSeries_ != null) {
@@ -72,13 +76,6 @@ private CreateTimeSeriesError(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private CreateTimeSeriesError(
     return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_CreateTimeSeriesError_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_CreateTimeSeriesError_fieldAccessorTable
@@ -180,7 +176,6 @@ public com.google.rpc.StatusOrBuilder getStatusOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -190,7 +185,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (timeSeries_ != null) {
@@ -202,7 +196,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -336,7 +329,6 @@ public static com.google.monitoring.v3.CreateTimeSeriesError parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -344,7 +336,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.CreateTimeSeriesError prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -372,7 +363,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_CreateTimeSeriesError_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_CreateTimeSeriesError_fieldAccessorTable
@@ -395,7 +385,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (timeSeriesBuilder_ == null) {
@@ -413,18 +402,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_CreateTimeSeriesError_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.CreateTimeSeriesError getDefaultInstanceForType() {
       return com.google.monitoring.v3.CreateTimeSeriesError.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.CreateTimeSeriesError build() {
       com.google.monitoring.v3.CreateTimeSeriesError result = buildPartial();
       if (!result.isInitialized()) {
@@ -433,7 +419,6 @@ public com.google.monitoring.v3.CreateTimeSeriesError build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.CreateTimeSeriesError buildPartial() {
       com.google.monitoring.v3.CreateTimeSeriesError result = new com.google.monitoring.v3.CreateTimeSeriesError(this);
       if (timeSeriesBuilder_ == null) {
@@ -450,39 +435,32 @@ public com.google.monitoring.v3.CreateTimeSeriesError buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.CreateTimeSeriesError) {
         return mergeFrom((com.google.monitoring.v3.CreateTimeSeriesError)other);
@@ -505,12 +483,10 @@ public Builder mergeFrom(com.google.monitoring.v3.CreateTimeSeriesError other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -861,13 +837,11 @@ public com.google.rpc.StatusOrBuilder getStatusOrBuilder() {
       }
       return statusBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -889,12 +863,11 @@ public static com.google.monitoring.v3.CreateTimeSeriesError getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateTimeSeriesError parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateTimeSeriesError(input, extensionRegistry);
+        return new CreateTimeSeriesError(input, extensionRegistry);
     }
   };
 
@@ -907,7 +880,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.CreateTimeSeriesError getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateTimeSeriesRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateTimeSeriesRequest.java
index dbb3c15538c1..60105e8fad69 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateTimeSeriesRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateTimeSeriesRequest.java
@@ -34,9 +34,6 @@ private CreateTimeSeriesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private CreateTimeSeriesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
               timeSeries_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private CreateTimeSeriesRequest(
             name_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private CreateTimeSeriesRequest(
     return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_CreateTimeSeriesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_CreateTimeSeriesRequest_fieldAccessorTable
@@ -219,7 +215,6 @@ public com.google.monitoring.v3.TimeSeriesOrBuilder getTimeSeriesOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -229,7 +224,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < timeSeries_.size(); i++) {
@@ -241,7 +235,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -366,7 +359,6 @@ public static com.google.monitoring.v3.CreateTimeSeriesRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -374,7 +366,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.CreateTimeSeriesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -402,7 +393,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_CreateTimeSeriesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_CreateTimeSeriesRequest_fieldAccessorTable
@@ -426,7 +416,6 @@ private void maybeForceBuilderInitialization() {
         getTimeSeriesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -440,18 +429,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_CreateTimeSeriesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.CreateTimeSeriesRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.CreateTimeSeriesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.CreateTimeSeriesRequest build() {
       com.google.monitoring.v3.CreateTimeSeriesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -460,7 +446,6 @@ public com.google.monitoring.v3.CreateTimeSeriesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.CreateTimeSeriesRequest buildPartial() {
       com.google.monitoring.v3.CreateTimeSeriesRequest result = new com.google.monitoring.v3.CreateTimeSeriesRequest(this);
       int from_bitField0_ = bitField0_;
@@ -480,39 +465,32 @@ public com.google.monitoring.v3.CreateTimeSeriesRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.CreateTimeSeriesRequest) {
         return mergeFrom((com.google.monitoring.v3.CreateTimeSeriesRequest)other);
@@ -559,12 +537,10 @@ public Builder mergeFrom(com.google.monitoring.v3.CreateTimeSeriesRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1061,13 +1037,11 @@ public com.google.monitoring.v3.TimeSeries.Builder addTimeSeriesBuilder(
       }
       return timeSeriesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1089,12 +1063,11 @@ public static com.google.monitoring.v3.CreateTimeSeriesRequest getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateTimeSeriesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateTimeSeriesRequest(input, extensionRegistry);
+        return new CreateTimeSeriesRequest(input, extensionRegistry);
     }
   };
 
@@ -1107,7 +1080,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.CreateTimeSeriesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateUptimeCheckConfigRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateUptimeCheckConfigRequest.java
index 30d89c9193a2..efdf1f263dbe 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateUptimeCheckConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/CreateUptimeCheckConfigRequest.java
@@ -33,9 +33,6 @@ private CreateUptimeCheckConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private CreateUptimeCheckConfigRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private CreateUptimeCheckConfigRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private CreateUptimeCheckConfigRequest(
     return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_CreateUptimeCheckConfigRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_CreateUptimeCheckConfigRequest_fieldAccessorTable
@@ -176,7 +172,6 @@ public com.google.monitoring.v3.UptimeCheckConfigOrBuilder getUptimeCheckConfigO
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -186,7 +181,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -198,7 +192,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -326,7 +319,6 @@ public static com.google.monitoring.v3.CreateUptimeCheckConfigRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -334,7 +326,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.CreateUptimeCheckConfigRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -362,7 +353,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_CreateUptimeCheckConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_CreateUptimeCheckConfigRequest_fieldAccessorTable
@@ -385,7 +375,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -399,18 +388,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_CreateUptimeCheckConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.CreateUptimeCheckConfigRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.CreateUptimeCheckConfigRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.CreateUptimeCheckConfigRequest build() {
       com.google.monitoring.v3.CreateUptimeCheckConfigRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -419,7 +405,6 @@ public com.google.monitoring.v3.CreateUptimeCheckConfigRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.CreateUptimeCheckConfigRequest buildPartial() {
       com.google.monitoring.v3.CreateUptimeCheckConfigRequest result = new com.google.monitoring.v3.CreateUptimeCheckConfigRequest(this);
       result.parent_ = parent_;
@@ -432,39 +417,32 @@ public com.google.monitoring.v3.CreateUptimeCheckConfigRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.CreateUptimeCheckConfigRequest) {
         return mergeFrom((com.google.monitoring.v3.CreateUptimeCheckConfigRequest)other);
@@ -488,12 +466,10 @@ public Builder mergeFrom(com.google.monitoring.v3.CreateUptimeCheckConfigRequest
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -758,13 +734,11 @@ public com.google.monitoring.v3.UptimeCheckConfigOrBuilder getUptimeCheckConfigO
       }
       return uptimeCheckConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -786,12 +760,11 @@ public static com.google.monitoring.v3.CreateUptimeCheckConfigRequest getDefault
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateUptimeCheckConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateUptimeCheckConfigRequest(input, extensionRegistry);
+        return new CreateUptimeCheckConfigRequest(input, extensionRegistry);
     }
   };
 
@@ -804,7 +777,6 @@ public com.google.protobuf.Parser getParserForTy
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.CreateUptimeCheckConfigRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteAlertPolicyRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteAlertPolicyRequest.java
index 53123921d56c..1bc70169f8fd 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteAlertPolicyRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteAlertPolicyRequest.java
@@ -33,9 +33,6 @@ private DeleteAlertPolicyRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteAlertPolicyRequest(
           case 0:
             done = true;
             break;
-          case 26: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteAlertPolicyRequest(
             }
             break;
           }
+          case 26: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteAlertPolicyRequest(
     return com.google.monitoring.v3.AlertServiceProto.internal_static_google_monitoring_v3_DeleteAlertPolicyRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.AlertServiceProto.internal_static_google_monitoring_v3_DeleteAlertPolicyRequest_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.monitoring.v3.DeleteAlertPolicyRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.DeleteAlertPolicyRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.AlertServiceProto.internal_static_google_monitoring_v3_DeleteAlertPolicyRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.AlertServiceProto.internal_static_google_monitoring_v3_DeleteAlertPolicyRequest_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.AlertServiceProto.internal_static_google_monitoring_v3_DeleteAlertPolicyRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.DeleteAlertPolicyRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.DeleteAlertPolicyRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.DeleteAlertPolicyRequest build() {
       com.google.monitoring.v3.DeleteAlertPolicyRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.monitoring.v3.DeleteAlertPolicyRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.DeleteAlertPolicyRequest buildPartial() {
       com.google.monitoring.v3.DeleteAlertPolicyRequest result = new com.google.monitoring.v3.DeleteAlertPolicyRequest(this);
       result.name_ = name_;
@@ -361,39 +346,32 @@ public com.google.monitoring.v3.DeleteAlertPolicyRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.DeleteAlertPolicyRequest) {
         return mergeFrom((com.google.monitoring.v3.DeleteAlertPolicyRequest)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.monitoring.v3.DeleteAlertPolicyRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.monitoring.v3.DeleteAlertPolicyRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteAlertPolicyRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteAlertPolicyRequest(input, extensionRegistry);
+        return new DeleteAlertPolicyRequest(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.DeleteAlertPolicyRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteGroupRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteGroupRequest.java
index 95d822ad704f..a989da39793d 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteGroupRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteGroupRequest.java
@@ -33,9 +33,6 @@ private DeleteGroupRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteGroupRequest(
           case 0:
             done = true;
             break;
-          case 26: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteGroupRequest(
             }
             break;
           }
+          case 26: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteGroupRequest(
     return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_DeleteGroupRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_DeleteGroupRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.monitoring.v3.DeleteGroupRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.DeleteGroupRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_DeleteGroupRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_DeleteGroupRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_DeleteGroupRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.DeleteGroupRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.DeleteGroupRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.DeleteGroupRequest build() {
       com.google.monitoring.v3.DeleteGroupRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.monitoring.v3.DeleteGroupRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.DeleteGroupRequest buildPartial() {
       com.google.monitoring.v3.DeleteGroupRequest result = new com.google.monitoring.v3.DeleteGroupRequest(this);
       result.name_ = name_;
@@ -359,39 +344,32 @@ public com.google.monitoring.v3.DeleteGroupRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.DeleteGroupRequest) {
         return mergeFrom((com.google.monitoring.v3.DeleteGroupRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.monitoring.v3.DeleteGroupRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.monitoring.v3.DeleteGroupRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteGroupRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteGroupRequest(input, extensionRegistry);
+        return new DeleteGroupRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.DeleteGroupRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteMetricDescriptorRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteMetricDescriptorRequest.java
index 3dc2c0d8454e..ed4026d00e2e 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteMetricDescriptorRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteMetricDescriptorRequest.java
@@ -33,9 +33,6 @@ private DeleteMetricDescriptorRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteMetricDescriptorRequest(
           case 0:
             done = true;
             break;
-          case 26: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteMetricDescriptorRequest(
             }
             break;
           }
+          case 26: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteMetricDescriptorRequest(
     return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_DeleteMetricDescriptorRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_DeleteMetricDescriptorRequest_fieldAccessorTable
@@ -134,7 +130,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -144,7 +139,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -153,7 +147,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -268,7 +261,6 @@ public static com.google.monitoring.v3.DeleteMetricDescriptorRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -276,7 +268,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.DeleteMetricDescriptorRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -304,7 +295,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_DeleteMetricDescriptorRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_DeleteMetricDescriptorRequest_fieldAccessorTable
@@ -327,7 +317,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -335,18 +324,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_DeleteMetricDescriptorRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.DeleteMetricDescriptorRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.DeleteMetricDescriptorRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.DeleteMetricDescriptorRequest build() {
       com.google.monitoring.v3.DeleteMetricDescriptorRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -355,7 +341,6 @@ public com.google.monitoring.v3.DeleteMetricDescriptorRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.DeleteMetricDescriptorRequest buildPartial() {
       com.google.monitoring.v3.DeleteMetricDescriptorRequest result = new com.google.monitoring.v3.DeleteMetricDescriptorRequest(this);
       result.name_ = name_;
@@ -363,39 +348,32 @@ public com.google.monitoring.v3.DeleteMetricDescriptorRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.DeleteMetricDescriptorRequest) {
         return mergeFrom((com.google.monitoring.v3.DeleteMetricDescriptorRequest)other);
@@ -416,12 +394,10 @@ public Builder mergeFrom(com.google.monitoring.v3.DeleteMetricDescriptorRequest
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -543,13 +519,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -571,12 +545,11 @@ public static com.google.monitoring.v3.DeleteMetricDescriptorRequest getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteMetricDescriptorRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteMetricDescriptorRequest(input, extensionRegistry);
+        return new DeleteMetricDescriptorRequest(input, extensionRegistry);
     }
   };
 
@@ -589,7 +562,6 @@ public com.google.protobuf.Parser getParserForTyp
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.DeleteMetricDescriptorRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteNotificationChannelRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteNotificationChannelRequest.java
index e243d28a588b..b9e544f9e63d 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteNotificationChannelRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteNotificationChannelRequest.java
@@ -34,9 +34,6 @@ private DeleteNotificationChannelRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private DeleteNotificationChannelRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 26: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -59,13 +63,6 @@ private DeleteNotificationChannelRequest(
             force_ = input.readBool();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private DeleteNotificationChannelRequest(
     return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_DeleteNotificationChannelRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_DeleteNotificationChannelRequest_fieldAccessorTable
@@ -152,7 +148,6 @@ public boolean getForce() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -162,7 +157,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -174,7 +168,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -298,7 +291,6 @@ public static com.google.monitoring.v3.DeleteNotificationChannelRequest parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -306,7 +298,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.DeleteNotificationChannelRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -334,7 +325,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_DeleteNotificationChannelRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_DeleteNotificationChannelRequest_fieldAccessorTable
@@ -357,7 +347,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -367,18 +356,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_DeleteNotificationChannelRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.DeleteNotificationChannelRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.DeleteNotificationChannelRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.DeleteNotificationChannelRequest build() {
       com.google.monitoring.v3.DeleteNotificationChannelRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -387,7 +373,6 @@ public com.google.monitoring.v3.DeleteNotificationChannelRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.DeleteNotificationChannelRequest buildPartial() {
       com.google.monitoring.v3.DeleteNotificationChannelRequest result = new com.google.monitoring.v3.DeleteNotificationChannelRequest(this);
       result.name_ = name_;
@@ -396,39 +381,32 @@ public com.google.monitoring.v3.DeleteNotificationChannelRequest buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.DeleteNotificationChannelRequest) {
         return mergeFrom((com.google.monitoring.v3.DeleteNotificationChannelRequest)other);
@@ -452,12 +430,10 @@ public Builder mergeFrom(com.google.monitoring.v3.DeleteNotificationChannelReque
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -616,13 +592,11 @@ public Builder clearForce() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -644,12 +618,11 @@ public static com.google.monitoring.v3.DeleteNotificationChannelRequest getDefau
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteNotificationChannelRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteNotificationChannelRequest(input, extensionRegistry);
+        return new DeleteNotificationChannelRequest(input, extensionRegistry);
     }
   };
 
@@ -662,7 +635,6 @@ public com.google.protobuf.Parser getParserFor
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.DeleteNotificationChannelRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteUptimeCheckConfigRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteUptimeCheckConfigRequest.java
index 545bfa7c288e..0385442308c3 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteUptimeCheckConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/DeleteUptimeCheckConfigRequest.java
@@ -33,9 +33,6 @@ private DeleteUptimeCheckConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteUptimeCheckConfigRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteUptimeCheckConfigRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteUptimeCheckConfigRequest(
     return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_DeleteUptimeCheckConfigRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_DeleteUptimeCheckConfigRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.monitoring.v3.DeleteUptimeCheckConfigRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.DeleteUptimeCheckConfigRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_DeleteUptimeCheckConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_DeleteUptimeCheckConfigRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_DeleteUptimeCheckConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.DeleteUptimeCheckConfigRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.DeleteUptimeCheckConfigRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.DeleteUptimeCheckConfigRequest build() {
       com.google.monitoring.v3.DeleteUptimeCheckConfigRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.monitoring.v3.DeleteUptimeCheckConfigRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.DeleteUptimeCheckConfigRequest buildPartial() {
       com.google.monitoring.v3.DeleteUptimeCheckConfigRequest result = new com.google.monitoring.v3.DeleteUptimeCheckConfigRequest(this);
       result.name_ = name_;
@@ -359,39 +344,32 @@ public com.google.monitoring.v3.DeleteUptimeCheckConfigRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.DeleteUptimeCheckConfigRequest) {
         return mergeFrom((com.google.monitoring.v3.DeleteUptimeCheckConfigRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.monitoring.v3.DeleteUptimeCheckConfigRequest
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.monitoring.v3.DeleteUptimeCheckConfigRequest getDefault
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteUptimeCheckConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteUptimeCheckConfigRequest(input, extensionRegistry);
+        return new DeleteUptimeCheckConfigRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForTy
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.DeleteUptimeCheckConfigRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetAlertPolicyRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetAlertPolicyRequest.java
index ddf663648158..39c74eb15d4a 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetAlertPolicyRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetAlertPolicyRequest.java
@@ -33,9 +33,6 @@ private GetAlertPolicyRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetAlertPolicyRequest(
           case 0:
             done = true;
             break;
-          case 26: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetAlertPolicyRequest(
             }
             break;
           }
+          case 26: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetAlertPolicyRequest(
     return com.google.monitoring.v3.AlertServiceProto.internal_static_google_monitoring_v3_GetAlertPolicyRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.AlertServiceProto.internal_static_google_monitoring_v3_GetAlertPolicyRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.monitoring.v3.GetAlertPolicyRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.GetAlertPolicyRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.AlertServiceProto.internal_static_google_monitoring_v3_GetAlertPolicyRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.AlertServiceProto.internal_static_google_monitoring_v3_GetAlertPolicyRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.AlertServiceProto.internal_static_google_monitoring_v3_GetAlertPolicyRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.GetAlertPolicyRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.GetAlertPolicyRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.GetAlertPolicyRequest build() {
       com.google.monitoring.v3.GetAlertPolicyRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.monitoring.v3.GetAlertPolicyRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.GetAlertPolicyRequest buildPartial() {
       com.google.monitoring.v3.GetAlertPolicyRequest result = new com.google.monitoring.v3.GetAlertPolicyRequest(this);
       result.name_ = name_;
@@ -359,39 +344,32 @@ public com.google.monitoring.v3.GetAlertPolicyRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.GetAlertPolicyRequest) {
         return mergeFrom((com.google.monitoring.v3.GetAlertPolicyRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.monitoring.v3.GetAlertPolicyRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.monitoring.v3.GetAlertPolicyRequest getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetAlertPolicyRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetAlertPolicyRequest(input, extensionRegistry);
+        return new GetAlertPolicyRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.GetAlertPolicyRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetGroupRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetGroupRequest.java
index 38423d31bf48..7cf7cc52e6cf 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetGroupRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetGroupRequest.java
@@ -33,9 +33,6 @@ private GetGroupRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetGroupRequest(
           case 0:
             done = true;
             break;
-          case 26: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetGroupRequest(
             }
             break;
           }
+          case 26: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetGroupRequest(
     return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_GetGroupRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_GetGroupRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.monitoring.v3.GetGroupRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.GetGroupRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_GetGroupRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_GetGroupRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_GetGroupRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.GetGroupRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.GetGroupRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.GetGroupRequest build() {
       com.google.monitoring.v3.GetGroupRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.monitoring.v3.GetGroupRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.GetGroupRequest buildPartial() {
       com.google.monitoring.v3.GetGroupRequest result = new com.google.monitoring.v3.GetGroupRequest(this);
       result.name_ = name_;
@@ -359,39 +344,32 @@ public com.google.monitoring.v3.GetGroupRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.GetGroupRequest) {
         return mergeFrom((com.google.monitoring.v3.GetGroupRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.monitoring.v3.GetGroupRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.monitoring.v3.GetGroupRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetGroupRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetGroupRequest(input, extensionRegistry);
+        return new GetGroupRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.GetGroupRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetMetricDescriptorRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetMetricDescriptorRequest.java
index befa49a3bb03..560bff8b8ec1 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetMetricDescriptorRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetMetricDescriptorRequest.java
@@ -33,9 +33,6 @@ private GetMetricDescriptorRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetMetricDescriptorRequest(
           case 0:
             done = true;
             break;
-          case 26: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetMetricDescriptorRequest(
             }
             break;
           }
+          case 26: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetMetricDescriptorRequest(
     return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_GetMetricDescriptorRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_GetMetricDescriptorRequest_fieldAccessorTable
@@ -134,7 +130,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -144,7 +139,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -153,7 +147,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -268,7 +261,6 @@ public static com.google.monitoring.v3.GetMetricDescriptorRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -276,7 +268,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.GetMetricDescriptorRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -304,7 +295,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_GetMetricDescriptorRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_GetMetricDescriptorRequest_fieldAccessorTable
@@ -327,7 +317,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -335,18 +324,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_GetMetricDescriptorRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.GetMetricDescriptorRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.GetMetricDescriptorRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.GetMetricDescriptorRequest build() {
       com.google.monitoring.v3.GetMetricDescriptorRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -355,7 +341,6 @@ public com.google.monitoring.v3.GetMetricDescriptorRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.GetMetricDescriptorRequest buildPartial() {
       com.google.monitoring.v3.GetMetricDescriptorRequest result = new com.google.monitoring.v3.GetMetricDescriptorRequest(this);
       result.name_ = name_;
@@ -363,39 +348,32 @@ public com.google.monitoring.v3.GetMetricDescriptorRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.GetMetricDescriptorRequest) {
         return mergeFrom((com.google.monitoring.v3.GetMetricDescriptorRequest)other);
@@ -416,12 +394,10 @@ public Builder mergeFrom(com.google.monitoring.v3.GetMetricDescriptorRequest oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -543,13 +519,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -571,12 +545,11 @@ public static com.google.monitoring.v3.GetMetricDescriptorRequest getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetMetricDescriptorRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetMetricDescriptorRequest(input, extensionRegistry);
+        return new GetMetricDescriptorRequest(input, extensionRegistry);
     }
   };
 
@@ -589,7 +562,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.GetMetricDescriptorRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetMonitoredResourceDescriptorRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetMonitoredResourceDescriptorRequest.java
index 6d0098b78da8..4bb0ee9acb49 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetMonitoredResourceDescriptorRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetMonitoredResourceDescriptorRequest.java
@@ -33,9 +33,6 @@ private GetMonitoredResourceDescriptorRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetMonitoredResourceDescriptorRequest(
           case 0:
             done = true;
             break;
-          case 26: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetMonitoredResourceDescriptorRequest(
             }
             break;
           }
+          case 26: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetMonitoredResourceDescriptorRequest(
     return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_GetMonitoredResourceDescriptorRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_GetMonitoredResourceDescriptorRequest_fieldAccessorTable
@@ -134,7 +130,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -144,7 +139,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -153,7 +147,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -268,7 +261,6 @@ public static com.google.monitoring.v3.GetMonitoredResourceDescriptorRequest par
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -276,7 +268,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.GetMonitoredResourceDescriptorRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -304,7 +295,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_GetMonitoredResourceDescriptorRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_GetMonitoredResourceDescriptorRequest_fieldAccessorTable
@@ -327,7 +317,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -335,18 +324,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_GetMonitoredResourceDescriptorRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.GetMonitoredResourceDescriptorRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.GetMonitoredResourceDescriptorRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.GetMonitoredResourceDescriptorRequest build() {
       com.google.monitoring.v3.GetMonitoredResourceDescriptorRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -355,7 +341,6 @@ public com.google.monitoring.v3.GetMonitoredResourceDescriptorRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.GetMonitoredResourceDescriptorRequest buildPartial() {
       com.google.monitoring.v3.GetMonitoredResourceDescriptorRequest result = new com.google.monitoring.v3.GetMonitoredResourceDescriptorRequest(this);
       result.name_ = name_;
@@ -363,39 +348,32 @@ public com.google.monitoring.v3.GetMonitoredResourceDescriptorRequest buildParti
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.GetMonitoredResourceDescriptorRequest) {
         return mergeFrom((com.google.monitoring.v3.GetMonitoredResourceDescriptorRequest)other);
@@ -416,12 +394,10 @@ public Builder mergeFrom(com.google.monitoring.v3.GetMonitoredResourceDescriptor
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -543,13 +519,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -571,12 +545,11 @@ public static com.google.monitoring.v3.GetMonitoredResourceDescriptorRequest get
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetMonitoredResourceDescriptorRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetMonitoredResourceDescriptorRequest(input, extensionRegistry);
+        return new GetMonitoredResourceDescriptorRequest(input, extensionRegistry);
     }
   };
 
@@ -589,7 +562,6 @@ public com.google.protobuf.Parser getPars
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.GetMonitoredResourceDescriptorRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelDescriptorRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelDescriptorRequest.java
index 794def7bdd7c..0f88011b4cb4 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelDescriptorRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelDescriptorRequest.java
@@ -33,9 +33,6 @@ private GetNotificationChannelDescriptorRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetNotificationChannelDescriptorRequest(
           case 0:
             done = true;
             break;
-          case 26: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetNotificationChannelDescriptorRequest(
             }
             break;
           }
+          case 26: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetNotificationChannelDescriptorRequest(
     return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_GetNotificationChannelDescriptorRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_GetNotificationChannelDescriptorRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.monitoring.v3.GetNotificationChannelDescriptorRequest p
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.GetNotificationChannelDescriptorRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_GetNotificationChannelDescriptorRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_GetNotificationChannelDescriptorRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_GetNotificationChannelDescriptorRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.GetNotificationChannelDescriptorRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.GetNotificationChannelDescriptorRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.GetNotificationChannelDescriptorRequest build() {
       com.google.monitoring.v3.GetNotificationChannelDescriptorRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.monitoring.v3.GetNotificationChannelDescriptorRequest build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.GetNotificationChannelDescriptorRequest buildPartial() {
       com.google.monitoring.v3.GetNotificationChannelDescriptorRequest result = new com.google.monitoring.v3.GetNotificationChannelDescriptorRequest(this);
       result.name_ = name_;
@@ -359,39 +344,32 @@ public com.google.monitoring.v3.GetNotificationChannelDescriptorRequest buildPar
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.GetNotificationChannelDescriptorRequest) {
         return mergeFrom((com.google.monitoring.v3.GetNotificationChannelDescriptorRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.monitoring.v3.GetNotificationChannelDescript
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.monitoring.v3.GetNotificationChannelDescriptorRequest g
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetNotificationChannelDescriptorRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetNotificationChannelDescriptorRequest(input, extensionRegistry);
+        return new GetNotificationChannelDescriptorRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getPa
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.GetNotificationChannelDescriptorRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelRequest.java
index 4d7933ee6f77..3ed4e352da62 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelRequest.java
@@ -33,9 +33,6 @@ private GetNotificationChannelRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetNotificationChannelRequest(
           case 0:
             done = true;
             break;
-          case 26: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetNotificationChannelRequest(
             }
             break;
           }
+          case 26: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetNotificationChannelRequest(
     return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_GetNotificationChannelRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_GetNotificationChannelRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.monitoring.v3.GetNotificationChannelRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.GetNotificationChannelRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_GetNotificationChannelRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_GetNotificationChannelRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_GetNotificationChannelRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.GetNotificationChannelRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.GetNotificationChannelRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.GetNotificationChannelRequest build() {
       com.google.monitoring.v3.GetNotificationChannelRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.monitoring.v3.GetNotificationChannelRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.GetNotificationChannelRequest buildPartial() {
       com.google.monitoring.v3.GetNotificationChannelRequest result = new com.google.monitoring.v3.GetNotificationChannelRequest(this);
       result.name_ = name_;
@@ -359,39 +344,32 @@ public com.google.monitoring.v3.GetNotificationChannelRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.GetNotificationChannelRequest) {
         return mergeFrom((com.google.monitoring.v3.GetNotificationChannelRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.monitoring.v3.GetNotificationChannelRequest
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.monitoring.v3.GetNotificationChannelRequest getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetNotificationChannelRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetNotificationChannelRequest(input, extensionRegistry);
+        return new GetNotificationChannelRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForTyp
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.GetNotificationChannelRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelVerificationCodeRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelVerificationCodeRequest.java
index 508d154c15c1..1fcc501703b8 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelVerificationCodeRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelVerificationCodeRequest.java
@@ -33,9 +33,6 @@ private GetNotificationChannelVerificationCodeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private GetNotificationChannelVerificationCodeRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private GetNotificationChannelVerificationCodeRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private GetNotificationChannelVerificationCodeRequest(
     return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_GetNotificationChannelVerificationCodeRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_GetNotificationChannelVerificationCodeRequest_fieldAccessorTable
@@ -202,7 +198,6 @@ public com.google.protobuf.TimestampOrBuilder getExpireTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -212,7 +207,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -224,7 +218,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -352,7 +345,6 @@ public static com.google.monitoring.v3.GetNotificationChannelVerificationCodeReq
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -360,7 +352,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.GetNotificationChannelVerificationCodeRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -388,7 +379,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_GetNotificationChannelVerificationCodeRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_GetNotificationChannelVerificationCodeRequest_fieldAccessorTable
@@ -411,7 +401,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -425,18 +414,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_GetNotificationChannelVerificationCodeRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.GetNotificationChannelVerificationCodeRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.GetNotificationChannelVerificationCodeRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.GetNotificationChannelVerificationCodeRequest build() {
       com.google.monitoring.v3.GetNotificationChannelVerificationCodeRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -445,7 +431,6 @@ public com.google.monitoring.v3.GetNotificationChannelVerificationCodeRequest bu
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.GetNotificationChannelVerificationCodeRequest buildPartial() {
       com.google.monitoring.v3.GetNotificationChannelVerificationCodeRequest result = new com.google.monitoring.v3.GetNotificationChannelVerificationCodeRequest(this);
       result.name_ = name_;
@@ -458,39 +443,32 @@ public com.google.monitoring.v3.GetNotificationChannelVerificationCodeRequest bu
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.GetNotificationChannelVerificationCodeRequest) {
         return mergeFrom((com.google.monitoring.v3.GetNotificationChannelVerificationCodeRequest)other);
@@ -514,12 +492,10 @@ public Builder mergeFrom(com.google.monitoring.v3.GetNotificationChannelVerifica
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -861,13 +837,11 @@ public com.google.protobuf.TimestampOrBuilder getExpireTimeOrBuilder() {
       }
       return expireTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -889,12 +863,11 @@ public static com.google.monitoring.v3.GetNotificationChannelVerificationCodeReq
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetNotificationChannelVerificationCodeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetNotificationChannelVerificationCodeRequest(input, extensionRegistry);
+        return new GetNotificationChannelVerificationCodeRequest(input, extensionRegistry);
     }
   };
 
@@ -907,7 +880,6 @@ public com.google.protobuf.Parser
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.GetNotificationChannelVerificationCodeRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelVerificationCodeResponse.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelVerificationCodeResponse.java
index 5e441e40dda3..130cf0b68c25 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelVerificationCodeResponse.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GetNotificationChannelVerificationCodeResponse.java
@@ -33,9 +33,6 @@ private GetNotificationChannelVerificationCodeResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private GetNotificationChannelVerificationCodeResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private GetNotificationChannelVerificationCodeResponse(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private GetNotificationChannelVerificationCodeResponse(
     return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_GetNotificationChannelVerificationCodeResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_GetNotificationChannelVerificationCodeResponse_fieldAccessorTable
@@ -186,7 +182,6 @@ public com.google.protobuf.TimestampOrBuilder getExpireTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -196,7 +191,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getCodeBytes().isEmpty()) {
@@ -208,7 +202,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -336,7 +329,6 @@ public static com.google.monitoring.v3.GetNotificationChannelVerificationCodeRes
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -344,7 +336,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.GetNotificationChannelVerificationCodeResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -372,7 +363,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_GetNotificationChannelVerificationCodeResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_GetNotificationChannelVerificationCodeResponse_fieldAccessorTable
@@ -395,7 +385,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       code_ = "";
@@ -409,18 +398,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_GetNotificationChannelVerificationCodeResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.GetNotificationChannelVerificationCodeResponse getDefaultInstanceForType() {
       return com.google.monitoring.v3.GetNotificationChannelVerificationCodeResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.GetNotificationChannelVerificationCodeResponse build() {
       com.google.monitoring.v3.GetNotificationChannelVerificationCodeResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -429,7 +415,6 @@ public com.google.monitoring.v3.GetNotificationChannelVerificationCodeResponse b
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.GetNotificationChannelVerificationCodeResponse buildPartial() {
       com.google.monitoring.v3.GetNotificationChannelVerificationCodeResponse result = new com.google.monitoring.v3.GetNotificationChannelVerificationCodeResponse(this);
       result.code_ = code_;
@@ -442,39 +427,32 @@ public com.google.monitoring.v3.GetNotificationChannelVerificationCodeResponse b
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.GetNotificationChannelVerificationCodeResponse) {
         return mergeFrom((com.google.monitoring.v3.GetNotificationChannelVerificationCodeResponse)other);
@@ -498,12 +476,10 @@ public Builder mergeFrom(com.google.monitoring.v3.GetNotificationChannelVerifica
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -796,13 +772,11 @@ public com.google.protobuf.TimestampOrBuilder getExpireTimeOrBuilder() {
       }
       return expireTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -824,12 +798,11 @@ public static com.google.monitoring.v3.GetNotificationChannelVerificationCodeRes
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetNotificationChannelVerificationCodeResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetNotificationChannelVerificationCodeResponse(input, extensionRegistry);
+        return new GetNotificationChannelVerificationCodeResponse(input, extensionRegistry);
     }
   };
 
@@ -842,7 +815,6 @@ public com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetUptimeCheckConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetUptimeCheckConfigRequest(input, extensionRegistry);
+        return new GetUptimeCheckConfigRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType(
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.GetUptimeCheckConfigRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/Group.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/Group.java
index 9d62325d0f8b..c324dc9b1ac1 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/Group.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/Group.java
@@ -59,9 +59,6 @@ private Group(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -73,6 +70,13 @@ private Group(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -102,13 +106,6 @@ private Group(
             isCluster_ = input.readBool();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -126,7 +123,6 @@ private Group(
     return com.google.monitoring.v3.GroupProto.internal_static_google_monitoring_v3_Group_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.GroupProto.internal_static_google_monitoring_v3_Group_fieldAccessorTable
@@ -329,7 +325,6 @@ public boolean getIsCluster() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -339,7 +334,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -360,7 +354,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -505,7 +498,6 @@ public static com.google.monitoring.v3.Group parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -513,7 +505,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.Group prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -563,7 +554,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.GroupProto.internal_static_google_monitoring_v3_Group_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.GroupProto.internal_static_google_monitoring_v3_Group_fieldAccessorTable
@@ -586,7 +576,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -602,18 +591,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.GroupProto.internal_static_google_monitoring_v3_Group_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.Group getDefaultInstanceForType() {
       return com.google.monitoring.v3.Group.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.Group build() {
       com.google.monitoring.v3.Group result = buildPartial();
       if (!result.isInitialized()) {
@@ -622,7 +608,6 @@ public com.google.monitoring.v3.Group build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.Group buildPartial() {
       com.google.monitoring.v3.Group result = new com.google.monitoring.v3.Group(this);
       result.name_ = name_;
@@ -634,39 +619,32 @@ public com.google.monitoring.v3.Group buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.Group) {
         return mergeFrom((com.google.monitoring.v3.Group)other);
@@ -702,12 +680,10 @@ public Builder mergeFrom(com.google.monitoring.v3.Group other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1152,13 +1128,11 @@ public Builder clearIsCluster() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1180,12 +1154,11 @@ public static com.google.monitoring.v3.Group getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Group parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Group(input, extensionRegistry);
+        return new Group(input, extensionRegistry);
     }
   };
 
@@ -1198,7 +1171,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.Group getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GroupServiceProto.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GroupServiceProto.java
index 5ea8fc465265..9c674b8e590b 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GroupServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/GroupServiceProto.java
@@ -72,7 +72,7 @@ public static void registerAllExtensions(
       "oupsRequest\022\014\n\004name\030\007 \001(\t\022\033\n\021children_of" +
       "_group\030\002 \001(\tH\000\022\034\n\022ancestors_of_group\030\003 \001" +
       "(\tH\000\022\036\n\024descendants_of_group\030\004 \001(\tH\000\022\021\n\t" +
-      "page_size\030\005 \001(\005\022\022\n\npage_token\030\006 \001(\tB\010\n\006f" +
+      "page_size\030\005 \001(\005\022\022\n\npage_token\030\006 \001(\tB\010\n\006f",
       "ilter\"Y\n\022ListGroupsResponse\022*\n\005group\030\001 \003" +
       "(\0132\033.google.monitoring.v3.Group\022\027\n\017next_" +
       "page_token\030\002 \001(\t\"\037\n\017GetGroupRequest\022\014\n\004n" +
@@ -82,7 +82,7 @@ public static void registerAllExtensions(
       "teGroupRequest\022*\n\005group\030\002 \001(\0132\033.google.m" +
       "onitoring.v3.Group\022\025\n\rvalidate_only\030\003 \001(" +
       "\010\"\"\n\022DeleteGroupRequest\022\014\n\004name\030\003 \001(\t\"\224\001" +
-      "\n\027ListGroupMembersRequest\022\014\n\004name\030\007 \001(\t\022" +
+      "\n\027ListGroupMembersRequest\022\014\n\004name\030\007 \001(\t\022",
       "\021\n\tpage_size\030\003 \001(\005\022\022\n\npage_token\030\004 \001(\t\022\016" +
       "\n\006filter\030\005 \001(\t\0224\n\010interval\030\006 \001(\0132\".googl" +
       "e.monitoring.v3.TimeInterval\"w\n\030ListGrou" +
@@ -92,7 +92,7 @@ public static void registerAllExtensions(
       "ervice\022\205\001\n\nListGroups\022\'.google.monitorin" +
       "g.v3.ListGroupsRequest\032(.google.monitori" +
       "ng.v3.ListGroupsResponse\"$\202\323\344\223\002\036\022\034/v3/{n" +
-      "ame=projects/*}/groups\022v\n\010GetGroup\022%.goo" +
+      "ame=projects/*}/groups\022v\n\010GetGroup\022%.goo",
       "gle.monitoring.v3.GetGroupRequest\032\033.goog" +
       "le.monitoring.v3.Group\"&\202\323\344\223\002 \022\036/v3/{nam" +
       "e=projects/*/groups/*}\022\201\001\n\013CreateGroup\022(" +
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "pdateGroup\022(.google.monitoring.v3.Update" +
       "GroupRequest\032\033.google.monitoring.v3.Grou" +
       "p\"3\202\323\344\223\002-\032$/v3/{group.name=projects/*/gr" +
-      "oups/*}:\005group\022w\n\013DeleteGroup\022(.google.m" +
+      "oups/*}:\005group\022w\n\013DeleteGroup\022(.google.m",
       "onitoring.v3.DeleteGroupRequest\032\026.google" +
       ".protobuf.Empty\"&\202\323\344\223\002 *\036/v3/{name=proje" +
       "cts/*/groups/*}\022\241\001\n\020ListGroupMembers\022-.g" +
@@ -112,7 +112,7 @@ public static void registerAllExtensions(
       "*/groups/*}/membersB\251\001\n\030com.google.monit" +
       "oring.v3B\021GroupServiceProtoP\001Z>google.go" +
       "lang.org/genproto/googleapis/monitoring/" +
-      "v3;monitoring\252\002\032Google.Cloud.Monitoring." +
+      "v3;monitoring\252\002\032Google.Cloud.Monitoring.",
       "V3\312\002\032Google\\Cloud\\Monitoring\\V3b\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/InternalChecker.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/InternalChecker.java
index 0f143b940dc5..56d65a10048e 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/InternalChecker.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/InternalChecker.java
@@ -37,9 +37,6 @@ private InternalChecker(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private InternalChecker(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -81,13 +85,6 @@ private InternalChecker(
             displayName_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -105,7 +102,6 @@ private InternalChecker(
     return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_InternalChecker_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_InternalChecker_fieldAccessorTable
@@ -328,7 +324,6 @@ public java.lang.String getDisplayName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -338,7 +333,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -359,7 +353,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -502,7 +495,6 @@ public static com.google.monitoring.v3.InternalChecker parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -510,7 +502,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.InternalChecker prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -538,7 +529,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_InternalChecker_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_InternalChecker_fieldAccessorTable
@@ -561,7 +551,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -577,18 +566,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_InternalChecker_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.InternalChecker getDefaultInstanceForType() {
       return com.google.monitoring.v3.InternalChecker.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.InternalChecker build() {
       com.google.monitoring.v3.InternalChecker result = buildPartial();
       if (!result.isInitialized()) {
@@ -597,7 +583,6 @@ public com.google.monitoring.v3.InternalChecker build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.InternalChecker buildPartial() {
       com.google.monitoring.v3.InternalChecker result = new com.google.monitoring.v3.InternalChecker(this);
       result.projectId_ = projectId_;
@@ -609,39 +594,32 @@ public com.google.monitoring.v3.InternalChecker buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.InternalChecker) {
         return mergeFrom((com.google.monitoring.v3.InternalChecker)other);
@@ -678,12 +656,10 @@ public Builder mergeFrom(com.google.monitoring.v3.InternalChecker other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1156,13 +1132,11 @@ public Builder setDisplayNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1184,12 +1158,11 @@ public static com.google.monitoring.v3.InternalChecker getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public InternalChecker parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InternalChecker(input, extensionRegistry);
+        return new InternalChecker(input, extensionRegistry);
     }
   };
 
@@ -1202,7 +1175,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.InternalChecker getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListAlertPoliciesRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListAlertPoliciesRequest.java
index 7a8760bf04c9..c8c490868725 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListAlertPoliciesRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListAlertPoliciesRequest.java
@@ -37,9 +37,6 @@ private ListAlertPoliciesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private ListAlertPoliciesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 16: {
 
             pageSize_ = input.readInt32();
@@ -80,13 +84,6 @@ private ListAlertPoliciesRequest(
             orderBy_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private ListAlertPoliciesRequest(
     return com.google.monitoring.v3.AlertServiceProto.internal_static_google_monitoring_v3_ListAlertPoliciesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.AlertServiceProto.internal_static_google_monitoring_v3_ListAlertPoliciesRequest_fieldAccessorTable
@@ -324,7 +320,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -334,7 +329,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (pageSize_ != 0) {
@@ -355,7 +349,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -499,7 +492,6 @@ public static com.google.monitoring.v3.ListAlertPoliciesRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -507,7 +499,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.ListAlertPoliciesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -535,7 +526,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.AlertServiceProto.internal_static_google_monitoring_v3_ListAlertPoliciesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.AlertServiceProto.internal_static_google_monitoring_v3_ListAlertPoliciesRequest_fieldAccessorTable
@@ -558,7 +548,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -574,18 +563,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.AlertServiceProto.internal_static_google_monitoring_v3_ListAlertPoliciesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListAlertPoliciesRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.ListAlertPoliciesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListAlertPoliciesRequest build() {
       com.google.monitoring.v3.ListAlertPoliciesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -594,7 +580,6 @@ public com.google.monitoring.v3.ListAlertPoliciesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListAlertPoliciesRequest buildPartial() {
       com.google.monitoring.v3.ListAlertPoliciesRequest result = new com.google.monitoring.v3.ListAlertPoliciesRequest(this);
       result.name_ = name_;
@@ -606,39 +591,32 @@ public com.google.monitoring.v3.ListAlertPoliciesRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.ListAlertPoliciesRequest) {
         return mergeFrom((com.google.monitoring.v3.ListAlertPoliciesRequest)other);
@@ -674,12 +652,10 @@ public Builder mergeFrom(com.google.monitoring.v3.ListAlertPoliciesRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1166,13 +1142,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1194,12 +1168,11 @@ public static com.google.monitoring.v3.ListAlertPoliciesRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListAlertPoliciesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListAlertPoliciesRequest(input, extensionRegistry);
+        return new ListAlertPoliciesRequest(input, extensionRegistry);
     }
   };
 
@@ -1212,7 +1185,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.ListAlertPoliciesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListAlertPoliciesResponse.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListAlertPoliciesResponse.java
index 6daa5f31d6ec..52dbd0e7223d 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListAlertPoliciesResponse.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListAlertPoliciesResponse.java
@@ -34,9 +34,6 @@ private ListAlertPoliciesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListAlertPoliciesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -63,13 +67,6 @@ private ListAlertPoliciesResponse(
                 input.readMessage(com.google.monitoring.v3.AlertPolicy.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListAlertPoliciesResponse(
     return com.google.monitoring.v3.AlertServiceProto.internal_static_google_monitoring_v3_ListAlertPoliciesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.AlertServiceProto.internal_static_google_monitoring_v3_ListAlertPoliciesResponse_fieldAccessorTable
@@ -201,7 +197,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -211,7 +206,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNextPageTokenBytes().isEmpty()) {
@@ -223,7 +217,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.monitoring.v3.ListAlertPoliciesResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.ListAlertPoliciesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.AlertServiceProto.internal_static_google_monitoring_v3_ListAlertPoliciesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.AlertServiceProto.internal_static_google_monitoring_v3_ListAlertPoliciesResponse_fieldAccessorTable
@@ -408,7 +398,6 @@ private void maybeForceBuilderInitialization() {
         getAlertPoliciesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (alertPoliciesBuilder_ == null) {
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.AlertServiceProto.internal_static_google_monitoring_v3_ListAlertPoliciesResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListAlertPoliciesResponse getDefaultInstanceForType() {
       return com.google.monitoring.v3.ListAlertPoliciesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListAlertPoliciesResponse build() {
       com.google.monitoring.v3.ListAlertPoliciesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public com.google.monitoring.v3.ListAlertPoliciesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListAlertPoliciesResponse buildPartial() {
       com.google.monitoring.v3.ListAlertPoliciesResponse result = new com.google.monitoring.v3.ListAlertPoliciesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -462,39 +447,32 @@ public com.google.monitoring.v3.ListAlertPoliciesResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.ListAlertPoliciesResponse) {
         return mergeFrom((com.google.monitoring.v3.ListAlertPoliciesResponse)other);
@@ -541,12 +519,10 @@ public Builder mergeFrom(com.google.monitoring.v3.ListAlertPoliciesResponse othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -976,13 +952,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1004,12 +978,11 @@ public static com.google.monitoring.v3.ListAlertPoliciesResponse getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListAlertPoliciesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListAlertPoliciesResponse(input, extensionRegistry);
+        return new ListAlertPoliciesResponse(input, extensionRegistry);
     }
   };
 
@@ -1022,7 +995,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.ListAlertPoliciesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupMembersRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupMembersRequest.java
index 623ef22d4103..fd0a6afa6c92 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupMembersRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupMembersRequest.java
@@ -36,9 +36,6 @@ private ListGroupMembersRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private ListGroupMembersRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 24: {
 
             pageSize_ = input.readInt32();
@@ -86,13 +90,6 @@ private ListGroupMembersRequest(
             name_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -110,7 +107,6 @@ private ListGroupMembersRequest(
     return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_ListGroupMembersRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_ListGroupMembersRequest_fieldAccessorTable
@@ -316,7 +312,6 @@ public com.google.monitoring.v3.TimeIntervalOrBuilder getIntervalOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -326,7 +321,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (pageSize_ != 0) {
@@ -347,7 +341,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -497,7 +490,6 @@ public static com.google.monitoring.v3.ListGroupMembersRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -505,7 +497,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.ListGroupMembersRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -533,7 +524,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_ListGroupMembersRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_ListGroupMembersRequest_fieldAccessorTable
@@ -556,7 +546,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -576,18 +565,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_ListGroupMembersRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListGroupMembersRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.ListGroupMembersRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListGroupMembersRequest build() {
       com.google.monitoring.v3.ListGroupMembersRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -596,7 +582,6 @@ public com.google.monitoring.v3.ListGroupMembersRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListGroupMembersRequest buildPartial() {
       com.google.monitoring.v3.ListGroupMembersRequest result = new com.google.monitoring.v3.ListGroupMembersRequest(this);
       result.name_ = name_;
@@ -612,39 +597,32 @@ public com.google.monitoring.v3.ListGroupMembersRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.ListGroupMembersRequest) {
         return mergeFrom((com.google.monitoring.v3.ListGroupMembersRequest)other);
@@ -679,12 +657,10 @@ public Builder mergeFrom(com.google.monitoring.v3.ListGroupMembersRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1227,13 +1203,11 @@ public com.google.monitoring.v3.TimeIntervalOrBuilder getIntervalOrBuilder() {
       }
       return intervalBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1255,12 +1229,11 @@ public static com.google.monitoring.v3.ListGroupMembersRequest getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListGroupMembersRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListGroupMembersRequest(input, extensionRegistry);
+        return new ListGroupMembersRequest(input, extensionRegistry);
     }
   };
 
@@ -1273,7 +1246,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.ListGroupMembersRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupMembersResponse.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupMembersResponse.java
index b69a9136d707..016f67a13b15 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupMembersResponse.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupMembersResponse.java
@@ -35,9 +35,6 @@ private ListGroupMembersResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListGroupMembersResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               members_ = new java.util.ArrayList();
@@ -69,13 +73,6 @@ private ListGroupMembersResponse(
             totalSize_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private ListGroupMembersResponse(
     return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_ListGroupMembersResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_ListGroupMembersResponse_fieldAccessorTable
@@ -220,7 +216,6 @@ public int getTotalSize() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -230,7 +225,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < members_.size(); i++) {
@@ -245,7 +239,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -378,7 +371,6 @@ public static com.google.monitoring.v3.ListGroupMembersResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -386,7 +378,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.ListGroupMembersResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -414,7 +405,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_ListGroupMembersResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_ListGroupMembersResponse_fieldAccessorTable
@@ -438,7 +428,6 @@ private void maybeForceBuilderInitialization() {
         getMembersFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (membersBuilder_ == null) {
@@ -454,18 +443,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_ListGroupMembersResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListGroupMembersResponse getDefaultInstanceForType() {
       return com.google.monitoring.v3.ListGroupMembersResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListGroupMembersResponse build() {
       com.google.monitoring.v3.ListGroupMembersResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -474,7 +460,6 @@ public com.google.monitoring.v3.ListGroupMembersResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListGroupMembersResponse buildPartial() {
       com.google.monitoring.v3.ListGroupMembersResponse result = new com.google.monitoring.v3.ListGroupMembersResponse(this);
       int from_bitField0_ = bitField0_;
@@ -495,39 +480,32 @@ public com.google.monitoring.v3.ListGroupMembersResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.ListGroupMembersResponse) {
         return mergeFrom((com.google.monitoring.v3.ListGroupMembersResponse)other);
@@ -577,12 +555,10 @@ public Builder mergeFrom(com.google.monitoring.v3.ListGroupMembersResponse other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1050,13 +1026,11 @@ public Builder clearTotalSize() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1078,12 +1052,11 @@ public static com.google.monitoring.v3.ListGroupMembersResponse getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListGroupMembersResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListGroupMembersResponse(input, extensionRegistry);
+        return new ListGroupMembersResponse(input, extensionRegistry);
     }
   };
 
@@ -1096,7 +1069,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.ListGroupMembersResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupsRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupsRequest.java
index 578646513b09..7144252fde3b 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupsRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupsRequest.java
@@ -35,9 +35,6 @@ private ListGroupsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListGroupsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             java.lang.String s = input.readStringRequireUtf8();
             filterCase_ = 2;
@@ -84,13 +88,6 @@ private ListGroupsRequest(
             name_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -108,7 +105,6 @@ private ListGroupsRequest(
     return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_ListGroupsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_ListGroupsRequest_fieldAccessorTable
@@ -431,7 +427,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -441,7 +436,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (filterCase_ == 2) {
@@ -465,7 +459,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -639,7 +632,6 @@ public static com.google.monitoring.v3.ListGroupsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -647,7 +639,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.ListGroupsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -675,7 +666,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_ListGroupsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_ListGroupsRequest_fieldAccessorTable
@@ -698,7 +688,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -712,18 +701,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_ListGroupsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListGroupsRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.ListGroupsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListGroupsRequest build() {
       com.google.monitoring.v3.ListGroupsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -732,7 +718,6 @@ public com.google.monitoring.v3.ListGroupsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListGroupsRequest buildPartial() {
       com.google.monitoring.v3.ListGroupsRequest result = new com.google.monitoring.v3.ListGroupsRequest(this);
       result.name_ = name_;
@@ -752,39 +737,32 @@ public com.google.monitoring.v3.ListGroupsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.ListGroupsRequest) {
         return mergeFrom((com.google.monitoring.v3.ListGroupsRequest)other);
@@ -835,12 +813,10 @@ public Builder mergeFrom(com.google.monitoring.v3.ListGroupsRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1449,13 +1425,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1477,12 +1451,11 @@ public static com.google.monitoring.v3.ListGroupsRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListGroupsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListGroupsRequest(input, extensionRegistry);
+        return new ListGroupsRequest(input, extensionRegistry);
     }
   };
 
@@ -1495,7 +1468,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.ListGroupsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupsResponse.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupsResponse.java
index b3dc8d571617..14cdb995deb3 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupsResponse.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListGroupsResponse.java
@@ -34,9 +34,6 @@ private ListGroupsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListGroupsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               group_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListGroupsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListGroupsResponse(
     return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_ListGroupsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_ListGroupsResponse_fieldAccessorTable
@@ -201,7 +197,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -211,7 +206,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < group_.size(); i++) {
@@ -223,7 +217,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.monitoring.v3.ListGroupsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.ListGroupsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_ListGroupsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_ListGroupsResponse_fieldAccessorTable
@@ -408,7 +398,6 @@ private void maybeForceBuilderInitialization() {
         getGroupFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (groupBuilder_ == null) {
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_ListGroupsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListGroupsResponse getDefaultInstanceForType() {
       return com.google.monitoring.v3.ListGroupsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListGroupsResponse build() {
       com.google.monitoring.v3.ListGroupsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public com.google.monitoring.v3.ListGroupsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListGroupsResponse buildPartial() {
       com.google.monitoring.v3.ListGroupsResponse result = new com.google.monitoring.v3.ListGroupsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -462,39 +447,32 @@ public com.google.monitoring.v3.ListGroupsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.ListGroupsResponse) {
         return mergeFrom((com.google.monitoring.v3.ListGroupsResponse)other);
@@ -541,12 +519,10 @@ public Builder mergeFrom(com.google.monitoring.v3.ListGroupsResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -976,13 +952,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1004,12 +978,11 @@ public static com.google.monitoring.v3.ListGroupsResponse getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListGroupsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListGroupsResponse(input, extensionRegistry);
+        return new ListGroupsResponse(input, extensionRegistry);
     }
   };
 
@@ -1022,7 +995,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.ListGroupsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMetricDescriptorsRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMetricDescriptorsRequest.java
index 5f7c2c258248..b9d81ce32903 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMetricDescriptorsRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMetricDescriptorsRequest.java
@@ -36,9 +36,6 @@ private ListMetricDescriptorsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private ListMetricDescriptorsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private ListMetricDescriptorsRequest(
             name_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private ListMetricDescriptorsRequest(
     return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_ListMetricDescriptorsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_ListMetricDescriptorsRequest_fieldAccessorTable
@@ -263,7 +259,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -273,7 +268,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getFilterBytes().isEmpty()) {
@@ -291,7 +285,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -428,7 +421,6 @@ public static com.google.monitoring.v3.ListMetricDescriptorsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -436,7 +428,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.ListMetricDescriptorsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -464,7 +455,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_ListMetricDescriptorsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_ListMetricDescriptorsRequest_fieldAccessorTable
@@ -487,7 +477,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -501,18 +490,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_ListMetricDescriptorsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListMetricDescriptorsRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.ListMetricDescriptorsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListMetricDescriptorsRequest build() {
       com.google.monitoring.v3.ListMetricDescriptorsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -521,7 +507,6 @@ public com.google.monitoring.v3.ListMetricDescriptorsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListMetricDescriptorsRequest buildPartial() {
       com.google.monitoring.v3.ListMetricDescriptorsRequest result = new com.google.monitoring.v3.ListMetricDescriptorsRequest(this);
       result.name_ = name_;
@@ -532,39 +517,32 @@ public com.google.monitoring.v3.ListMetricDescriptorsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.ListMetricDescriptorsRequest) {
         return mergeFrom((com.google.monitoring.v3.ListMetricDescriptorsRequest)other);
@@ -596,12 +574,10 @@ public Builder mergeFrom(com.google.monitoring.v3.ListMetricDescriptorsRequest o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -969,13 +945,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -997,12 +971,11 @@ public static com.google.monitoring.v3.ListMetricDescriptorsRequest getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListMetricDescriptorsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListMetricDescriptorsRequest(input, extensionRegistry);
+        return new ListMetricDescriptorsRequest(input, extensionRegistry);
     }
   };
 
@@ -1015,7 +988,6 @@ public com.google.protobuf.Parser getParserForType
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.ListMetricDescriptorsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMetricDescriptorsResponse.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMetricDescriptorsResponse.java
index a1c97c73d3e6..23fe1e71e7bd 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMetricDescriptorsResponse.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMetricDescriptorsResponse.java
@@ -34,9 +34,6 @@ private ListMetricDescriptorsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListMetricDescriptorsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               metricDescriptors_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListMetricDescriptorsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListMetricDescriptorsResponse(
     return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_ListMetricDescriptorsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_ListMetricDescriptorsResponse_fieldAccessorTable
@@ -206,7 +202,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -216,7 +211,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < metricDescriptors_.size(); i++) {
@@ -228,7 +222,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -353,7 +346,6 @@ public static com.google.monitoring.v3.ListMetricDescriptorsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -361,7 +353,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.ListMetricDescriptorsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -389,7 +380,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_ListMetricDescriptorsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_ListMetricDescriptorsResponse_fieldAccessorTable
@@ -413,7 +403,6 @@ private void maybeForceBuilderInitialization() {
         getMetricDescriptorsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (metricDescriptorsBuilder_ == null) {
@@ -427,18 +416,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_ListMetricDescriptorsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListMetricDescriptorsResponse getDefaultInstanceForType() {
       return com.google.monitoring.v3.ListMetricDescriptorsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListMetricDescriptorsResponse build() {
       com.google.monitoring.v3.ListMetricDescriptorsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -447,7 +433,6 @@ public com.google.monitoring.v3.ListMetricDescriptorsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListMetricDescriptorsResponse buildPartial() {
       com.google.monitoring.v3.ListMetricDescriptorsResponse result = new com.google.monitoring.v3.ListMetricDescriptorsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -467,39 +452,32 @@ public com.google.monitoring.v3.ListMetricDescriptorsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.ListMetricDescriptorsResponse) {
         return mergeFrom((com.google.monitoring.v3.ListMetricDescriptorsResponse)other);
@@ -546,12 +524,10 @@ public Builder mergeFrom(com.google.monitoring.v3.ListMetricDescriptorsResponse
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -999,13 +975,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1027,12 +1001,11 @@ public static com.google.monitoring.v3.ListMetricDescriptorsResponse getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListMetricDescriptorsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListMetricDescriptorsResponse(input, extensionRegistry);
+        return new ListMetricDescriptorsResponse(input, extensionRegistry);
     }
   };
 
@@ -1045,7 +1018,6 @@ public com.google.protobuf.Parser getParserForTyp
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.ListMetricDescriptorsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMonitoredResourceDescriptorsRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMonitoredResourceDescriptorsRequest.java
index be6b596ae366..1b5163def04c 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMonitoredResourceDescriptorsRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMonitoredResourceDescriptorsRequest.java
@@ -36,9 +36,6 @@ private ListMonitoredResourceDescriptorsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private ListMonitoredResourceDescriptorsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private ListMonitoredResourceDescriptorsRequest(
             name_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private ListMonitoredResourceDescriptorsRequest(
     return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_ListMonitoredResourceDescriptorsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_ListMonitoredResourceDescriptorsRequest_fieldAccessorTable
@@ -261,7 +257,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -271,7 +266,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getFilterBytes().isEmpty()) {
@@ -289,7 +283,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -426,7 +419,6 @@ public static com.google.monitoring.v3.ListMonitoredResourceDescriptorsRequest p
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -434,7 +426,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.ListMonitoredResourceDescriptorsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -462,7 +453,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_ListMonitoredResourceDescriptorsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_ListMonitoredResourceDescriptorsRequest_fieldAccessorTable
@@ -485,7 +475,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -499,18 +488,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_ListMonitoredResourceDescriptorsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListMonitoredResourceDescriptorsRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.ListMonitoredResourceDescriptorsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListMonitoredResourceDescriptorsRequest build() {
       com.google.monitoring.v3.ListMonitoredResourceDescriptorsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -519,7 +505,6 @@ public com.google.monitoring.v3.ListMonitoredResourceDescriptorsRequest build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListMonitoredResourceDescriptorsRequest buildPartial() {
       com.google.monitoring.v3.ListMonitoredResourceDescriptorsRequest result = new com.google.monitoring.v3.ListMonitoredResourceDescriptorsRequest(this);
       result.name_ = name_;
@@ -530,39 +515,32 @@ public com.google.monitoring.v3.ListMonitoredResourceDescriptorsRequest buildPar
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.ListMonitoredResourceDescriptorsRequest) {
         return mergeFrom((com.google.monitoring.v3.ListMonitoredResourceDescriptorsRequest)other);
@@ -594,12 +572,10 @@ public Builder mergeFrom(com.google.monitoring.v3.ListMonitoredResourceDescripto
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -962,13 +938,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -990,12 +964,11 @@ public static com.google.monitoring.v3.ListMonitoredResourceDescriptorsRequest g
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListMonitoredResourceDescriptorsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListMonitoredResourceDescriptorsRequest(input, extensionRegistry);
+        return new ListMonitoredResourceDescriptorsRequest(input, extensionRegistry);
     }
   };
 
@@ -1008,7 +981,6 @@ public com.google.protobuf.Parser getPa
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.ListMonitoredResourceDescriptorsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMonitoredResourceDescriptorsResponse.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMonitoredResourceDescriptorsResponse.java
index 2d6c83b05eaa..17f2988309da 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMonitoredResourceDescriptorsResponse.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListMonitoredResourceDescriptorsResponse.java
@@ -34,9 +34,6 @@ private ListMonitoredResourceDescriptorsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListMonitoredResourceDescriptorsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               resourceDescriptors_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListMonitoredResourceDescriptorsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListMonitoredResourceDescriptorsResponse(
     return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_ListMonitoredResourceDescriptorsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_ListMonitoredResourceDescriptorsResponse_fieldAccessorTable
@@ -206,7 +202,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -216,7 +211,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < resourceDescriptors_.size(); i++) {
@@ -228,7 +222,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -353,7 +346,6 @@ public static com.google.monitoring.v3.ListMonitoredResourceDescriptorsResponse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -361,7 +353,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.ListMonitoredResourceDescriptorsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -389,7 +380,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_ListMonitoredResourceDescriptorsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_ListMonitoredResourceDescriptorsResponse_fieldAccessorTable
@@ -413,7 +403,6 @@ private void maybeForceBuilderInitialization() {
         getResourceDescriptorsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (resourceDescriptorsBuilder_ == null) {
@@ -427,18 +416,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_ListMonitoredResourceDescriptorsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListMonitoredResourceDescriptorsResponse getDefaultInstanceForType() {
       return com.google.monitoring.v3.ListMonitoredResourceDescriptorsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListMonitoredResourceDescriptorsResponse build() {
       com.google.monitoring.v3.ListMonitoredResourceDescriptorsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -447,7 +433,6 @@ public com.google.monitoring.v3.ListMonitoredResourceDescriptorsResponse build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListMonitoredResourceDescriptorsResponse buildPartial() {
       com.google.monitoring.v3.ListMonitoredResourceDescriptorsResponse result = new com.google.monitoring.v3.ListMonitoredResourceDescriptorsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -467,39 +452,32 @@ public com.google.monitoring.v3.ListMonitoredResourceDescriptorsResponse buildPa
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.ListMonitoredResourceDescriptorsResponse) {
         return mergeFrom((com.google.monitoring.v3.ListMonitoredResourceDescriptorsResponse)other);
@@ -546,12 +524,10 @@ public Builder mergeFrom(com.google.monitoring.v3.ListMonitoredResourceDescripto
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -999,13 +975,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1027,12 +1001,11 @@ public static com.google.monitoring.v3.ListMonitoredResourceDescriptorsResponse
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListMonitoredResourceDescriptorsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListMonitoredResourceDescriptorsResponse(input, extensionRegistry);
+        return new ListMonitoredResourceDescriptorsResponse(input, extensionRegistry);
     }
   };
 
@@ -1045,7 +1018,6 @@ public com.google.protobuf.Parser getP
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.ListMonitoredResourceDescriptorsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelDescriptorsRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelDescriptorsRequest.java
index 2adb6b23a91d..7ef3fc33d87d 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelDescriptorsRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelDescriptorsRequest.java
@@ -35,9 +35,6 @@ private ListNotificationChannelDescriptorsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListNotificationChannelDescriptorsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 16: {
 
             pageSize_ = input.readInt32();
@@ -66,13 +70,6 @@ private ListNotificationChannelDescriptorsRequest(
             name_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListNotificationChannelDescriptorsRequest(
     return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_ListNotificationChannelDescriptorsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_ListNotificationChannelDescriptorsRequest_fieldAccessorTable
@@ -214,7 +210,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -224,7 +219,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (pageSize_ != 0) {
@@ -239,7 +233,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -369,7 +362,6 @@ public static com.google.monitoring.v3.ListNotificationChannelDescriptorsRequest
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -377,7 +369,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.ListNotificationChannelDescriptorsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -405,7 +396,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_ListNotificationChannelDescriptorsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_ListNotificationChannelDescriptorsRequest_fieldAccessorTable
@@ -428,7 +418,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -440,18 +429,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_ListNotificationChannelDescriptorsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListNotificationChannelDescriptorsRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.ListNotificationChannelDescriptorsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListNotificationChannelDescriptorsRequest build() {
       com.google.monitoring.v3.ListNotificationChannelDescriptorsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -460,7 +446,6 @@ public com.google.monitoring.v3.ListNotificationChannelDescriptorsRequest build(
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListNotificationChannelDescriptorsRequest buildPartial() {
       com.google.monitoring.v3.ListNotificationChannelDescriptorsRequest result = new com.google.monitoring.v3.ListNotificationChannelDescriptorsRequest(this);
       result.name_ = name_;
@@ -470,39 +455,32 @@ public com.google.monitoring.v3.ListNotificationChannelDescriptorsRequest buildP
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.ListNotificationChannelDescriptorsRequest) {
         return mergeFrom((com.google.monitoring.v3.ListNotificationChannelDescriptorsRequest)other);
@@ -530,12 +508,10 @@ public Builder mergeFrom(com.google.monitoring.v3.ListNotificationChannelDescrip
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -815,13 +791,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -843,12 +817,11 @@ public static com.google.monitoring.v3.ListNotificationChannelDescriptorsRequest
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListNotificationChannelDescriptorsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListNotificationChannelDescriptorsRequest(input, extensionRegistry);
+        return new ListNotificationChannelDescriptorsRequest(input, extensionRegistry);
     }
   };
 
@@ -861,7 +834,6 @@ public com.google.protobuf.Parser get
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.ListNotificationChannelDescriptorsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelDescriptorsResponse.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelDescriptorsResponse.java
index 3824ac0c41d7..0efc83998832 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelDescriptorsResponse.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelDescriptorsResponse.java
@@ -34,9 +34,6 @@ private ListNotificationChannelDescriptorsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListNotificationChannelDescriptorsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               channelDescriptors_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListNotificationChannelDescriptorsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListNotificationChannelDescriptorsResponse(
     return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_ListNotificationChannelDescriptorsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_ListNotificationChannelDescriptorsResponse_fieldAccessorTable
@@ -208,7 +204,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -218,7 +213,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < channelDescriptors_.size(); i++) {
@@ -230,7 +224,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -355,7 +348,6 @@ public static com.google.monitoring.v3.ListNotificationChannelDescriptorsRespons
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -363,7 +355,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.ListNotificationChannelDescriptorsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -391,7 +382,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_ListNotificationChannelDescriptorsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_ListNotificationChannelDescriptorsResponse_fieldAccessorTable
@@ -415,7 +405,6 @@ private void maybeForceBuilderInitialization() {
         getChannelDescriptorsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (channelDescriptorsBuilder_ == null) {
@@ -429,18 +418,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_ListNotificationChannelDescriptorsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListNotificationChannelDescriptorsResponse getDefaultInstanceForType() {
       return com.google.monitoring.v3.ListNotificationChannelDescriptorsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListNotificationChannelDescriptorsResponse build() {
       com.google.monitoring.v3.ListNotificationChannelDescriptorsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -449,7 +435,6 @@ public com.google.monitoring.v3.ListNotificationChannelDescriptorsResponse build
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListNotificationChannelDescriptorsResponse buildPartial() {
       com.google.monitoring.v3.ListNotificationChannelDescriptorsResponse result = new com.google.monitoring.v3.ListNotificationChannelDescriptorsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -469,39 +454,32 @@ public com.google.monitoring.v3.ListNotificationChannelDescriptorsResponse build
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.ListNotificationChannelDescriptorsResponse) {
         return mergeFrom((com.google.monitoring.v3.ListNotificationChannelDescriptorsResponse)other);
@@ -548,12 +526,10 @@ public Builder mergeFrom(com.google.monitoring.v3.ListNotificationChannelDescrip
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1006,13 +982,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1034,12 +1008,11 @@ public static com.google.monitoring.v3.ListNotificationChannelDescriptorsRespons
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListNotificationChannelDescriptorsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListNotificationChannelDescriptorsResponse(input, extensionRegistry);
+        return new ListNotificationChannelDescriptorsResponse(input, extensionRegistry);
     }
   };
 
@@ -1052,7 +1025,6 @@ public com.google.protobuf.Parser ge
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.ListNotificationChannelDescriptorsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelsRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelsRequest.java
index b8bfe513b592..51a4205ef748 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelsRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelsRequest.java
@@ -37,9 +37,6 @@ private ListNotificationChannelsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private ListNotificationChannelsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 24: {
 
             pageSize_ = input.readInt32();
@@ -80,13 +84,6 @@ private ListNotificationChannelsRequest(
             orderBy_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private ListNotificationChannelsRequest(
     return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_ListNotificationChannelsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_ListNotificationChannelsRequest_fieldAccessorTable
@@ -324,7 +320,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -334,7 +329,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (pageSize_ != 0) {
@@ -355,7 +349,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -499,7 +492,6 @@ public static com.google.monitoring.v3.ListNotificationChannelsRequest parseFrom
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -507,7 +499,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.ListNotificationChannelsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -535,7 +526,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_ListNotificationChannelsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_ListNotificationChannelsRequest_fieldAccessorTable
@@ -558,7 +548,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -574,18 +563,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_ListNotificationChannelsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListNotificationChannelsRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.ListNotificationChannelsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListNotificationChannelsRequest build() {
       com.google.monitoring.v3.ListNotificationChannelsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -594,7 +580,6 @@ public com.google.monitoring.v3.ListNotificationChannelsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListNotificationChannelsRequest buildPartial() {
       com.google.monitoring.v3.ListNotificationChannelsRequest result = new com.google.monitoring.v3.ListNotificationChannelsRequest(this);
       result.name_ = name_;
@@ -606,39 +591,32 @@ public com.google.monitoring.v3.ListNotificationChannelsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.ListNotificationChannelsRequest) {
         return mergeFrom((com.google.monitoring.v3.ListNotificationChannelsRequest)other);
@@ -674,12 +652,10 @@ public Builder mergeFrom(com.google.monitoring.v3.ListNotificationChannelsReques
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1167,13 +1143,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1195,12 +1169,11 @@ public static com.google.monitoring.v3.ListNotificationChannelsRequest getDefaul
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListNotificationChannelsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListNotificationChannelsRequest(input, extensionRegistry);
+        return new ListNotificationChannelsRequest(input, extensionRegistry);
     }
   };
 
@@ -1213,7 +1186,6 @@ public com.google.protobuf.Parser getParserForT
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.ListNotificationChannelsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelsResponse.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelsResponse.java
index c5a4bc5262b1..e209a4824e0d 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelsResponse.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListNotificationChannelsResponse.java
@@ -34,9 +34,6 @@ private ListNotificationChannelsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListNotificationChannelsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -63,13 +67,6 @@ private ListNotificationChannelsResponse(
                 input.readMessage(com.google.monitoring.v3.NotificationChannel.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListNotificationChannelsResponse(
     return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_ListNotificationChannelsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_ListNotificationChannelsResponse_fieldAccessorTable
@@ -203,7 +199,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -213,7 +208,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNextPageTokenBytes().isEmpty()) {
@@ -225,7 +219,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -350,7 +343,6 @@ public static com.google.monitoring.v3.ListNotificationChannelsResponse parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -358,7 +350,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.ListNotificationChannelsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -386,7 +377,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_ListNotificationChannelsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_ListNotificationChannelsResponse_fieldAccessorTable
@@ -410,7 +400,6 @@ private void maybeForceBuilderInitialization() {
         getNotificationChannelsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (notificationChannelsBuilder_ == null) {
@@ -424,18 +413,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_ListNotificationChannelsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListNotificationChannelsResponse getDefaultInstanceForType() {
       return com.google.monitoring.v3.ListNotificationChannelsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListNotificationChannelsResponse build() {
       com.google.monitoring.v3.ListNotificationChannelsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -444,7 +430,6 @@ public com.google.monitoring.v3.ListNotificationChannelsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListNotificationChannelsResponse buildPartial() {
       com.google.monitoring.v3.ListNotificationChannelsResponse result = new com.google.monitoring.v3.ListNotificationChannelsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -464,39 +449,32 @@ public com.google.monitoring.v3.ListNotificationChannelsResponse buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.ListNotificationChannelsResponse) {
         return mergeFrom((com.google.monitoring.v3.ListNotificationChannelsResponse)other);
@@ -543,12 +521,10 @@ public Builder mergeFrom(com.google.monitoring.v3.ListNotificationChannelsRespon
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -983,13 +959,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1011,12 +985,11 @@ public static com.google.monitoring.v3.ListNotificationChannelsResponse getDefau
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListNotificationChannelsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListNotificationChannelsResponse(input, extensionRegistry);
+        return new ListNotificationChannelsResponse(input, extensionRegistry);
     }
   };
 
@@ -1029,7 +1002,6 @@ public com.google.protobuf.Parser getParserFor
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.ListNotificationChannelsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListTimeSeriesRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListTimeSeriesRequest.java
index 43516fcfe653..ae00042b0719 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListTimeSeriesRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListTimeSeriesRequest.java
@@ -38,9 +38,6 @@ private ListTimeSeriesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private ListTimeSeriesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -113,13 +117,6 @@ private ListTimeSeriesRequest(
             name_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -137,7 +134,6 @@ private ListTimeSeriesRequest(
     return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_ListTimeSeriesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_ListTimeSeriesRequest_fieldAccessorTable
@@ -505,7 +501,6 @@ public int getViewValue() {
    * .google.monitoring.v3.ListTimeSeriesRequest.TimeSeriesView view = 7;
    */
   public com.google.monitoring.v3.ListTimeSeriesRequest.TimeSeriesView getView() {
-    @SuppressWarnings("deprecation")
     com.google.monitoring.v3.ListTimeSeriesRequest.TimeSeriesView result = com.google.monitoring.v3.ListTimeSeriesRequest.TimeSeriesView.valueOf(view_);
     return result == null ? com.google.monitoring.v3.ListTimeSeriesRequest.TimeSeriesView.UNRECOGNIZED : result;
   }
@@ -574,7 +569,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -584,7 +578,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getFilterBytes().isEmpty()) {
@@ -614,7 +607,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -791,7 +783,6 @@ public static com.google.monitoring.v3.ListTimeSeriesRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -799,7 +790,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.ListTimeSeriesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -827,7 +817,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_ListTimeSeriesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_ListTimeSeriesRequest_fieldAccessorTable
@@ -850,7 +839,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -880,18 +868,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_ListTimeSeriesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListTimeSeriesRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.ListTimeSeriesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListTimeSeriesRequest build() {
       com.google.monitoring.v3.ListTimeSeriesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -900,7 +885,6 @@ public com.google.monitoring.v3.ListTimeSeriesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListTimeSeriesRequest buildPartial() {
       com.google.monitoring.v3.ListTimeSeriesRequest result = new com.google.monitoring.v3.ListTimeSeriesRequest(this);
       result.name_ = name_;
@@ -923,39 +907,32 @@ public com.google.monitoring.v3.ListTimeSeriesRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.ListTimeSeriesRequest) {
         return mergeFrom((com.google.monitoring.v3.ListTimeSeriesRequest)other);
@@ -1000,12 +977,10 @@ public Builder mergeFrom(com.google.monitoring.v3.ListTimeSeriesRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1699,7 +1674,6 @@ public Builder setViewValue(int value) {
      * .google.monitoring.v3.ListTimeSeriesRequest.TimeSeriesView view = 7;
      */
     public com.google.monitoring.v3.ListTimeSeriesRequest.TimeSeriesView getView() {
-      @SuppressWarnings("deprecation")
       com.google.monitoring.v3.ListTimeSeriesRequest.TimeSeriesView result = com.google.monitoring.v3.ListTimeSeriesRequest.TimeSeriesView.valueOf(view_);
       return result == null ? com.google.monitoring.v3.ListTimeSeriesRequest.TimeSeriesView.UNRECOGNIZED : result;
     }
@@ -1881,13 +1855,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1909,12 +1881,11 @@ public static com.google.monitoring.v3.ListTimeSeriesRequest getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListTimeSeriesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTimeSeriesRequest(input, extensionRegistry);
+        return new ListTimeSeriesRequest(input, extensionRegistry);
     }
   };
 
@@ -1927,7 +1898,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.ListTimeSeriesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListTimeSeriesResponse.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListTimeSeriesResponse.java
index 642813767d14..d8bace2b9ce5 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListTimeSeriesResponse.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListTimeSeriesResponse.java
@@ -35,9 +35,6 @@ private ListTimeSeriesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListTimeSeriesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               timeSeries_ = new java.util.ArrayList();
@@ -73,13 +77,6 @@ private ListTimeSeriesResponse(
                 input.readMessage(com.google.rpc.Status.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private ListTimeSeriesResponse(
     return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_ListTimeSeriesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_ListTimeSeriesResponse_fieldAccessorTable
@@ -274,7 +270,6 @@ public com.google.rpc.StatusOrBuilder getExecutionErrorsOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -284,7 +279,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < timeSeries_.size(); i++) {
@@ -299,7 +293,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -434,7 +427,6 @@ public static com.google.monitoring.v3.ListTimeSeriesResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -442,7 +434,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.ListTimeSeriesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -470,7 +461,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_ListTimeSeriesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_ListTimeSeriesResponse_fieldAccessorTable
@@ -495,7 +485,6 @@ private void maybeForceBuilderInitialization() {
         getExecutionErrorsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (timeSeriesBuilder_ == null) {
@@ -515,18 +504,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.MetricServiceProto.internal_static_google_monitoring_v3_ListTimeSeriesResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListTimeSeriesResponse getDefaultInstanceForType() {
       return com.google.monitoring.v3.ListTimeSeriesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListTimeSeriesResponse build() {
       com.google.monitoring.v3.ListTimeSeriesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -535,7 +521,6 @@ public com.google.monitoring.v3.ListTimeSeriesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListTimeSeriesResponse buildPartial() {
       com.google.monitoring.v3.ListTimeSeriesResponse result = new com.google.monitoring.v3.ListTimeSeriesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -564,39 +549,32 @@ public com.google.monitoring.v3.ListTimeSeriesResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.ListTimeSeriesResponse) {
         return mergeFrom((com.google.monitoring.v3.ListTimeSeriesResponse)other);
@@ -669,12 +647,10 @@ public Builder mergeFrom(com.google.monitoring.v3.ListTimeSeriesResponse other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1434,13 +1410,11 @@ public com.google.rpc.Status.Builder addExecutionErrorsBuilder(
       }
       return executionErrorsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1462,12 +1436,11 @@ public static com.google.monitoring.v3.ListTimeSeriesResponse getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListTimeSeriesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTimeSeriesResponse(input, extensionRegistry);
+        return new ListTimeSeriesResponse(input, extensionRegistry);
     }
   };
 
@@ -1480,7 +1453,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.ListTimeSeriesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckConfigsRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckConfigsRequest.java
index d010b2b164df..61548bf3014d 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckConfigsRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckConfigsRequest.java
@@ -35,9 +35,6 @@ private ListUptimeCheckConfigsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListUptimeCheckConfigsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ListUptimeCheckConfigsRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListUptimeCheckConfigsRequest(
     return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_ListUptimeCheckConfigsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_ListUptimeCheckConfigsRequest_fieldAccessorTable
@@ -205,7 +201,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -215,7 +210,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -230,7 +224,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -360,7 +353,6 @@ public static com.google.monitoring.v3.ListUptimeCheckConfigsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -368,7 +360,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.ListUptimeCheckConfigsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -396,7 +387,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_ListUptimeCheckConfigsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_ListUptimeCheckConfigsRequest_fieldAccessorTable
@@ -419,7 +409,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -431,18 +420,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_ListUptimeCheckConfigsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListUptimeCheckConfigsRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.ListUptimeCheckConfigsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListUptimeCheckConfigsRequest build() {
       com.google.monitoring.v3.ListUptimeCheckConfigsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -451,7 +437,6 @@ public com.google.monitoring.v3.ListUptimeCheckConfigsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListUptimeCheckConfigsRequest buildPartial() {
       com.google.monitoring.v3.ListUptimeCheckConfigsRequest result = new com.google.monitoring.v3.ListUptimeCheckConfigsRequest(this);
       result.parent_ = parent_;
@@ -461,39 +446,32 @@ public com.google.monitoring.v3.ListUptimeCheckConfigsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.ListUptimeCheckConfigsRequest) {
         return mergeFrom((com.google.monitoring.v3.ListUptimeCheckConfigsRequest)other);
@@ -521,12 +499,10 @@ public Builder mergeFrom(com.google.monitoring.v3.ListUptimeCheckConfigsRequest
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -784,13 +760,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -812,12 +786,11 @@ public static com.google.monitoring.v3.ListUptimeCheckConfigsRequest getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListUptimeCheckConfigsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListUptimeCheckConfigsRequest(input, extensionRegistry);
+        return new ListUptimeCheckConfigsRequest(input, extensionRegistry);
     }
   };
 
@@ -830,7 +803,6 @@ public com.google.protobuf.Parser getParserForTyp
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.ListUptimeCheckConfigsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckConfigsResponse.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckConfigsResponse.java
index a5c91c462e71..f7350e3e7d7f 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckConfigsResponse.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckConfigsResponse.java
@@ -35,9 +35,6 @@ private ListUptimeCheckConfigsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListUptimeCheckConfigsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               uptimeCheckConfigs_ = new java.util.ArrayList();
@@ -69,13 +73,6 @@ private ListUptimeCheckConfigsResponse(
             totalSize_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private ListUptimeCheckConfigsResponse(
     return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_ListUptimeCheckConfigsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_ListUptimeCheckConfigsResponse_fieldAccessorTable
@@ -225,7 +221,6 @@ public int getTotalSize() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -235,7 +230,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < uptimeCheckConfigs_.size(); i++) {
@@ -250,7 +244,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -383,7 +376,6 @@ public static com.google.monitoring.v3.ListUptimeCheckConfigsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -391,7 +383,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.ListUptimeCheckConfigsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -419,7 +410,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_ListUptimeCheckConfigsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_ListUptimeCheckConfigsResponse_fieldAccessorTable
@@ -443,7 +433,6 @@ private void maybeForceBuilderInitialization() {
         getUptimeCheckConfigsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (uptimeCheckConfigsBuilder_ == null) {
@@ -459,18 +448,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_ListUptimeCheckConfigsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListUptimeCheckConfigsResponse getDefaultInstanceForType() {
       return com.google.monitoring.v3.ListUptimeCheckConfigsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListUptimeCheckConfigsResponse build() {
       com.google.monitoring.v3.ListUptimeCheckConfigsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -479,7 +465,6 @@ public com.google.monitoring.v3.ListUptimeCheckConfigsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListUptimeCheckConfigsResponse buildPartial() {
       com.google.monitoring.v3.ListUptimeCheckConfigsResponse result = new com.google.monitoring.v3.ListUptimeCheckConfigsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -500,39 +485,32 @@ public com.google.monitoring.v3.ListUptimeCheckConfigsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.ListUptimeCheckConfigsResponse) {
         return mergeFrom((com.google.monitoring.v3.ListUptimeCheckConfigsResponse)other);
@@ -582,12 +560,10 @@ public Builder mergeFrom(com.google.monitoring.v3.ListUptimeCheckConfigsResponse
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1068,13 +1044,11 @@ public Builder clearTotalSize() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1096,12 +1070,11 @@ public static com.google.monitoring.v3.ListUptimeCheckConfigsResponse getDefault
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListUptimeCheckConfigsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListUptimeCheckConfigsResponse(input, extensionRegistry);
+        return new ListUptimeCheckConfigsResponse(input, extensionRegistry);
     }
   };
 
@@ -1114,7 +1087,6 @@ public com.google.protobuf.Parser getParserForTy
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.ListUptimeCheckConfigsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckIpsRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckIpsRequest.java
index a9a8b6a7deb5..c03c95770211 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckIpsRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckIpsRequest.java
@@ -34,9 +34,6 @@ private ListUptimeCheckIpsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListUptimeCheckIpsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 16: {
 
             pageSize_ = input.readInt32();
@@ -59,13 +63,6 @@ private ListUptimeCheckIpsRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private ListUptimeCheckIpsRequest(
     return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_ListUptimeCheckIpsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_ListUptimeCheckIpsRequest_fieldAccessorTable
@@ -157,7 +153,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -167,7 +162,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (pageSize_ != 0) {
@@ -179,7 +173,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -302,7 +295,6 @@ public static com.google.monitoring.v3.ListUptimeCheckIpsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -310,7 +302,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.ListUptimeCheckIpsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -338,7 +329,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_ListUptimeCheckIpsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_ListUptimeCheckIpsRequest_fieldAccessorTable
@@ -361,7 +351,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       pageSize_ = 0;
@@ -371,18 +360,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_ListUptimeCheckIpsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListUptimeCheckIpsRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.ListUptimeCheckIpsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListUptimeCheckIpsRequest build() {
       com.google.monitoring.v3.ListUptimeCheckIpsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -391,7 +377,6 @@ public com.google.monitoring.v3.ListUptimeCheckIpsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListUptimeCheckIpsRequest buildPartial() {
       com.google.monitoring.v3.ListUptimeCheckIpsRequest result = new com.google.monitoring.v3.ListUptimeCheckIpsRequest(this);
       result.pageSize_ = pageSize_;
@@ -400,39 +385,32 @@ public com.google.monitoring.v3.ListUptimeCheckIpsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.ListUptimeCheckIpsRequest) {
         return mergeFrom((com.google.monitoring.v3.ListUptimeCheckIpsRequest)other);
@@ -456,12 +434,10 @@ public Builder mergeFrom(com.google.monitoring.v3.ListUptimeCheckIpsRequest othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -633,13 +609,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -661,12 +635,11 @@ public static com.google.monitoring.v3.ListUptimeCheckIpsRequest getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListUptimeCheckIpsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListUptimeCheckIpsRequest(input, extensionRegistry);
+        return new ListUptimeCheckIpsRequest(input, extensionRegistry);
     }
   };
 
@@ -679,7 +652,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.ListUptimeCheckIpsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckIpsResponse.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckIpsResponse.java
index d29ce4174bb6..d2c0b1c835e9 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckIpsResponse.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/ListUptimeCheckIpsResponse.java
@@ -34,9 +34,6 @@ private ListUptimeCheckIpsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListUptimeCheckIpsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               uptimeCheckIps_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListUptimeCheckIpsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListUptimeCheckIpsResponse(
     return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_ListUptimeCheckIpsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_ListUptimeCheckIpsResponse_fieldAccessorTable
@@ -212,7 +208,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -222,7 +217,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < uptimeCheckIps_.size(); i++) {
@@ -234,7 +228,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -359,7 +352,6 @@ public static com.google.monitoring.v3.ListUptimeCheckIpsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -367,7 +359,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.ListUptimeCheckIpsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -395,7 +386,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_ListUptimeCheckIpsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_ListUptimeCheckIpsResponse_fieldAccessorTable
@@ -419,7 +409,6 @@ private void maybeForceBuilderInitialization() {
         getUptimeCheckIpsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (uptimeCheckIpsBuilder_ == null) {
@@ -433,18 +422,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_ListUptimeCheckIpsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListUptimeCheckIpsResponse getDefaultInstanceForType() {
       return com.google.monitoring.v3.ListUptimeCheckIpsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListUptimeCheckIpsResponse build() {
       com.google.monitoring.v3.ListUptimeCheckIpsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -453,7 +439,6 @@ public com.google.monitoring.v3.ListUptimeCheckIpsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.ListUptimeCheckIpsResponse buildPartial() {
       com.google.monitoring.v3.ListUptimeCheckIpsResponse result = new com.google.monitoring.v3.ListUptimeCheckIpsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -473,39 +458,32 @@ public com.google.monitoring.v3.ListUptimeCheckIpsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.ListUptimeCheckIpsResponse) {
         return mergeFrom((com.google.monitoring.v3.ListUptimeCheckIpsResponse)other);
@@ -552,12 +530,10 @@ public Builder mergeFrom(com.google.monitoring.v3.ListUptimeCheckIpsResponse oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1020,13 +996,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1048,12 +1022,11 @@ public static com.google.monitoring.v3.ListUptimeCheckIpsResponse getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListUptimeCheckIpsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListUptimeCheckIpsResponse(input, extensionRegistry);
+        return new ListUptimeCheckIpsResponse(input, extensionRegistry);
     }
   };
 
@@ -1066,7 +1039,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.ListUptimeCheckIpsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MetricProto.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MetricProto.java
index 9f3d377dec0d..39a5cf8fd125 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MetricProto.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MetricProto.java
@@ -42,7 +42,7 @@ public static void registerAllExtensions(
       "ogle.monitoring.v3.TimeInterval\022/\n\005value" +
       "\030\002 \001(\0132 .google.monitoring.v3.TypedValue" +
       "\"\301\002\n\nTimeSeries\022\"\n\006metric\030\001 \001(\0132\022.google" +
-      ".api.Metric\022/\n\010resource\030\002 \001(\0132\035.google.a" +
+      ".api.Metric\022/\n\010resource\030\002 \001(\0132\035.google.a",
       "pi.MonitoredResource\0227\n\010metadata\030\007 \001(\0132%" +
       ".google.api.MonitoredResourceMetadata\022<\n" +
       "\013metric_kind\030\003 \001(\0162\'.google.api.MetricDe" +
@@ -52,7 +52,7 @@ public static void registerAllExtensions(
       "ointB\243\001\n\030com.google.monitoring.v3B\013Metri" +
       "cProtoP\001Z>google.golang.org/genproto/goo" +
       "gleapis/monitoring/v3;monitoring\252\002\032Googl" +
-      "e.Cloud.Monitoring.V3\312\002\032Google\\Cloud\\Mon" +
+      "e.Cloud.Monitoring.V3\312\002\032Google\\Cloud\\Mon",
       "itoring\\V3b\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MetricServiceProto.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MetricServiceProto.java
index afde06de6d48..9787d6dc0cc4 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MetricServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MetricServiceProto.java
@@ -92,7 +92,7 @@ public static void registerAllExtensions(
       "obuf/duration.proto\032\033google/protobuf/emp" +
       "ty.proto\032\027google/rpc/status.proto\"n\n\'Lis" +
       "tMonitoredResourceDescriptorsRequest\022\014\n\004" +
-      "name\030\005 \001(\t\022\016\n\006filter\030\002 \001(\t\022\021\n\tpage_size\030" +
+      "name\030\005 \001(\t\022\016\n\006filter\030\002 \001(\t\022\021\n\tpage_size\030",
       "\003 \001(\005\022\022\n\npage_token\030\004 \001(\t\"\212\001\n(ListMonito" +
       "redResourceDescriptorsResponse\022E\n\024resour" +
       "ce_descriptors\030\001 \003(\0132\'.google.api.Monito" +
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "iptorsRequest\022\014\n\004name\030\005 \001(\t\022\016\n\006filter\030\002 " +
       "\001(\t\022\021\n\tpage_size\030\003 \001(\005\022\022\n\npage_token\030\004 \001" +
       "(\t\"r\n\035ListMetricDescriptorsResponse\0228\n\022m" +
-      "etric_descriptors\030\001 \003(\0132\034.google.api.Met" +
+      "etric_descriptors\030\001 \003(\0132\034.google.api.Met",
       "ricDescriptor\022\027\n\017next_page_token\030\002 \001(\t\"*" +
       "\n\032GetMetricDescriptorRequest\022\014\n\004name\030\003 \001" +
       "(\t\"f\n\035CreateMetricDescriptorRequest\022\014\n\004n" +
@@ -112,7 +112,7 @@ public static void registerAllExtensions(
       "stTimeSeriesRequest\022\014\n\004name\030\n \001(\t\022\016\n\006fil" +
       "ter\030\002 \001(\t\0224\n\010interval\030\004 \001(\0132\".google.mon" +
       "itoring.v3.TimeInterval\0226\n\013aggregation\030\005" +
-      " \001(\0132!.google.monitoring.v3.Aggregation\022" +
+      " \001(\0132!.google.monitoring.v3.Aggregation\022",
       "\020\n\010order_by\030\006 \001(\t\022H\n\004view\030\007 \001(\0162:.google" +
       ".monitoring.v3.ListTimeSeriesRequest.Tim" +
       "eSeriesView\022\021\n\tpage_size\030\010 \001(\005\022\022\n\npage_t" +
@@ -122,7 +122,7 @@ public static void registerAllExtensions(
       "v3.TimeSeries\022\027\n\017next_page_token\030\002 \001(\t\022," +
       "\n\020execution_errors\030\003 \003(\0132\022.google.rpc.St" +
       "atus\"^\n\027CreateTimeSeriesRequest\022\014\n\004name\030" +
-      "\003 \001(\t\0225\n\013time_series\030\002 \003(\0132 .google.moni" +
+      "\003 \001(\t\0225\n\013time_series\030\002 \003(\0132 .google.moni",
       "toring.v3.TimeSeries\"r\n\025CreateTimeSeries" +
       "Error\0225\n\013time_series\030\001 \001(\0132 .google.moni" +
       "toring.v3.TimeSeries\022\"\n\006status\030\002 \001(\0132\022.g" +
@@ -132,7 +132,7 @@ public static void registerAllExtensions(
       "riptorsRequest\032>.google.monitoring.v3.Li" +
       "stMonitoredResourceDescriptorsResponse\":" +
       "\202\323\344\223\0024\0222/v3/{name=projects/*}/monitoredR" +
-      "esourceDescriptors\022\304\001\n\036GetMonitoredResou" +
+      "esourceDescriptors\022\304\001\n\036GetMonitoredResou",
       "rceDescriptor\022;.google.monitoring.v3.Get" +
       "MonitoredResourceDescriptorRequest\032\'.goo" +
       "gle.api.MonitoredResourceDescriptor\"<\202\323\344" +
@@ -142,7 +142,7 @@ public static void registerAllExtensions(
       "criptorsRequest\0323.google.monitoring.v3.L" +
       "istMetricDescriptorsResponse\"/\202\323\344\223\002)\022\'/v" +
       "3/{name=projects/*}/metricDescriptors\022\231\001" +
-      "\n\023GetMetricDescriptor\0220.google.monitorin" +
+      "\n\023GetMetricDescriptor\0220.google.monitorin",
       "g.v3.GetMetricDescriptorRequest\032\034.google" +
       ".api.MetricDescriptor\"2\202\323\344\223\002,\022*/v3/{name" +
       "=projects/*/metricDescriptors/**}\022\257\001\n\026Cr" +
@@ -152,7 +152,7 @@ public static void registerAllExtensions(
       "me=projects/*}/metricDescriptors:\021metric" +
       "_descriptor\022\231\001\n\026DeleteMetricDescriptor\0223" +
       ".google.monitoring.v3.DeleteMetricDescri" +
-      "ptorRequest\032\026.google.protobuf.Empty\"2\202\323\344" +
+      "ptorRequest\032\026.google.protobuf.Empty\"2\202\323\344",
       "\223\002,**/v3/{name=projects/*/metricDescript" +
       "ors/**}\022\225\001\n\016ListTimeSeries\022+.google.moni" +
       "toring.v3.ListTimeSeriesRequest\032,.google" +
@@ -162,7 +162,7 @@ public static void registerAllExtensions(
       ".v3.CreateTimeSeriesRequest\032\026.google.pro" +
       "tobuf.Empty\"+\202\323\344\223\002%\" /v3/{name=projects/" +
       "*}/timeSeries:\001*B\252\001\n\030com.google.monitori" +
-      "ng.v3B\022MetricServiceProtoP\001Z>google.gola" +
+      "ng.v3B\022MetricServiceProtoP\001Z>google.gola",
       "ng.org/genproto/googleapis/monitoring/v3" +
       ";monitoring\252\002\032Google.Cloud.Monitoring.V3" +
       "\312\002\032Google\\Cloud\\Monitoring\\V3b\006proto3"
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MutationRecord.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MutationRecord.java
index fbdba504d8bc..b8367b33f952 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MutationRecord.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/MutationRecord.java
@@ -33,9 +33,6 @@ private MutationRecord(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private MutationRecord(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.protobuf.Timestamp.Builder subBuilder = null;
             if (mutateTime_ != null) {
@@ -66,13 +70,6 @@ private MutationRecord(
             mutatedBy_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private MutationRecord(
     return com.google.monitoring.v3.MutationRecordProto.internal_static_google_monitoring_v3_MutationRecord_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.MutationRecordProto.internal_static_google_monitoring_v3_MutationRecord_fieldAccessorTable
@@ -174,7 +170,6 @@ public java.lang.String getMutatedBy() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -184,7 +179,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (mutateTime_ != null) {
@@ -196,7 +190,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -324,7 +317,6 @@ public static com.google.monitoring.v3.MutationRecord parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -332,7 +324,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.MutationRecord prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -360,7 +351,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.MutationRecordProto.internal_static_google_monitoring_v3_MutationRecord_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.MutationRecordProto.internal_static_google_monitoring_v3_MutationRecord_fieldAccessorTable
@@ -383,7 +373,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (mutateTimeBuilder_ == null) {
@@ -397,18 +386,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.MutationRecordProto.internal_static_google_monitoring_v3_MutationRecord_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.MutationRecord getDefaultInstanceForType() {
       return com.google.monitoring.v3.MutationRecord.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.MutationRecord build() {
       com.google.monitoring.v3.MutationRecord result = buildPartial();
       if (!result.isInitialized()) {
@@ -417,7 +403,6 @@ public com.google.monitoring.v3.MutationRecord build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.MutationRecord buildPartial() {
       com.google.monitoring.v3.MutationRecord result = new com.google.monitoring.v3.MutationRecord(this);
       if (mutateTimeBuilder_ == null) {
@@ -430,39 +415,32 @@ public com.google.monitoring.v3.MutationRecord buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.MutationRecord) {
         return mergeFrom((com.google.monitoring.v3.MutationRecord)other);
@@ -486,12 +464,10 @@ public Builder mergeFrom(com.google.monitoring.v3.MutationRecord other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -751,13 +727,11 @@ public Builder setMutatedByBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -779,12 +753,11 @@ public static com.google.monitoring.v3.MutationRecord getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public MutationRecord parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new MutationRecord(input, extensionRegistry);
+        return new MutationRecord(input, extensionRegistry);
     }
   };
 
@@ -797,7 +770,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.MutationRecord getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationChannel.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationChannel.java
index eb2e892d17f9..6c685b3bd559 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationChannel.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationChannel.java
@@ -41,9 +41,6 @@ private NotificationChannel(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -55,6 +52,13 @@ private NotificationChannel(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -124,13 +128,6 @@ private NotificationChannel(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -149,7 +146,6 @@ private NotificationChannel(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -162,7 +158,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.NotificationProto.internal_static_google_monitoring_v3_NotificationChannel_fieldAccessorTable
@@ -783,7 +778,6 @@ public int getVerificationStatusValue() {
    * .google.monitoring.v3.NotificationChannel.VerificationStatus verification_status = 9;
    */
   public com.google.monitoring.v3.NotificationChannel.VerificationStatus getVerificationStatus() {
-    @SuppressWarnings("deprecation")
     com.google.monitoring.v3.NotificationChannel.VerificationStatus result = com.google.monitoring.v3.NotificationChannel.VerificationStatus.valueOf(verificationStatus_);
     return result == null ? com.google.monitoring.v3.NotificationChannel.VerificationStatus.UNRECOGNIZED : result;
   }
@@ -837,7 +831,6 @@ public com.google.protobuf.BoolValueOrBuilder getEnabledOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -847,7 +840,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getTypeBytes().isEmpty()) {
@@ -883,7 +875,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1071,7 +1062,6 @@ public static com.google.monitoring.v3.NotificationChannel parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1079,7 +1069,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.NotificationChannel prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1137,7 +1126,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.NotificationProto.internal_static_google_monitoring_v3_NotificationChannel_fieldAccessorTable
@@ -1160,7 +1148,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       type_ = "";
@@ -1184,18 +1171,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.NotificationProto.internal_static_google_monitoring_v3_NotificationChannel_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.NotificationChannel getDefaultInstanceForType() {
       return com.google.monitoring.v3.NotificationChannel.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.NotificationChannel build() {
       com.google.monitoring.v3.NotificationChannel result = buildPartial();
       if (!result.isInitialized()) {
@@ -1204,7 +1188,6 @@ public com.google.monitoring.v3.NotificationChannel build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.NotificationChannel buildPartial() {
       com.google.monitoring.v3.NotificationChannel result = new com.google.monitoring.v3.NotificationChannel(this);
       int from_bitField0_ = bitField0_;
@@ -1228,39 +1211,32 @@ public com.google.monitoring.v3.NotificationChannel buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.NotificationChannel) {
         return mergeFrom((com.google.monitoring.v3.NotificationChannel)other);
@@ -1303,12 +1279,10 @@ public Builder mergeFrom(com.google.monitoring.v3.NotificationChannel other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2172,7 +2146,6 @@ public Builder setVerificationStatusValue(int value) {
      * .google.monitoring.v3.NotificationChannel.VerificationStatus verification_status = 9;
      */
     public com.google.monitoring.v3.NotificationChannel.VerificationStatus getVerificationStatus() {
-      @SuppressWarnings("deprecation")
       com.google.monitoring.v3.NotificationChannel.VerificationStatus result = com.google.monitoring.v3.NotificationChannel.VerificationStatus.valueOf(verificationStatus_);
       return result == null ? com.google.monitoring.v3.NotificationChannel.VerificationStatus.UNRECOGNIZED : result;
     }
@@ -2433,13 +2406,11 @@ public com.google.protobuf.BoolValueOrBuilder getEnabledOrBuilder() {
       }
       return enabledBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2461,12 +2432,11 @@ public static com.google.monitoring.v3.NotificationChannel getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public NotificationChannel parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new NotificationChannel(input, extensionRegistry);
+        return new NotificationChannel(input, extensionRegistry);
     }
   };
 
@@ -2479,7 +2449,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.NotificationChannel getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationChannelDescriptor.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationChannelDescriptor.java
index fe3bc7c414bf..63c5be5b8687 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationChannelDescriptor.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationChannelDescriptor.java
@@ -40,9 +40,6 @@ private NotificationChannelDescriptor(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -54,6 +51,13 @@ private NotificationChannelDescriptor(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -110,13 +114,6 @@ private NotificationChannelDescriptor(
             name_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -140,7 +137,6 @@ private NotificationChannelDescriptor(
     return com.google.monitoring.v3.NotificationProto.internal_static_google_monitoring_v3_NotificationChannelDescriptor_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.NotificationProto.internal_static_google_monitoring_v3_NotificationChannelDescriptor_fieldAccessorTable
@@ -401,7 +397,6 @@ public com.google.api.LabelDescriptorOrBuilder getLabelsOrBuilder(
           new com.google.protobuf.Internal.ListAdapter.Converter<
               java.lang.Integer, com.google.monitoring.v3.ServiceTier>() {
             public com.google.monitoring.v3.ServiceTier convert(java.lang.Integer from) {
-              @SuppressWarnings("deprecation")
               com.google.monitoring.v3.ServiceTier result = com.google.monitoring.v3.ServiceTier.valueOf(from);
               return result == null ? com.google.monitoring.v3.ServiceTier.UNRECOGNIZED : result;
             }
@@ -466,7 +461,6 @@ public com.google.monitoring.v3.ServiceTier convert(java.lang.Integer from) {
   private int supportedTiersMemoizedSerializedSize;
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -476,7 +470,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     getSerializedSize();
@@ -505,7 +498,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -668,7 +660,6 @@ public static com.google.monitoring.v3.NotificationChannelDescriptor parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -676,7 +667,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.NotificationChannelDescriptor prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -706,7 +696,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.NotificationProto.internal_static_google_monitoring_v3_NotificationChannelDescriptor_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.NotificationProto.internal_static_google_monitoring_v3_NotificationChannelDescriptor_fieldAccessorTable
@@ -730,7 +719,6 @@ private void maybeForceBuilderInitialization() {
         getLabelsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -752,18 +740,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.NotificationProto.internal_static_google_monitoring_v3_NotificationChannelDescriptor_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.NotificationChannelDescriptor getDefaultInstanceForType() {
       return com.google.monitoring.v3.NotificationChannelDescriptor.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.NotificationChannelDescriptor build() {
       com.google.monitoring.v3.NotificationChannelDescriptor result = buildPartial();
       if (!result.isInitialized()) {
@@ -772,7 +757,6 @@ public com.google.monitoring.v3.NotificationChannelDescriptor build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.NotificationChannelDescriptor buildPartial() {
       com.google.monitoring.v3.NotificationChannelDescriptor result = new com.google.monitoring.v3.NotificationChannelDescriptor(this);
       int from_bitField0_ = bitField0_;
@@ -800,39 +784,32 @@ public com.google.monitoring.v3.NotificationChannelDescriptor buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.NotificationChannelDescriptor) {
         return mergeFrom((com.google.monitoring.v3.NotificationChannelDescriptor)other);
@@ -901,12 +878,10 @@ public Builder mergeFrom(com.google.monitoring.v3.NotificationChannelDescriptor
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1837,13 +1812,11 @@ private void ensureSupportedTiersIsMutable() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1865,12 +1838,11 @@ public static com.google.monitoring.v3.NotificationChannelDescriptor getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public NotificationChannelDescriptor parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new NotificationChannelDescriptor(input, extensionRegistry);
+        return new NotificationChannelDescriptor(input, extensionRegistry);
     }
   };
 
@@ -1883,7 +1855,6 @@ public com.google.protobuf.Parser getParserForTyp
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.NotificationChannelDescriptor getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationProto.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationProto.java
index 9c7efbad5b1b..e84e4ab3f7db 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationProto.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationProto.java
@@ -52,7 +52,7 @@ public static void registerAllExtensions(
       "\030\001 \001(\t\022\024\n\014display_name\030\002 \001(\t\022\023\n\013descript" +
       "ion\030\003 \001(\t\022+\n\006labels\030\004 \003(\0132\033.google.api.L" +
       "abelDescriptor\022>\n\017supported_tiers\030\005 \003(\0162" +
-      "!.google.monitoring.v3.ServiceTierB\002\030\001\"\266" +
+      "!.google.monitoring.v3.ServiceTierB\002\030\001\"\266",
       "\004\n\023NotificationChannel\022\014\n\004type\030\001 \001(\t\022\014\n\004" +
       "name\030\006 \001(\t\022\024\n\014display_name\030\003 \001(\t\022\023\n\013desc" +
       "ription\030\004 \001(\t\022E\n\006labels\030\005 \003(\01325.google.m" +
@@ -62,7 +62,7 @@ public static void registerAllExtensions(
       "ntry\022Y\n\023verification_status\030\t \001(\0162<.goog" +
       "le.monitoring.v3.NotificationChannel.Ver" +
       "ificationStatus\022+\n\007enabled\030\013 \001(\0132\032.googl" +
-      "e.protobuf.BoolValue\032-\n\013LabelsEntry\022\013\n\003k" +
+      "e.protobuf.BoolValue\032-\n\013LabelsEntry\022\013\n\003k",
       "ey\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0321\n\017UserLabel" +
       "sEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"W" +
       "\n\022VerificationStatus\022#\n\037VERIFICATION_STA" +
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationServiceProto.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationServiceProto.java
index c5441fe9a563..5e336815a1d3 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/NotificationServiceProto.java
@@ -97,7 +97,7 @@ public static void registerAllExtensions(
       "\n)ListNotificationChannelDescriptorsRequ" +
       "est\022\014\n\004name\030\004 \001(\t\022\021\n\tpage_size\030\002 \001(\005\022\022\n\n" +
       "page_token\030\003 \001(\t\"\227\001\n*ListNotificationCha" +
-      "nnelDescriptorsResponse\022P\n\023channel_descr" +
+      "nnelDescriptorsResponse\022P\n\023channel_descr",
       "iptors\030\001 \003(\01323.google.monitoring.v3.Noti" +
       "ficationChannelDescriptor\022\027\n\017next_page_t" +
       "oken\030\002 \001(\t\"7\n\'GetNotificationChannelDesc" +
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "itoring.v3.NotificationChannel\"x\n\037ListNo" +
       "tificationChannelsRequest\022\014\n\004name\030\005 \001(\t\022" +
       "\016\n\006filter\030\006 \001(\t\022\020\n\010order_by\030\007 \001(\t\022\021\n\tpag" +
-      "e_size\030\003 \001(\005\022\022\n\npage_token\030\004 \001(\t\"\205\001\n Lis" +
+      "e_size\030\003 \001(\005\022\022\n\npage_token\030\004 \001(\t\"\205\001\n Lis",
       "tNotificationChannelsResponse\022H\n\025notific" +
       "ation_channels\030\003 \003(\0132).google.monitoring" +
       ".v3.NotificationChannel\022\027\n\017next_page_tok" +
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       "le.protobuf.FieldMask\022G\n\024notification_ch" +
       "annel\030\003 \001(\0132).google.monitoring.v3.Notif" +
       "icationChannel\"?\n DeleteNotificationChan" +
-      "nelRequest\022\014\n\004name\030\003 \001(\t\022\r\n\005force\030\005 \001(\010\"" +
+      "nelRequest\022\014\n\004name\030\003 \001(\t\022\r\n\005force\030\005 \001(\010\"",
       ">\n.SendNotificationChannelVerificationCo" +
       "deRequest\022\014\n\004name\030\001 \001(\t\"n\n-GetNotificati" +
       "onChannelVerificationCodeRequest\022\014\n\004name" +
@@ -127,7 +127,7 @@ public static void registerAllExtensions(
       "/\n\013expire_time\030\002 \001(\0132\032.google.protobuf.T" +
       "imestamp\">\n VerifyNotificationChannelReq" +
       "uest\022\014\n\004name\030\001 \001(\t\022\014\n\004code\030\002 \001(\t2\273\020\n\032Not" +
-      "ificationChannelService\022\345\001\n\"ListNotifica" +
+      "ificationChannelService\022\345\001\n\"ListNotifica",
       "tionChannelDescriptors\022?.google.monitori" +
       "ng.v3.ListNotificationChannelDescriptors" +
       "Request\032@.google.monitoring.v3.ListNotif" +
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       "elDescriptor\022=.google.monitoring.v3.GetN" +
       "otificationChannelDescriptorRequest\0323.go" +
       "ogle.monitoring.v3.NotificationChannelDe" +
-      "scriptor\">\202\323\344\223\0028\0226/v3/{name=projects/*/n" +
+      "scriptor\">\202\323\344\223\0028\0226/v3/{name=projects/*/n",
       "otificationChannelDescriptors/*}\022\275\001\n\030Lis" +
       "tNotificationChannels\0225.google.monitorin" +
       "g.v3.ListNotificationChannelsRequest\0326.g" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "tionChannel\0223.google.monitoring.v3.GetNo" +
       "tificationChannelRequest\032).google.monito" +
       "ring.v3.NotificationChannel\"4\202\323\344\223\002.\022,/v3" +
-      "/{name=projects/*/notificationChannels/*" +
+      "/{name=projects/*/notificationChannels/*",
       "}\022\310\001\n\031CreateNotificationChannel\0226.google" +
       ".monitoring.v3.CreateNotificationChannel" +
       "Request\032).google.monitoring.v3.Notificat" +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       "gle.monitoring.v3.UpdateNotificationChan" +
       "nelRequest\032).google.monitoring.v3.Notifi" +
       "cationChannel\"_\202\323\344\223\002Y2A/v3/{notification" +
-      "_channel.name=projects/*/notificationCha" +
+      "_channel.name=projects/*/notificationCha",
       "nnels/*}:\024notification_channel\022\241\001\n\031Delet" +
       "eNotificationChannel\0226.google.monitoring" +
       ".v3.DeleteNotificationChannelRequest\032\026.g" +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       ".google.monitoring.v3.SendNotificationCh" +
       "annelVerificationCodeRequest\032\026.google.pr" +
       "otobuf.Empty\"L\202\323\344\223\002F\"A/v3/{name=projects" +
-      "/*/notificationChannels/*}:sendVerificat" +
+      "/*/notificationChannels/*}:sendVerificat",
       "ionCode:\001*\022\200\002\n&GetNotificationChannelVer" +
       "ificationCode\022C.google.monitoring.v3.Get" +
       "NotificationChannelVerificationCodeReque" +
@@ -177,7 +177,7 @@ public static void registerAllExtensions(
       "els/*}:getVerificationCode:\001*\022\276\001\n\031Verify" +
       "NotificationChannel\0226.google.monitoring." +
       "v3.VerifyNotificationChannelRequest\032).go" +
-      "ogle.monitoring.v3.NotificationChannel\">" +
+      "ogle.monitoring.v3.NotificationChannel\">",
       "\202\323\344\223\0028\"3/v3/{name=projects/*/notificatio" +
       "nChannels/*}:verify:\001*B\260\001\n\030com.google.mo" +
       "nitoring.v3B\030NotificationServiceProtoP\001Z" +
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/Point.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/Point.java
index c22bc64d1cad..d5abbb2d2819 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/Point.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/Point.java
@@ -32,9 +32,6 @@ private Point(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private Point(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.monitoring.v3.TimeInterval.Builder subBuilder = null;
             if (interval_ != null) {
@@ -72,13 +76,6 @@ private Point(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private Point(
     return com.google.monitoring.v3.MetricProto.internal_static_google_monitoring_v3_Point_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.MetricProto.internal_static_google_monitoring_v3_Point_fieldAccessorTable
@@ -192,7 +188,6 @@ public com.google.monitoring.v3.TypedValueOrBuilder getValueOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -202,7 +197,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (interval_ != null) {
@@ -214,7 +208,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.monitoring.v3.Point parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.Point prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.MetricProto.internal_static_google_monitoring_v3_Point_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.MetricProto.internal_static_google_monitoring_v3_Point_fieldAccessorTable
@@ -407,7 +397,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (intervalBuilder_ == null) {
@@ -425,18 +414,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.MetricProto.internal_static_google_monitoring_v3_Point_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.Point getDefaultInstanceForType() {
       return com.google.monitoring.v3.Point.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.Point build() {
       com.google.monitoring.v3.Point result = buildPartial();
       if (!result.isInitialized()) {
@@ -445,7 +431,6 @@ public com.google.monitoring.v3.Point build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.Point buildPartial() {
       com.google.monitoring.v3.Point result = new com.google.monitoring.v3.Point(this);
       if (intervalBuilder_ == null) {
@@ -462,39 +447,32 @@ public com.google.monitoring.v3.Point buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.Point) {
         return mergeFrom((com.google.monitoring.v3.Point)other);
@@ -517,12 +495,10 @@ public Builder mergeFrom(com.google.monitoring.v3.Point other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -909,13 +885,11 @@ public com.google.monitoring.v3.TypedValueOrBuilder getValueOrBuilder() {
       }
       return valueBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -937,12 +911,11 @@ public static com.google.monitoring.v3.Point getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Point parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Point(input, extensionRegistry);
+        return new Point(input, extensionRegistry);
     }
   };
 
@@ -955,7 +928,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.Point getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/SendNotificationChannelVerificationCodeRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/SendNotificationChannelVerificationCodeRequest.java
index 084b37c14867..16727bcdfab4 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/SendNotificationChannelVerificationCodeRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/SendNotificationChannelVerificationCodeRequest.java
@@ -33,9 +33,6 @@ private SendNotificationChannelVerificationCodeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private SendNotificationChannelVerificationCodeRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private SendNotificationChannelVerificationCodeRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private SendNotificationChannelVerificationCodeRequest(
     return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_SendNotificationChannelVerificationCodeRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_SendNotificationChannelVerificationCodeRequest_fieldAccessorTable
@@ -128,7 +124,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -138,7 +133,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -147,7 +141,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -262,7 +255,6 @@ public static com.google.monitoring.v3.SendNotificationChannelVerificationCodeRe
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -270,7 +262,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.SendNotificationChannelVerificationCodeRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -298,7 +289,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_SendNotificationChannelVerificationCodeRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_SendNotificationChannelVerificationCodeRequest_fieldAccessorTable
@@ -321,7 +311,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -329,18 +318,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_SendNotificationChannelVerificationCodeRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.SendNotificationChannelVerificationCodeRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.SendNotificationChannelVerificationCodeRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.SendNotificationChannelVerificationCodeRequest build() {
       com.google.monitoring.v3.SendNotificationChannelVerificationCodeRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -349,7 +335,6 @@ public com.google.monitoring.v3.SendNotificationChannelVerificationCodeRequest b
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.SendNotificationChannelVerificationCodeRequest buildPartial() {
       com.google.monitoring.v3.SendNotificationChannelVerificationCodeRequest result = new com.google.monitoring.v3.SendNotificationChannelVerificationCodeRequest(this);
       result.name_ = name_;
@@ -357,39 +342,32 @@ public com.google.monitoring.v3.SendNotificationChannelVerificationCodeRequest b
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.SendNotificationChannelVerificationCodeRequest) {
         return mergeFrom((com.google.monitoring.v3.SendNotificationChannelVerificationCodeRequest)other);
@@ -410,12 +388,10 @@ public Builder mergeFrom(com.google.monitoring.v3.SendNotificationChannelVerific
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -522,13 +498,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -550,12 +524,11 @@ public static com.google.monitoring.v3.SendNotificationChannelVerificationCodeRe
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SendNotificationChannelVerificationCodeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SendNotificationChannelVerificationCodeRequest(input, extensionRegistry);
+        return new SendNotificationChannelVerificationCodeRequest(input, extensionRegistry);
     }
   };
 
@@ -568,7 +541,6 @@ public com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SpanContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SpanContext(input, extensionRegistry);
+        return new SpanContext(input, extensionRegistry);
     }
   };
 
@@ -609,7 +582,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.SpanContext getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/TimeInterval.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/TimeInterval.java
index 3b7e08bb6310..4d513a9ff73b 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/TimeInterval.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/TimeInterval.java
@@ -34,9 +34,6 @@ private TimeInterval(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private TimeInterval(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.protobuf.Timestamp.Builder subBuilder = null;
             if (startTime_ != null) {
@@ -74,13 +78,6 @@ private TimeInterval(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -98,7 +95,6 @@ private TimeInterval(
     return com.google.monitoring.v3.CommonProto.internal_static_google_monitoring_v3_TimeInterval_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.CommonProto.internal_static_google_monitoring_v3_TimeInterval_fieldAccessorTable
@@ -179,7 +175,6 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -189,7 +184,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (startTime_ != null) {
@@ -201,7 +195,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -335,7 +328,6 @@ public static com.google.monitoring.v3.TimeInterval parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -343,7 +335,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.TimeInterval prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -373,7 +364,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.CommonProto.internal_static_google_monitoring_v3_TimeInterval_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.CommonProto.internal_static_google_monitoring_v3_TimeInterval_fieldAccessorTable
@@ -396,7 +386,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (endTimeBuilder_ == null) {
@@ -414,18 +403,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.CommonProto.internal_static_google_monitoring_v3_TimeInterval_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.TimeInterval getDefaultInstanceForType() {
       return com.google.monitoring.v3.TimeInterval.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.TimeInterval build() {
       com.google.monitoring.v3.TimeInterval result = buildPartial();
       if (!result.isInitialized()) {
@@ -434,7 +420,6 @@ public com.google.monitoring.v3.TimeInterval build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.TimeInterval buildPartial() {
       com.google.monitoring.v3.TimeInterval result = new com.google.monitoring.v3.TimeInterval(this);
       if (endTimeBuilder_ == null) {
@@ -451,39 +436,32 @@ public com.google.monitoring.v3.TimeInterval buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.TimeInterval) {
         return mergeFrom((com.google.monitoring.v3.TimeInterval)other);
@@ -506,12 +484,10 @@ public Builder mergeFrom(com.google.monitoring.v3.TimeInterval other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -853,13 +829,11 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() {
       }
       return startTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -881,12 +855,11 @@ public static com.google.monitoring.v3.TimeInterval getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TimeInterval parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TimeInterval(input, extensionRegistry);
+        return new TimeInterval(input, extensionRegistry);
     }
   };
 
@@ -899,7 +872,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.TimeInterval getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/TimeSeries.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/TimeSeries.java
index 0bdc046c17ea..1c777f1d1a01 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/TimeSeries.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/TimeSeries.java
@@ -38,9 +38,6 @@ private TimeSeries(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private TimeSeries(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.api.Metric.Builder subBuilder = null;
             if (metric_ != null) {
@@ -112,13 +116,6 @@ private TimeSeries(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -139,7 +136,6 @@ private TimeSeries(
     return com.google.monitoring.v3.MetricProto.internal_static_google_monitoring_v3_TimeSeries_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.MetricProto.internal_static_google_monitoring_v3_TimeSeries_fieldAccessorTable
@@ -293,7 +289,6 @@ public int getMetricKindValue() {
    * .google.api.MetricDescriptor.MetricKind metric_kind = 3;
    */
   public com.google.api.MetricDescriptor.MetricKind getMetricKind() {
-    @SuppressWarnings("deprecation")
     com.google.api.MetricDescriptor.MetricKind result = com.google.api.MetricDescriptor.MetricKind.valueOf(metricKind_);
     return result == null ? com.google.api.MetricDescriptor.MetricKind.UNRECOGNIZED : result;
   }
@@ -326,7 +321,6 @@ public int getValueTypeValue() {
    * .google.api.MetricDescriptor.ValueType value_type = 4;
    */
   public com.google.api.MetricDescriptor.ValueType getValueType() {
-    @SuppressWarnings("deprecation")
     com.google.api.MetricDescriptor.ValueType result = com.google.api.MetricDescriptor.ValueType.valueOf(valueType_);
     return result == null ? com.google.api.MetricDescriptor.ValueType.UNRECOGNIZED : result;
   }
@@ -417,7 +411,6 @@ public com.google.monitoring.v3.PointOrBuilder getPointsOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -427,7 +420,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (metric_ != null) {
@@ -451,7 +443,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -622,7 +613,6 @@ public static com.google.monitoring.v3.TimeSeries parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -630,7 +620,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.TimeSeries prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -661,7 +650,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.MetricProto.internal_static_google_monitoring_v3_TimeSeries_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.MetricProto.internal_static_google_monitoring_v3_TimeSeries_fieldAccessorTable
@@ -685,7 +673,6 @@ private void maybeForceBuilderInitialization() {
         getPointsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (metricBuilder_ == null) {
@@ -719,18 +706,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.MetricProto.internal_static_google_monitoring_v3_TimeSeries_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.TimeSeries getDefaultInstanceForType() {
       return com.google.monitoring.v3.TimeSeries.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.TimeSeries build() {
       com.google.monitoring.v3.TimeSeries result = buildPartial();
       if (!result.isInitialized()) {
@@ -739,7 +723,6 @@ public com.google.monitoring.v3.TimeSeries build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.TimeSeries buildPartial() {
       com.google.monitoring.v3.TimeSeries result = new com.google.monitoring.v3.TimeSeries(this);
       int from_bitField0_ = bitField0_;
@@ -775,39 +758,32 @@ public com.google.monitoring.v3.TimeSeries buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.TimeSeries) {
         return mergeFrom((com.google.monitoring.v3.TimeSeries)other);
@@ -865,12 +841,10 @@ public Builder mergeFrom(com.google.monitoring.v3.TimeSeries other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1437,7 +1411,6 @@ public Builder setMetricKindValue(int value) {
      * .google.api.MetricDescriptor.MetricKind metric_kind = 3;
      */
     public com.google.api.MetricDescriptor.MetricKind getMetricKind() {
-      @SuppressWarnings("deprecation")
       com.google.api.MetricDescriptor.MetricKind result = com.google.api.MetricDescriptor.MetricKind.valueOf(metricKind_);
       return result == null ? com.google.api.MetricDescriptor.MetricKind.UNRECOGNIZED : result;
     }
@@ -1528,7 +1501,6 @@ public Builder setValueTypeValue(int value) {
      * .google.api.MetricDescriptor.ValueType value_type = 4;
      */
     public com.google.api.MetricDescriptor.ValueType getValueType() {
-      @SuppressWarnings("deprecation")
       com.google.api.MetricDescriptor.ValueType result = com.google.api.MetricDescriptor.ValueType.valueOf(valueType_);
       return result == null ? com.google.api.MetricDescriptor.ValueType.UNRECOGNIZED : result;
     }
@@ -1989,13 +1961,11 @@ public com.google.monitoring.v3.Point.Builder addPointsBuilder(
       }
       return pointsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2017,12 +1987,11 @@ public static com.google.monitoring.v3.TimeSeries getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TimeSeries parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TimeSeries(input, extensionRegistry);
+        return new TimeSeries(input, extensionRegistry);
     }
   };
 
@@ -2035,7 +2004,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.TimeSeries getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/TypedValue.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/TypedValue.java
index f323bc1104f4..8753d40e2531 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/TypedValue.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/TypedValue.java
@@ -32,9 +32,6 @@ private TypedValue(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private TypedValue(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             valueCase_ = 1;
             value_ = input.readBool();
@@ -81,13 +85,6 @@ private TypedValue(
             valueCase_ = 5;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -105,7 +102,6 @@ private TypedValue(
     return com.google.monitoring.v3.CommonProto.internal_static_google_monitoring_v3_TypedValue_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.CommonProto.internal_static_google_monitoring_v3_TypedValue_fieldAccessorTable
@@ -294,7 +290,6 @@ public com.google.api.DistributionOrBuilder getDistributionValueOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -304,7 +299,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (valueCase_ == 1) {
@@ -328,7 +322,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -514,7 +507,6 @@ public static com.google.monitoring.v3.TypedValue parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -522,7 +514,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.TypedValue prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -550,7 +541,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.CommonProto.internal_static_google_monitoring_v3_TypedValue_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.CommonProto.internal_static_google_monitoring_v3_TypedValue_fieldAccessorTable
@@ -573,7 +563,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       valueCase_ = 0;
@@ -581,18 +570,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.CommonProto.internal_static_google_monitoring_v3_TypedValue_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.TypedValue getDefaultInstanceForType() {
       return com.google.monitoring.v3.TypedValue.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.TypedValue build() {
       com.google.monitoring.v3.TypedValue result = buildPartial();
       if (!result.isInitialized()) {
@@ -601,7 +587,6 @@ public com.google.monitoring.v3.TypedValue build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.TypedValue buildPartial() {
       com.google.monitoring.v3.TypedValue result = new com.google.monitoring.v3.TypedValue(this);
       if (valueCase_ == 1) {
@@ -628,39 +613,32 @@ public com.google.monitoring.v3.TypedValue buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.TypedValue) {
         return mergeFrom((com.google.monitoring.v3.TypedValue)other);
@@ -704,12 +682,10 @@ public Builder mergeFrom(com.google.monitoring.v3.TypedValue other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1146,13 +1122,11 @@ public com.google.api.DistributionOrBuilder getDistributionValueOrBuilder() {
       onChanged();;
       return distributionValueBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1174,12 +1148,11 @@ public static com.google.monitoring.v3.TypedValue getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TypedValue parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TypedValue(input, extensionRegistry);
+        return new TypedValue(input, extensionRegistry);
     }
   };
 
@@ -1192,7 +1165,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.TypedValue getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateAlertPolicyRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateAlertPolicyRequest.java
index e8878e700b7d..3f02f25bac2d 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateAlertPolicyRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateAlertPolicyRequest.java
@@ -32,9 +32,6 @@ private UpdateAlertPolicyRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private UpdateAlertPolicyRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             com.google.protobuf.FieldMask.Builder subBuilder = null;
             if (updateMask_ != null) {
@@ -72,13 +76,6 @@ private UpdateAlertPolicyRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private UpdateAlertPolicyRequest(
     return com.google.monitoring.v3.AlertServiceProto.internal_static_google_monitoring_v3_UpdateAlertPolicyRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.AlertServiceProto.internal_static_google_monitoring_v3_UpdateAlertPolicyRequest_fieldAccessorTable
@@ -231,7 +227,6 @@ public com.google.monitoring.v3.AlertPolicyOrBuilder getAlertPolicyOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -241,7 +236,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (updateMask_ != null) {
@@ -253,7 +247,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -387,7 +380,6 @@ public static com.google.monitoring.v3.UpdateAlertPolicyRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -395,7 +387,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.UpdateAlertPolicyRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -423,7 +414,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.AlertServiceProto.internal_static_google_monitoring_v3_UpdateAlertPolicyRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.AlertServiceProto.internal_static_google_monitoring_v3_UpdateAlertPolicyRequest_fieldAccessorTable
@@ -446,7 +436,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (updateMaskBuilder_ == null) {
@@ -464,18 +453,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.AlertServiceProto.internal_static_google_monitoring_v3_UpdateAlertPolicyRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.UpdateAlertPolicyRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.UpdateAlertPolicyRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.UpdateAlertPolicyRequest build() {
       com.google.monitoring.v3.UpdateAlertPolicyRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -484,7 +470,6 @@ public com.google.monitoring.v3.UpdateAlertPolicyRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.UpdateAlertPolicyRequest buildPartial() {
       com.google.monitoring.v3.UpdateAlertPolicyRequest result = new com.google.monitoring.v3.UpdateAlertPolicyRequest(this);
       if (updateMaskBuilder_ == null) {
@@ -501,39 +486,32 @@ public com.google.monitoring.v3.UpdateAlertPolicyRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.UpdateAlertPolicyRequest) {
         return mergeFrom((com.google.monitoring.v3.UpdateAlertPolicyRequest)other);
@@ -556,12 +534,10 @@ public Builder mergeFrom(com.google.monitoring.v3.UpdateAlertPolicyRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1065,13 +1041,11 @@ public com.google.monitoring.v3.AlertPolicyOrBuilder getAlertPolicyOrBuilder() {
       }
       return alertPolicyBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1093,12 +1067,11 @@ public static com.google.monitoring.v3.UpdateAlertPolicyRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateAlertPolicyRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateAlertPolicyRequest(input, extensionRegistry);
+        return new UpdateAlertPolicyRequest(input, extensionRegistry);
     }
   };
 
@@ -1111,7 +1084,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.UpdateAlertPolicyRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateGroupRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateGroupRequest.java
index 1194f2011567..89281fa082c4 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateGroupRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateGroupRequest.java
@@ -33,9 +33,6 @@ private UpdateGroupRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private UpdateGroupRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             com.google.monitoring.v3.Group.Builder subBuilder = null;
             if (group_ != null) {
@@ -65,13 +69,6 @@ private UpdateGroupRequest(
             validateOnly_ = input.readBool();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -89,7 +86,6 @@ private UpdateGroupRequest(
     return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_UpdateGroupRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_UpdateGroupRequest_fieldAccessorTable
@@ -147,7 +143,6 @@ public boolean getValidateOnly() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (group_ != null) {
@@ -169,7 +163,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -299,7 +292,6 @@ public static com.google.monitoring.v3.UpdateGroupRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -307,7 +299,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.UpdateGroupRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -335,7 +326,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_UpdateGroupRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_UpdateGroupRequest_fieldAccessorTable
@@ -358,7 +348,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (groupBuilder_ == null) {
@@ -372,18 +361,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.GroupServiceProto.internal_static_google_monitoring_v3_UpdateGroupRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.UpdateGroupRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.UpdateGroupRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.UpdateGroupRequest build() {
       com.google.monitoring.v3.UpdateGroupRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -392,7 +378,6 @@ public com.google.monitoring.v3.UpdateGroupRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.UpdateGroupRequest buildPartial() {
       com.google.monitoring.v3.UpdateGroupRequest result = new com.google.monitoring.v3.UpdateGroupRequest(this);
       if (groupBuilder_ == null) {
@@ -405,39 +390,32 @@ public com.google.monitoring.v3.UpdateGroupRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.UpdateGroupRequest) {
         return mergeFrom((com.google.monitoring.v3.UpdateGroupRequest)other);
@@ -460,12 +438,10 @@ public Builder mergeFrom(com.google.monitoring.v3.UpdateGroupRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -683,13 +659,11 @@ public Builder clearValidateOnly() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -711,12 +685,11 @@ public static com.google.monitoring.v3.UpdateGroupRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateGroupRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateGroupRequest(input, extensionRegistry);
+        return new UpdateGroupRequest(input, extensionRegistry);
     }
   };
 
@@ -729,7 +702,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.UpdateGroupRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateNotificationChannelRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateNotificationChannelRequest.java
index 815f84b61bd2..2b5d6e70da21 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateNotificationChannelRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateNotificationChannelRequest.java
@@ -32,9 +32,6 @@ private UpdateNotificationChannelRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private UpdateNotificationChannelRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             com.google.protobuf.FieldMask.Builder subBuilder = null;
             if (updateMask_ != null) {
@@ -72,13 +76,6 @@ private UpdateNotificationChannelRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private UpdateNotificationChannelRequest(
     return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_UpdateNotificationChannelRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_UpdateNotificationChannelRequest_fieldAccessorTable
@@ -180,7 +176,6 @@ public com.google.monitoring.v3.NotificationChannelOrBuilder getNotificationChan
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -190,7 +185,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (updateMask_ != null) {
@@ -202,7 +196,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -336,7 +329,6 @@ public static com.google.monitoring.v3.UpdateNotificationChannelRequest parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -344,7 +336,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.UpdateNotificationChannelRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -372,7 +363,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_UpdateNotificationChannelRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_UpdateNotificationChannelRequest_fieldAccessorTable
@@ -395,7 +385,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (updateMaskBuilder_ == null) {
@@ -413,18 +402,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_UpdateNotificationChannelRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.UpdateNotificationChannelRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.UpdateNotificationChannelRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.UpdateNotificationChannelRequest build() {
       com.google.monitoring.v3.UpdateNotificationChannelRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -433,7 +419,6 @@ public com.google.monitoring.v3.UpdateNotificationChannelRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.UpdateNotificationChannelRequest buildPartial() {
       com.google.monitoring.v3.UpdateNotificationChannelRequest result = new com.google.monitoring.v3.UpdateNotificationChannelRequest(this);
       if (updateMaskBuilder_ == null) {
@@ -450,39 +435,32 @@ public com.google.monitoring.v3.UpdateNotificationChannelRequest buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.UpdateNotificationChannelRequest) {
         return mergeFrom((com.google.monitoring.v3.UpdateNotificationChannelRequest)other);
@@ -505,12 +483,10 @@ public Builder mergeFrom(com.google.monitoring.v3.UpdateNotificationChannelReque
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -861,13 +837,11 @@ public com.google.monitoring.v3.NotificationChannelOrBuilder getNotificationChan
       }
       return notificationChannelBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -889,12 +863,11 @@ public static com.google.monitoring.v3.UpdateNotificationChannelRequest getDefau
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateNotificationChannelRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateNotificationChannelRequest(input, extensionRegistry);
+        return new UpdateNotificationChannelRequest(input, extensionRegistry);
     }
   };
 
@@ -907,7 +880,6 @@ public com.google.protobuf.Parser getParserFor
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.UpdateNotificationChannelRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateUptimeCheckConfigRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateUptimeCheckConfigRequest.java
index b136140971c8..7fbfcbe52698 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateUptimeCheckConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UpdateUptimeCheckConfigRequest.java
@@ -32,9 +32,6 @@ private UpdateUptimeCheckConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private UpdateUptimeCheckConfigRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             com.google.protobuf.FieldMask.Builder subBuilder = null;
             if (updateMask_ != null) {
@@ -72,13 +76,6 @@ private UpdateUptimeCheckConfigRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private UpdateUptimeCheckConfigRequest(
     return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_UpdateUptimeCheckConfigRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_UpdateUptimeCheckConfigRequest_fieldAccessorTable
@@ -207,7 +203,6 @@ public com.google.monitoring.v3.UptimeCheckConfigOrBuilder getUptimeCheckConfigO
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -217,7 +212,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (updateMask_ != null) {
@@ -229,7 +223,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -363,7 +356,6 @@ public static com.google.monitoring.v3.UpdateUptimeCheckConfigRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -371,7 +363,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.UpdateUptimeCheckConfigRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -399,7 +390,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_UpdateUptimeCheckConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_UpdateUptimeCheckConfigRequest_fieldAccessorTable
@@ -422,7 +412,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (updateMaskBuilder_ == null) {
@@ -440,18 +429,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.UptimeServiceProto.internal_static_google_monitoring_v3_UpdateUptimeCheckConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.UpdateUptimeCheckConfigRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.UpdateUptimeCheckConfigRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.UpdateUptimeCheckConfigRequest build() {
       com.google.monitoring.v3.UpdateUptimeCheckConfigRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -460,7 +446,6 @@ public com.google.monitoring.v3.UpdateUptimeCheckConfigRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.UpdateUptimeCheckConfigRequest buildPartial() {
       com.google.monitoring.v3.UpdateUptimeCheckConfigRequest result = new com.google.monitoring.v3.UpdateUptimeCheckConfigRequest(this);
       if (updateMaskBuilder_ == null) {
@@ -477,39 +462,32 @@ public com.google.monitoring.v3.UpdateUptimeCheckConfigRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.UpdateUptimeCheckConfigRequest) {
         return mergeFrom((com.google.monitoring.v3.UpdateUptimeCheckConfigRequest)other);
@@ -532,12 +510,10 @@ public Builder mergeFrom(com.google.monitoring.v3.UpdateUptimeCheckConfigRequest
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -969,13 +945,11 @@ public com.google.monitoring.v3.UptimeCheckConfigOrBuilder getUptimeCheckConfigO
       }
       return uptimeCheckConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -997,12 +971,11 @@ public static com.google.monitoring.v3.UpdateUptimeCheckConfigRequest getDefault
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateUptimeCheckConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateUptimeCheckConfigRequest(input, extensionRegistry);
+        return new UpdateUptimeCheckConfigRequest(input, extensionRegistry);
     }
   };
 
@@ -1015,7 +988,6 @@ public com.google.protobuf.Parser getParserForTy
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.UpdateUptimeCheckConfigRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeCheckConfig.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeCheckConfig.java
index 661ec9729c13..ab6e6c4b452c 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeCheckConfig.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeCheckConfig.java
@@ -39,9 +39,6 @@ private UptimeCheckConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private UptimeCheckConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -193,13 +197,6 @@ private UptimeCheckConfig(
             isInternal_ = input.readBool();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -226,7 +223,6 @@ private UptimeCheckConfig(
     return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckConfig_fieldAccessorTable
@@ -307,9 +303,6 @@ private ResourceGroup(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -321,6 +314,13 @@ private ResourceGroup(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -333,13 +333,6 @@ private ResourceGroup(
               resourceType_ = rawValue;
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -357,7 +350,6 @@ private ResourceGroup(
       return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckConfig_ResourceGroup_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckConfig_ResourceGroup_fieldAccessorTable
@@ -429,13 +421,11 @@ public int getResourceTypeValue() {
      * .google.monitoring.v3.GroupResourceType resource_type = 2;
      */
     public com.google.monitoring.v3.GroupResourceType getResourceType() {
-      @SuppressWarnings("deprecation")
       com.google.monitoring.v3.GroupResourceType result = com.google.monitoring.v3.GroupResourceType.valueOf(resourceType_);
       return result == null ? com.google.monitoring.v3.GroupResourceType.UNRECOGNIZED : result;
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -445,7 +435,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getGroupIdBytes().isEmpty()) {
@@ -457,7 +446,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -579,7 +567,6 @@ public static com.google.monitoring.v3.UptimeCheckConfig.ResourceGroup parseFrom
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -587,7 +574,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.monitoring.v3.UptimeCheckConfig.ResourceGroup prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -616,7 +602,6 @@ public static final class Builder extends
         return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckConfig_ResourceGroup_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckConfig_ResourceGroup_fieldAccessorTable
@@ -639,7 +624,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         groupId_ = "";
@@ -649,18 +633,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckConfig_ResourceGroup_descriptor;
       }
 
-      @java.lang.Override
       public com.google.monitoring.v3.UptimeCheckConfig.ResourceGroup getDefaultInstanceForType() {
         return com.google.monitoring.v3.UptimeCheckConfig.ResourceGroup.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.monitoring.v3.UptimeCheckConfig.ResourceGroup build() {
         com.google.monitoring.v3.UptimeCheckConfig.ResourceGroup result = buildPartial();
         if (!result.isInitialized()) {
@@ -669,7 +650,6 @@ public com.google.monitoring.v3.UptimeCheckConfig.ResourceGroup build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.monitoring.v3.UptimeCheckConfig.ResourceGroup buildPartial() {
         com.google.monitoring.v3.UptimeCheckConfig.ResourceGroup result = new com.google.monitoring.v3.UptimeCheckConfig.ResourceGroup(this);
         result.groupId_ = groupId_;
@@ -678,39 +658,32 @@ public com.google.monitoring.v3.UptimeCheckConfig.ResourceGroup buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.monitoring.v3.UptimeCheckConfig.ResourceGroup) {
           return mergeFrom((com.google.monitoring.v3.UptimeCheckConfig.ResourceGroup)other);
@@ -734,12 +707,10 @@ public Builder mergeFrom(com.google.monitoring.v3.UptimeCheckConfig.ResourceGrou
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -883,7 +854,6 @@ public Builder setResourceTypeValue(int value) {
        * .google.monitoring.v3.GroupResourceType resource_type = 2;
        */
       public com.google.monitoring.v3.GroupResourceType getResourceType() {
-        @SuppressWarnings("deprecation")
         com.google.monitoring.v3.GroupResourceType result = com.google.monitoring.v3.GroupResourceType.valueOf(resourceType_);
         return result == null ? com.google.monitoring.v3.GroupResourceType.UNRECOGNIZED : result;
       }
@@ -916,13 +886,11 @@ public Builder clearResourceType() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -944,12 +912,11 @@ public static com.google.monitoring.v3.UptimeCheckConfig.ResourceGroup getDefaul
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public ResourceGroup parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ResourceGroup(input, extensionRegistry);
+          return new ResourceGroup(input, extensionRegistry);
       }
     };
 
@@ -962,7 +929,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.UptimeCheckConfig.ResourceGroup getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1179,9 +1145,6 @@ private HttpCheck(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1193,6 +1156,13 @@ private HttpCheck(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 8: {
 
               useSsl_ = input.readBool();
@@ -1240,13 +1210,6 @@ private HttpCheck(
                   headers__.getKey(), headers__.getValue());
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1265,7 +1228,6 @@ private HttpCheck(
     }
 
     @SuppressWarnings({"rawtypes"})
-    @java.lang.Override
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
@@ -1276,7 +1238,6 @@ protected com.google.protobuf.MapField internalGetMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckConfig_HttpCheck_fieldAccessorTable
@@ -1357,9 +1318,6 @@ private BasicAuthentication(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1371,6 +1329,13 @@ private BasicAuthentication(
               case 0:
                 done = true;
                 break;
+              default: {
+                if (!parseUnknownFieldProto3(
+                    input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
               case 10: {
                 java.lang.String s = input.readStringRequireUtf8();
 
@@ -1383,13 +1348,6 @@ private BasicAuthentication(
                 password_ = s;
                 break;
               }
-              default: {
-                if (!parseUnknownFieldProto3(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
             }
           }
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1407,7 +1365,6 @@ private BasicAuthentication(
         return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckConfig_HttpCheck_BasicAuthentication_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckConfig_HttpCheck_BasicAuthentication_fieldAccessorTable
@@ -1500,7 +1457,6 @@ public java.lang.String getPassword() {
       }
 
       private byte memoizedIsInitialized = -1;
-      @java.lang.Override
       public final boolean isInitialized() {
         byte isInitialized = memoizedIsInitialized;
         if (isInitialized == 1) return true;
@@ -1510,7 +1466,6 @@ public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public void writeTo(com.google.protobuf.CodedOutputStream output)
                           throws java.io.IOException {
         if (!getUsernameBytes().isEmpty()) {
@@ -1522,7 +1477,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         unknownFields.writeTo(output);
       }
 
-      @java.lang.Override
       public int getSerializedSize() {
         int size = memoizedSize;
         if (size != -1) return size;
@@ -1644,7 +1598,6 @@ public static com.google.monitoring.v3.UptimeCheckConfig.HttpCheck.BasicAuthenti
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
-      @java.lang.Override
       public Builder newBuilderForType() { return newBuilder(); }
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
@@ -1652,7 +1605,6 @@ public static Builder newBuilder() {
       public static Builder newBuilder(com.google.monitoring.v3.UptimeCheckConfig.HttpCheck.BasicAuthentication prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
-      @java.lang.Override
       public Builder toBuilder() {
         return this == DEFAULT_INSTANCE
             ? new Builder() : new Builder().mergeFrom(this);
@@ -1682,7 +1634,6 @@ public static final class Builder extends
           return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckConfig_HttpCheck_BasicAuthentication_descriptor;
         }
 
-        @java.lang.Override
         protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
           return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckConfig_HttpCheck_BasicAuthentication_fieldAccessorTable
@@ -1705,7 +1656,6 @@ private void maybeForceBuilderInitialization() {
                   .alwaysUseFieldBuilders) {
           }
         }
-        @java.lang.Override
         public Builder clear() {
           super.clear();
           username_ = "";
@@ -1715,18 +1665,15 @@ public Builder clear() {
           return this;
         }
 
-        @java.lang.Override
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
           return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckConfig_HttpCheck_BasicAuthentication_descriptor;
         }
 
-        @java.lang.Override
         public com.google.monitoring.v3.UptimeCheckConfig.HttpCheck.BasicAuthentication getDefaultInstanceForType() {
           return com.google.monitoring.v3.UptimeCheckConfig.HttpCheck.BasicAuthentication.getDefaultInstance();
         }
 
-        @java.lang.Override
         public com.google.monitoring.v3.UptimeCheckConfig.HttpCheck.BasicAuthentication build() {
           com.google.monitoring.v3.UptimeCheckConfig.HttpCheck.BasicAuthentication result = buildPartial();
           if (!result.isInitialized()) {
@@ -1735,7 +1682,6 @@ public com.google.monitoring.v3.UptimeCheckConfig.HttpCheck.BasicAuthentication
           return result;
         }
 
-        @java.lang.Override
         public com.google.monitoring.v3.UptimeCheckConfig.HttpCheck.BasicAuthentication buildPartial() {
           com.google.monitoring.v3.UptimeCheckConfig.HttpCheck.BasicAuthentication result = new com.google.monitoring.v3.UptimeCheckConfig.HttpCheck.BasicAuthentication(this);
           result.username_ = username_;
@@ -1744,39 +1690,32 @@ public com.google.monitoring.v3.UptimeCheckConfig.HttpCheck.BasicAuthentication
           return result;
         }
 
-        @java.lang.Override
         public Builder clone() {
           return (Builder) super.clone();
         }
-        @java.lang.Override
         public Builder setField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.setField(field, value);
         }
-        @java.lang.Override
         public Builder clearField(
             com.google.protobuf.Descriptors.FieldDescriptor field) {
           return (Builder) super.clearField(field);
         }
-        @java.lang.Override
         public Builder clearOneof(
             com.google.protobuf.Descriptors.OneofDescriptor oneof) {
           return (Builder) super.clearOneof(oneof);
         }
-        @java.lang.Override
         public Builder setRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return (Builder) super.setRepeatedField(field, index, value);
         }
-        @java.lang.Override
         public Builder addRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.addRepeatedField(field, value);
         }
-        @java.lang.Override
         public Builder mergeFrom(com.google.protobuf.Message other) {
           if (other instanceof com.google.monitoring.v3.UptimeCheckConfig.HttpCheck.BasicAuthentication) {
             return mergeFrom((com.google.monitoring.v3.UptimeCheckConfig.HttpCheck.BasicAuthentication)other);
@@ -1801,12 +1740,10 @@ public Builder mergeFrom(com.google.monitoring.v3.UptimeCheckConfig.HttpCheck.Ba
           return this;
         }
 
-        @java.lang.Override
         public final boolean isInitialized() {
           return true;
         }
 
-        @java.lang.Override
         public Builder mergeFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2002,13 +1939,11 @@ public Builder setPasswordBytes(
           onChanged();
           return this;
         }
-        @java.lang.Override
         public final Builder setUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.setUnknownFieldsProto3(unknownFields);
         }
 
-        @java.lang.Override
         public final Builder mergeUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
@@ -2030,12 +1965,11 @@ public static com.google.monitoring.v3.UptimeCheckConfig.HttpCheck.BasicAuthenti
 
       private static final com.google.protobuf.Parser
           PARSER = new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
         public BasicAuthentication parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new BasicAuthentication(input, extensionRegistry);
+            return new BasicAuthentication(input, extensionRegistry);
         }
       };
 
@@ -2048,7 +1982,6 @@ public com.google.protobuf.Parser getParserForType() {
         return PARSER;
       }
 
-      @java.lang.Override
       public com.google.monitoring.v3.UptimeCheckConfig.HttpCheck.BasicAuthentication getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
@@ -2305,7 +2238,6 @@ public java.lang.String getHeadersOrThrow(
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -2315,7 +2247,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (useSsl_ != false) {
@@ -2342,7 +2273,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -2512,7 +2442,6 @@ public static com.google.monitoring.v3.UptimeCheckConfig.HttpCheck parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -2520,7 +2449,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.monitoring.v3.UptimeCheckConfig.HttpCheck prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -2570,7 +2498,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
                 "Invalid map field number: " + number);
         }
       }
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckConfig_HttpCheck_fieldAccessorTable
@@ -2593,7 +2520,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         useSsl_ = false;
@@ -2614,18 +2540,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckConfig_HttpCheck_descriptor;
       }
 
-      @java.lang.Override
       public com.google.monitoring.v3.UptimeCheckConfig.HttpCheck getDefaultInstanceForType() {
         return com.google.monitoring.v3.UptimeCheckConfig.HttpCheck.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.monitoring.v3.UptimeCheckConfig.HttpCheck build() {
         com.google.monitoring.v3.UptimeCheckConfig.HttpCheck result = buildPartial();
         if (!result.isInitialized()) {
@@ -2634,7 +2557,6 @@ public com.google.monitoring.v3.UptimeCheckConfig.HttpCheck build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.monitoring.v3.UptimeCheckConfig.HttpCheck buildPartial() {
         com.google.monitoring.v3.UptimeCheckConfig.HttpCheck result = new com.google.monitoring.v3.UptimeCheckConfig.HttpCheck(this);
         int from_bitField0_ = bitField0_;
@@ -2655,39 +2577,32 @@ public com.google.monitoring.v3.UptimeCheckConfig.HttpCheck buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.monitoring.v3.UptimeCheckConfig.HttpCheck) {
           return mergeFrom((com.google.monitoring.v3.UptimeCheckConfig.HttpCheck)other);
@@ -2722,12 +2637,10 @@ public Builder mergeFrom(com.google.monitoring.v3.UptimeCheckConfig.HttpCheck ot
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3342,13 +3255,11 @@ public Builder putAllHeaders(
             .putAll(values);
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -3370,12 +3281,11 @@ public static com.google.monitoring.v3.UptimeCheckConfig.HttpCheck getDefaultIns
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public HttpCheck parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new HttpCheck(input, extensionRegistry);
+          return new HttpCheck(input, extensionRegistry);
       }
     };
 
@@ -3388,7 +3298,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.UptimeCheckConfig.HttpCheck getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -3440,9 +3349,6 @@ private TcpCheck(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3454,11 +3360,6 @@ private TcpCheck(
             case 0:
               done = true;
               break;
-            case 8: {
-
-              port_ = input.readInt32();
-              break;
-            }
             default: {
               if (!parseUnknownFieldProto3(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -3466,6 +3367,11 @@ private TcpCheck(
               }
               break;
             }
+            case 8: {
+
+              port_ = input.readInt32();
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -3483,7 +3389,6 @@ private TcpCheck(
       return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckConfig_TcpCheck_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckConfig_TcpCheck_fieldAccessorTable
@@ -3507,7 +3412,6 @@ public int getPort() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -3517,7 +3421,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (port_ != 0) {
@@ -3526,7 +3429,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -3642,7 +3544,6 @@ public static com.google.monitoring.v3.UptimeCheckConfig.TcpCheck parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -3650,7 +3551,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.monitoring.v3.UptimeCheckConfig.TcpCheck prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -3678,7 +3578,6 @@ public static final class Builder extends
         return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckConfig_TcpCheck_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckConfig_TcpCheck_fieldAccessorTable
@@ -3701,7 +3600,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         port_ = 0;
@@ -3709,18 +3607,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckConfig_TcpCheck_descriptor;
       }
 
-      @java.lang.Override
       public com.google.monitoring.v3.UptimeCheckConfig.TcpCheck getDefaultInstanceForType() {
         return com.google.monitoring.v3.UptimeCheckConfig.TcpCheck.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.monitoring.v3.UptimeCheckConfig.TcpCheck build() {
         com.google.monitoring.v3.UptimeCheckConfig.TcpCheck result = buildPartial();
         if (!result.isInitialized()) {
@@ -3729,7 +3624,6 @@ public com.google.monitoring.v3.UptimeCheckConfig.TcpCheck build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.monitoring.v3.UptimeCheckConfig.TcpCheck buildPartial() {
         com.google.monitoring.v3.UptimeCheckConfig.TcpCheck result = new com.google.monitoring.v3.UptimeCheckConfig.TcpCheck(this);
         result.port_ = port_;
@@ -3737,39 +3631,32 @@ public com.google.monitoring.v3.UptimeCheckConfig.TcpCheck buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.monitoring.v3.UptimeCheckConfig.TcpCheck) {
           return mergeFrom((com.google.monitoring.v3.UptimeCheckConfig.TcpCheck)other);
@@ -3789,12 +3676,10 @@ public Builder mergeFrom(com.google.monitoring.v3.UptimeCheckConfig.TcpCheck oth
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3856,13 +3741,11 @@ public Builder clearPort() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -3884,12 +3767,11 @@ public static com.google.monitoring.v3.UptimeCheckConfig.TcpCheck getDefaultInst
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public TcpCheck parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new TcpCheck(input, extensionRegistry);
+          return new TcpCheck(input, extensionRegistry);
       }
     };
 
@@ -3902,7 +3784,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.UptimeCheckConfig.TcpCheck getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -3963,9 +3844,6 @@ private ContentMatcher(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3977,12 +3855,6 @@ private ContentMatcher(
             case 0:
               done = true;
               break;
-            case 10: {
-              java.lang.String s = input.readStringRequireUtf8();
-
-              content_ = s;
-              break;
-            }
             default: {
               if (!parseUnknownFieldProto3(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -3990,6 +3862,12 @@ private ContentMatcher(
               }
               break;
             }
+            case 10: {
+              java.lang.String s = input.readStringRequireUtf8();
+
+              content_ = s;
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -4007,7 +3885,6 @@ private ContentMatcher(
       return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckConfig_ContentMatcher_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckConfig_ContentMatcher_fieldAccessorTable
@@ -4058,7 +3935,6 @@ public java.lang.String getContent() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -4068,7 +3944,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getContentBytes().isEmpty()) {
@@ -4077,7 +3952,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -4192,7 +4066,6 @@ public static com.google.monitoring.v3.UptimeCheckConfig.ContentMatcher parseFro
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -4200,7 +4073,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.monitoring.v3.UptimeCheckConfig.ContentMatcher prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -4230,7 +4102,6 @@ public static final class Builder extends
         return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckConfig_ContentMatcher_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckConfig_ContentMatcher_fieldAccessorTable
@@ -4253,7 +4124,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         content_ = "";
@@ -4261,18 +4131,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckConfig_ContentMatcher_descriptor;
       }
 
-      @java.lang.Override
       public com.google.monitoring.v3.UptimeCheckConfig.ContentMatcher getDefaultInstanceForType() {
         return com.google.monitoring.v3.UptimeCheckConfig.ContentMatcher.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.monitoring.v3.UptimeCheckConfig.ContentMatcher build() {
         com.google.monitoring.v3.UptimeCheckConfig.ContentMatcher result = buildPartial();
         if (!result.isInitialized()) {
@@ -4281,7 +4148,6 @@ public com.google.monitoring.v3.UptimeCheckConfig.ContentMatcher build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.monitoring.v3.UptimeCheckConfig.ContentMatcher buildPartial() {
         com.google.monitoring.v3.UptimeCheckConfig.ContentMatcher result = new com.google.monitoring.v3.UptimeCheckConfig.ContentMatcher(this);
         result.content_ = content_;
@@ -4289,39 +4155,32 @@ public com.google.monitoring.v3.UptimeCheckConfig.ContentMatcher buildPartial()
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.monitoring.v3.UptimeCheckConfig.ContentMatcher) {
           return mergeFrom((com.google.monitoring.v3.UptimeCheckConfig.ContentMatcher)other);
@@ -4342,12 +4201,10 @@ public Builder mergeFrom(com.google.monitoring.v3.UptimeCheckConfig.ContentMatch
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4454,13 +4311,11 @@ public Builder setContentBytes(
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -4482,12 +4337,11 @@ public static com.google.monitoring.v3.UptimeCheckConfig.ContentMatcher getDefau
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public ContentMatcher parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ContentMatcher(input, extensionRegistry);
+          return new ContentMatcher(input, extensionRegistry);
       }
     };
 
@@ -4500,7 +4354,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.UptimeCheckConfig.ContentMatcher getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -5016,7 +4869,6 @@ public com.google.monitoring.v3.UptimeCheckConfig.ContentMatcherOrBuilder getCon
           new com.google.protobuf.Internal.ListAdapter.Converter<
               java.lang.Integer, com.google.monitoring.v3.UptimeCheckRegion>() {
             public com.google.monitoring.v3.UptimeCheckRegion convert(java.lang.Integer from) {
-              @SuppressWarnings("deprecation")
               com.google.monitoring.v3.UptimeCheckRegion result = com.google.monitoring.v3.UptimeCheckRegion.valueOf(from);
               return result == null ? com.google.monitoring.v3.UptimeCheckRegion.UNRECOGNIZED : result;
             }
@@ -5174,7 +5026,6 @@ public com.google.monitoring.v3.InternalCheckerOrBuilder getInternalCheckersOrBu
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -5184,7 +5035,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     getSerializedSize();
@@ -5231,7 +5081,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -5495,7 +5344,6 @@ public static com.google.monitoring.v3.UptimeCheckConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -5503,7 +5351,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.UptimeCheckConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -5532,7 +5379,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckConfig_fieldAccessorTable
@@ -5557,7 +5403,6 @@ private void maybeForceBuilderInitialization() {
         getInternalCheckersFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -5599,18 +5444,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.UptimeCheckConfig getDefaultInstanceForType() {
       return com.google.monitoring.v3.UptimeCheckConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.UptimeCheckConfig build() {
       com.google.monitoring.v3.UptimeCheckConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -5619,7 +5461,6 @@ public com.google.monitoring.v3.UptimeCheckConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.UptimeCheckConfig buildPartial() {
       com.google.monitoring.v3.UptimeCheckConfig result = new com.google.monitoring.v3.UptimeCheckConfig(this);
       int from_bitField0_ = bitField0_;
@@ -5695,39 +5536,32 @@ public com.google.monitoring.v3.UptimeCheckConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.UptimeCheckConfig) {
         return mergeFrom((com.google.monitoring.v3.UptimeCheckConfig)other);
@@ -5849,12 +5683,10 @@ public Builder mergeFrom(com.google.monitoring.v3.UptimeCheckConfig other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -8197,13 +8029,11 @@ public com.google.monitoring.v3.InternalChecker.Builder addInternalCheckersBuild
       }
       return internalCheckersBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -8225,12 +8055,11 @@ public static com.google.monitoring.v3.UptimeCheckConfig getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UptimeCheckConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UptimeCheckConfig(input, extensionRegistry);
+        return new UptimeCheckConfig(input, extensionRegistry);
     }
   };
 
@@ -8243,7 +8072,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.UptimeCheckConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeCheckIp.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeCheckIp.java
index 708aa594c065..05dc70f28937 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeCheckIp.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeCheckIp.java
@@ -36,9 +36,6 @@ private UptimeCheckIp(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private UptimeCheckIp(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -68,13 +72,6 @@ private UptimeCheckIp(
             ipAddress_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -92,7 +89,6 @@ private UptimeCheckIp(
     return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckIp_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckIp_fieldAccessorTable
@@ -120,7 +116,6 @@ public int getRegionValue() {
    * .google.monitoring.v3.UptimeCheckRegion region = 1;
    */
   public com.google.monitoring.v3.UptimeCheckRegion getRegion() {
-    @SuppressWarnings("deprecation")
     com.google.monitoring.v3.UptimeCheckRegion result = com.google.monitoring.v3.UptimeCheckRegion.valueOf(region_);
     return result == null ? com.google.monitoring.v3.UptimeCheckRegion.UNRECOGNIZED : result;
   }
@@ -222,7 +217,6 @@ public java.lang.String getIpAddress() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -232,7 +226,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (region_ != com.google.monitoring.v3.UptimeCheckRegion.REGION_UNSPECIFIED.getNumber()) {
@@ -247,7 +240,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -376,7 +368,6 @@ public static com.google.monitoring.v3.UptimeCheckIp parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -384,7 +375,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.UptimeCheckIp prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -413,7 +403,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckIp_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckIp_fieldAccessorTable
@@ -436,7 +425,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       region_ = 0;
@@ -448,18 +436,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.UptimeProto.internal_static_google_monitoring_v3_UptimeCheckIp_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.UptimeCheckIp getDefaultInstanceForType() {
       return com.google.monitoring.v3.UptimeCheckIp.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.UptimeCheckIp build() {
       com.google.monitoring.v3.UptimeCheckIp result = buildPartial();
       if (!result.isInitialized()) {
@@ -468,7 +453,6 @@ public com.google.monitoring.v3.UptimeCheckIp build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.UptimeCheckIp buildPartial() {
       com.google.monitoring.v3.UptimeCheckIp result = new com.google.monitoring.v3.UptimeCheckIp(this);
       result.region_ = region_;
@@ -478,39 +462,32 @@ public com.google.monitoring.v3.UptimeCheckIp buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.UptimeCheckIp) {
         return mergeFrom((com.google.monitoring.v3.UptimeCheckIp)other);
@@ -538,12 +515,10 @@ public Builder mergeFrom(com.google.monitoring.v3.UptimeCheckIp other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -593,7 +568,6 @@ public Builder setRegionValue(int value) {
      * .google.monitoring.v3.UptimeCheckRegion region = 1;
      */
     public com.google.monitoring.v3.UptimeCheckRegion getRegion() {
-      @SuppressWarnings("deprecation")
       com.google.monitoring.v3.UptimeCheckRegion result = com.google.monitoring.v3.UptimeCheckRegion.valueOf(region_);
       return result == null ? com.google.monitoring.v3.UptimeCheckRegion.UNRECOGNIZED : result;
     }
@@ -834,13 +808,11 @@ public Builder setIpAddressBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -862,12 +834,11 @@ public static com.google.monitoring.v3.UptimeCheckIp getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UptimeCheckIp parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UptimeCheckIp(input, extensionRegistry);
+        return new UptimeCheckIp(input, extensionRegistry);
     }
   };
 
@@ -880,7 +851,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.UptimeCheckIp getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeProto.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeProto.java
index 07a8dc8133e4..081b143b3633 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeProto.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeProto.java
@@ -77,7 +77,7 @@ public static void registerAllExtensions(
       "(\t\"\301\t\n\021UptimeCheckConfig\022\014\n\004name\030\001 \001(\t\022\024" +
       "\n\014display_name\030\002 \001(\t\022;\n\022monitored_resour" +
       "ce\030\003 \001(\0132\035.google.api.MonitoredResourceH" +
-      "\000\022O\n\016resource_group\030\004 \001(\01325.google.monit" +
+      "\000\022O\n\016resource_group\030\004 \001(\01325.google.monit",
       "oring.v3.UptimeCheckConfig.ResourceGroup" +
       "H\000\022G\n\nhttp_check\030\005 \001(\01321.google.monitori" +
       "ng.v3.UptimeCheckConfig.HttpCheckH\001\022E\n\tt" +
@@ -87,7 +87,7 @@ public static void registerAllExtensions(
       "\030\010 \001(\0132\031.google.protobuf.Duration\022P\n\020con" +
       "tent_matchers\030\t \003(\01326.google.monitoring." +
       "v3.UptimeCheckConfig.ContentMatcher\022A\n\020s" +
-      "elected_regions\030\n \003(\0162\'.google.monitorin" +
+      "elected_regions\030\n \003(\0162\'.google.monitorin",
       "g.v3.UptimeCheckRegion\022\023\n\013is_internal\030\017 " +
       "\001(\010\022@\n\021internal_checkers\030\016 \003(\0132%.google." +
       "monitoring.v3.InternalChecker\032a\n\rResourc" +
@@ -97,7 +97,7 @@ public static void registerAllExtensions(
       "\014\n\004path\030\002 \001(\t\022\014\n\004port\030\003 \001(\005\022X\n\tauth_info" +
       "\030\004 \001(\0132E.google.monitoring.v3.UptimeChec" +
       "kConfig.HttpCheck.BasicAuthentication\022\024\n" +
-      "\014mask_headers\030\005 \001(\010\022O\n\007headers\030\006 \003(\0132>.g" +
+      "\014mask_headers\030\005 \001(\010\022O\n\007headers\030\006 \003(\0132>.g",
       "oogle.monitoring.v3.UptimeCheckConfig.Ht" +
       "tpCheck.HeadersEntry\0329\n\023BasicAuthenticat" +
       "ion\022\020\n\010username\030\001 \001(\t\022\020\n\010password\030\002 \001(\t\032" +
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "B\024\n\022check_request_type\"n\n\rUptimeCheckIp\022" +
       "7\n\006region\030\001 \001(\0162\'.google.monitoring.v3.U" +
       "ptimeCheckRegion\022\020\n\010location\030\002 \001(\t\022\022\n\nip" +
-      "_address\030\003 \001(\t*e\n\021UptimeCheckRegion\022\026\n\022R" +
+      "_address\030\003 \001(\t*e\n\021UptimeCheckRegion\022\026\n\022R",
       "EGION_UNSPECIFIED\020\000\022\007\n\003USA\020\001\022\n\n\006EUROPE\020\002" +
       "\022\021\n\rSOUTH_AMERICA\020\003\022\020\n\014ASIA_PACIFIC\020\004*[\n" +
       "\021GroupResourceType\022\035\n\031RESOURCE_TYPE_UNSP" +
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeServiceProto.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeServiceProto.java
index 5874a296e9cf..cb87ca5b78c2 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/UptimeServiceProto.java
@@ -72,7 +72,7 @@ public static void registerAllExtensions(
       "(\t\022\021\n\tpage_size\030\003 \001(\005\022\022\n\npage_token\030\004 \001(" +
       "\t\"\224\001\n\036ListUptimeCheckConfigsResponse\022E\n\024" +
       "uptime_check_configs\030\001 \003(\0132\'.google.moni" +
-      "toring.v3.UptimeCheckConfig\022\027\n\017next_page" +
+      "toring.v3.UptimeCheckConfig\022\027\n\017next_page",
       "_token\030\002 \001(\t\022\022\n\ntotal_size\030\003 \001(\005\"+\n\033GetU" +
       "ptimeCheckConfigRequest\022\014\n\004name\030\001 \001(\t\"v\n" +
       "\036CreateUptimeCheckConfigRequest\022\016\n\006paren" +
@@ -82,7 +82,7 @@ public static void registerAllExtensions(
       "te_mask\030\002 \001(\0132\032.google.protobuf.FieldMas" +
       "k\022D\n\023uptime_check_config\030\003 \001(\0132\'.google." +
       "monitoring.v3.UptimeCheckConfig\".\n\036Delet" +
-      "eUptimeCheckConfigRequest\022\014\n\004name\030\001 \001(\t\"" +
+      "eUptimeCheckConfigRequest\022\014\n\004name\030\001 \001(\t\"",
       "B\n\031ListUptimeCheckIpsRequest\022\021\n\tpage_siz" +
       "e\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\"t\n\032ListUptim" +
       "eCheckIpsResponse\022=\n\020uptime_check_ips\030\001 " +
@@ -92,7 +92,7 @@ public static void registerAllExtensions(
       "ogle.monitoring.v3.ListUptimeCheckConfig" +
       "sRequest\0324.google.monitoring.v3.ListUpti" +
       "meCheckConfigsResponse\"2\202\323\344\223\002,\022*/v3/{par" +
-      "ent=projects/*}/uptimeCheckConfigs\022\246\001\n\024G" +
+      "ent=projects/*}/uptimeCheckConfigs\022\246\001\n\024G",
       "etUptimeCheckConfig\0221.google.monitoring." +
       "v3.GetUptimeCheckConfigRequest\032\'.google." +
       "monitoring.v3.UptimeCheckConfig\"2\202\323\344\223\002,\022" +
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "quest\032\'.google.monitoring.v3.UptimeCheck" +
       "Config\"G\202\323\344\223\002A\"*/v3/{parent=projects/*}/" +
       "uptimeCheckConfigs:\023uptime_check_config\022" +
-      "\325\001\n\027UpdateUptimeCheckConfig\0224.google.mon" +
+      "\325\001\n\027UpdateUptimeCheckConfig\0224.google.mon",
       "itoring.v3.UpdateUptimeCheckConfigReques" +
       "t\032\'.google.monitoring.v3.UptimeCheckConf" +
       "ig\"[\202\323\344\223\002U2>/v3/{uptime_check_config.nam" +
@@ -112,7 +112,7 @@ public static void registerAllExtensions(
       "heckConfigRequest\032\026.google.protobuf.Empt" +
       "y\"2\202\323\344\223\002,**/v3/{name=projects/*/uptimeCh" +
       "eckConfigs/*}\022\223\001\n\022ListUptimeCheckIps\022/.g" +
-      "oogle.monitoring.v3.ListUptimeCheckIpsRe" +
+      "oogle.monitoring.v3.ListUptimeCheckIpsRe",
       "quest\0320.google.monitoring.v3.ListUptimeC" +
       "heckIpsResponse\"\032\202\323\344\223\002\024\022\022/v3/uptimeCheck" +
       "IpsB\252\001\n\030com.google.monitoring.v3B\022Uptime" +
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/VerifyNotificationChannelRequest.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/VerifyNotificationChannelRequest.java
index 4cd7a1c2b9d4..1014012d646a 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/VerifyNotificationChannelRequest.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/com/google/monitoring/v3/VerifyNotificationChannelRequest.java
@@ -34,9 +34,6 @@ private VerifyNotificationChannelRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private VerifyNotificationChannelRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private VerifyNotificationChannelRequest(
             code_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private VerifyNotificationChannelRequest(
     return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_VerifyNotificationChannelRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_VerifyNotificationChannelRequest_fieldAccessorTable
@@ -189,7 +185,6 @@ public java.lang.String getCode() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -199,7 +194,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -211,7 +205,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -333,7 +326,6 @@ public static com.google.monitoring.v3.VerifyNotificationChannelRequest parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -341,7 +333,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.monitoring.v3.VerifyNotificationChannelRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -369,7 +360,6 @@ public static final class Builder extends
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_VerifyNotificationChannelRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_VerifyNotificationChannelRequest_fieldAccessorTable
@@ -392,7 +382,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -402,18 +391,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.monitoring.v3.NotificationServiceProto.internal_static_google_monitoring_v3_VerifyNotificationChannelRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.VerifyNotificationChannelRequest getDefaultInstanceForType() {
       return com.google.monitoring.v3.VerifyNotificationChannelRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.VerifyNotificationChannelRequest build() {
       com.google.monitoring.v3.VerifyNotificationChannelRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -422,7 +408,6 @@ public com.google.monitoring.v3.VerifyNotificationChannelRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.monitoring.v3.VerifyNotificationChannelRequest buildPartial() {
       com.google.monitoring.v3.VerifyNotificationChannelRequest result = new com.google.monitoring.v3.VerifyNotificationChannelRequest(this);
       result.name_ = name_;
@@ -431,39 +416,32 @@ public com.google.monitoring.v3.VerifyNotificationChannelRequest buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.monitoring.v3.VerifyNotificationChannelRequest) {
         return mergeFrom((com.google.monitoring.v3.VerifyNotificationChannelRequest)other);
@@ -488,12 +466,10 @@ public Builder mergeFrom(com.google.monitoring.v3.VerifyNotificationChannelReque
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -719,13 +695,11 @@ public Builder setCodeBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -747,12 +721,11 @@ public static com.google.monitoring.v3.VerifyNotificationChannelRequest getDefau
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public VerifyNotificationChannelRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VerifyNotificationChannelRequest(input, extensionRegistry);
+        return new VerifyNotificationChannelRequest(input, extensionRegistry);
     }
   };
 
@@ -765,7 +738,6 @@ public com.google.protobuf.Parser getParserFor
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.monitoring.v3.VerifyNotificationChannelRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/google/monitoring/v3/DroppedLabelsOuterClass.java b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/google/monitoring/v3/DroppedLabelsOuterClass.java
index e838017d30c4..d42553485384 100644
--- a/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/google/monitoring/v3/DroppedLabelsOuterClass.java
+++ b/google-api-grpc/proto-google-cloud-monitoring-v3/src/main/java/google/monitoring/v3/DroppedLabelsOuterClass.java
@@ -113,9 +113,6 @@ private DroppedLabels(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -127,6 +124,13 @@ private DroppedLabels(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
                 label_ = com.google.protobuf.MapField.newMapField(
@@ -140,13 +144,6 @@ private DroppedLabels(
                   label__.getKey(), label__.getValue());
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -165,7 +162,6 @@ private DroppedLabels(
     }
 
     @SuppressWarnings({"rawtypes"})
-    @java.lang.Override
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
@@ -176,7 +172,6 @@ protected com.google.protobuf.MapField internalGetMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return google.monitoring.v3.DroppedLabelsOuterClass.internal_static_google_monitoring_v3_DroppedLabels_fieldAccessorTable
@@ -277,7 +272,6 @@ public java.lang.String getLabelOrThrow(
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -287,7 +281,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       com.google.protobuf.GeneratedMessageV3
@@ -299,7 +292,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -423,7 +415,6 @@ public static google.monitoring.v3.DroppedLabelsOuterClass.DroppedLabels parseFr
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -431,7 +422,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(google.monitoring.v3.DroppedLabelsOuterClass.DroppedLabels prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -493,7 +483,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
                 "Invalid map field number: " + number);
         }
       }
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return google.monitoring.v3.DroppedLabelsOuterClass.internal_static_google_monitoring_v3_DroppedLabels_fieldAccessorTable
@@ -516,25 +505,21 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         internalGetMutableLabel().clear();
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return google.monitoring.v3.DroppedLabelsOuterClass.internal_static_google_monitoring_v3_DroppedLabels_descriptor;
       }
 
-      @java.lang.Override
       public google.monitoring.v3.DroppedLabelsOuterClass.DroppedLabels getDefaultInstanceForType() {
         return google.monitoring.v3.DroppedLabelsOuterClass.DroppedLabels.getDefaultInstance();
       }
 
-      @java.lang.Override
       public google.monitoring.v3.DroppedLabelsOuterClass.DroppedLabels build() {
         google.monitoring.v3.DroppedLabelsOuterClass.DroppedLabels result = buildPartial();
         if (!result.isInitialized()) {
@@ -543,7 +528,6 @@ public google.monitoring.v3.DroppedLabelsOuterClass.DroppedLabels build() {
         return result;
       }
 
-      @java.lang.Override
       public google.monitoring.v3.DroppedLabelsOuterClass.DroppedLabels buildPartial() {
         google.monitoring.v3.DroppedLabelsOuterClass.DroppedLabels result = new google.monitoring.v3.DroppedLabelsOuterClass.DroppedLabels(this);
         int from_bitField0_ = bitField0_;
@@ -553,39 +537,32 @@ public google.monitoring.v3.DroppedLabelsOuterClass.DroppedLabels buildPartial()
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof google.monitoring.v3.DroppedLabelsOuterClass.DroppedLabels) {
           return mergeFrom((google.monitoring.v3.DroppedLabelsOuterClass.DroppedLabels)other);
@@ -604,12 +581,10 @@ public Builder mergeFrom(google.monitoring.v3.DroppedLabelsOuterClass.DroppedLab
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -779,13 +754,11 @@ public Builder putAllLabel(
             .putAll(values);
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -807,12 +780,11 @@ public static google.monitoring.v3.DroppedLabelsOuterClass.DroppedLabels getDefa
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public DroppedLabels parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new DroppedLabels(input, extensionRegistry);
+          return new DroppedLabels(input, extensionRegistry);
       }
     };
 
@@ -825,7 +797,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public google.monitoring.v3.DroppedLabelsOuterClass.DroppedLabels getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/common/OsLoginProto.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/common/OsLoginProto.java
index a7d0a482bc6f..0e26f9be2732 100644
--- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/common/OsLoginProto.java
+++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/common/OsLoginProto.java
@@ -193,9 +193,6 @@ private PosixAccount(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -207,6 +204,13 @@ private PosixAccount(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 8: {
 
               primary_ = input.readBool();
@@ -258,13 +262,6 @@ private PosixAccount(
               accountId_ = s;
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -282,7 +279,6 @@ private PosixAccount(
       return com.google.cloud.oslogin.common.OsLoginProto.internal_static_google_cloud_oslogin_common_PosixAccount_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.oslogin.common.OsLoginProto.internal_static_google_cloud_oslogin_common_PosixAccount_fieldAccessorTable
@@ -584,7 +580,6 @@ public java.lang.String getAccountId() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -594,7 +589,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (primary_ != false) {
@@ -627,7 +621,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -804,7 +797,6 @@ public static com.google.cloud.oslogin.common.OsLoginProto.PosixAccount parseFro
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -812,7 +804,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.oslogin.common.OsLoginProto.PosixAccount prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -840,7 +831,6 @@ public static final class Builder extends
         return com.google.cloud.oslogin.common.OsLoginProto.internal_static_google_cloud_oslogin_common_PosixAccount_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.oslogin.common.OsLoginProto.internal_static_google_cloud_oslogin_common_PosixAccount_fieldAccessorTable
@@ -863,7 +853,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         primary_ = false;
@@ -887,18 +876,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.oslogin.common.OsLoginProto.internal_static_google_cloud_oslogin_common_PosixAccount_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.oslogin.common.OsLoginProto.PosixAccount getDefaultInstanceForType() {
         return com.google.cloud.oslogin.common.OsLoginProto.PosixAccount.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.oslogin.common.OsLoginProto.PosixAccount build() {
         com.google.cloud.oslogin.common.OsLoginProto.PosixAccount result = buildPartial();
         if (!result.isInitialized()) {
@@ -907,7 +893,6 @@ public com.google.cloud.oslogin.common.OsLoginProto.PosixAccount build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.oslogin.common.OsLoginProto.PosixAccount buildPartial() {
         com.google.cloud.oslogin.common.OsLoginProto.PosixAccount result = new com.google.cloud.oslogin.common.OsLoginProto.PosixAccount(this);
         result.primary_ = primary_;
@@ -923,39 +908,32 @@ public com.google.cloud.oslogin.common.OsLoginProto.PosixAccount buildPartial()
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.oslogin.common.OsLoginProto.PosixAccount) {
           return mergeFrom((com.google.cloud.oslogin.common.OsLoginProto.PosixAccount)other);
@@ -1005,12 +983,10 @@ public Builder mergeFrom(com.google.cloud.oslogin.common.OsLoginProto.PosixAccou
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1681,13 +1657,11 @@ public Builder setAccountIdBytes(
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1709,12 +1683,11 @@ public static com.google.cloud.oslogin.common.OsLoginProto.PosixAccount getDefau
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public PosixAccount parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new PosixAccount(input, extensionRegistry);
+          return new PosixAccount(input, extensionRegistry);
       }
     };
 
@@ -1727,7 +1700,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.oslogin.common.OsLoginProto.PosixAccount getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1819,9 +1791,6 @@ private SshPublicKey(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1833,6 +1802,13 @@ private SshPublicKey(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -1850,13 +1826,6 @@ private SshPublicKey(
               fingerprint_ = s;
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1874,7 +1843,6 @@ private SshPublicKey(
       return com.google.cloud.oslogin.common.OsLoginProto.internal_static_google_cloud_oslogin_common_SshPublicKey_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.oslogin.common.OsLoginProto.internal_static_google_cloud_oslogin_common_SshPublicKey_fieldAccessorTable
@@ -1984,7 +1952,6 @@ public java.lang.String getFingerprint() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1994,7 +1961,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getKeyBytes().isEmpty()) {
@@ -2009,7 +1975,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -2140,7 +2105,6 @@ public static com.google.cloud.oslogin.common.OsLoginProto.SshPublicKey parseFro
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -2148,7 +2112,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.oslogin.common.OsLoginProto.SshPublicKey prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -2176,7 +2139,6 @@ public static final class Builder extends
         return com.google.cloud.oslogin.common.OsLoginProto.internal_static_google_cloud_oslogin_common_SshPublicKey_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.oslogin.common.OsLoginProto.internal_static_google_cloud_oslogin_common_SshPublicKey_fieldAccessorTable
@@ -2199,7 +2161,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         key_ = "";
@@ -2211,18 +2172,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.oslogin.common.OsLoginProto.internal_static_google_cloud_oslogin_common_SshPublicKey_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.oslogin.common.OsLoginProto.SshPublicKey getDefaultInstanceForType() {
         return com.google.cloud.oslogin.common.OsLoginProto.SshPublicKey.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.oslogin.common.OsLoginProto.SshPublicKey build() {
         com.google.cloud.oslogin.common.OsLoginProto.SshPublicKey result = buildPartial();
         if (!result.isInitialized()) {
@@ -2231,7 +2189,6 @@ public com.google.cloud.oslogin.common.OsLoginProto.SshPublicKey build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.oslogin.common.OsLoginProto.SshPublicKey buildPartial() {
         com.google.cloud.oslogin.common.OsLoginProto.SshPublicKey result = new com.google.cloud.oslogin.common.OsLoginProto.SshPublicKey(this);
         result.key_ = key_;
@@ -2241,39 +2198,32 @@ public com.google.cloud.oslogin.common.OsLoginProto.SshPublicKey buildPartial()
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.oslogin.common.OsLoginProto.SshPublicKey) {
           return mergeFrom((com.google.cloud.oslogin.common.OsLoginProto.SshPublicKey)other);
@@ -2301,12 +2251,10 @@ public Builder mergeFrom(com.google.cloud.oslogin.common.OsLoginProto.SshPublicK
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2550,13 +2498,11 @@ public Builder setFingerprintBytes(
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -2578,12 +2524,11 @@ public static com.google.cloud.oslogin.common.OsLoginProto.SshPublicKey getDefau
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public SshPublicKey parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new SshPublicKey(input, extensionRegistry);
+          return new SshPublicKey(input, extensionRegistry);
       }
     };
 
@@ -2596,7 +2541,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.oslogin.common.OsLoginProto.SshPublicKey getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -2631,7 +2575,7 @@ public com.google.cloud.oslogin.common.OsLoginProto.SshPublicKey getDefaultInsta
       "tem_id\030\010 \001(\t\022\022\n\naccount_id\030\t \001(\t\"N\n\014SshP" +
       "ublicKey\022\013\n\003key\030\001 \001(\t\022\034\n\024expiration_time" +
       "_usec\030\002 \001(\003\022\023\n\013fingerprint\030\003 \001(\tB\256\001\n\037com" +
-      ".google.cloud.oslogin.commonB\014OsLoginPro" +
+      ".google.cloud.oslogin.commonB\014OsLoginPro",
       "toZAgoogle.golang.org/genproto/googleapi" +
       "s/cloud/oslogin/common;common\252\002\033Google.C" +
       "loud.OsLogin.Common\312\002\033Google\\Cloud\\OsLog" +
diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/DeletePosixAccountRequest.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/DeletePosixAccountRequest.java
index fa8487d0527d..f6516c88072a 100644
--- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/DeletePosixAccountRequest.java
+++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/DeletePosixAccountRequest.java
@@ -33,9 +33,6 @@ private DeletePosixAccountRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeletePosixAccountRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeletePosixAccountRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeletePosixAccountRequest(
     return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_DeletePosixAccountRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_DeletePosixAccountRequest_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.oslogin.v1.DeletePosixAccountRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.oslogin.v1.DeletePosixAccountRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_DeletePosixAccountRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_DeletePosixAccountRequest_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_DeletePosixAccountRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.oslogin.v1.DeletePosixAccountRequest getDefaultInstanceForType() {
       return com.google.cloud.oslogin.v1.DeletePosixAccountRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.oslogin.v1.DeletePosixAccountRequest build() {
       com.google.cloud.oslogin.v1.DeletePosixAccountRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.oslogin.v1.DeletePosixAccountRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.oslogin.v1.DeletePosixAccountRequest buildPartial() {
       com.google.cloud.oslogin.v1.DeletePosixAccountRequest result = new com.google.cloud.oslogin.v1.DeletePosixAccountRequest(this);
       result.name_ = name_;
@@ -361,39 +346,32 @@ public com.google.cloud.oslogin.v1.DeletePosixAccountRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.oslogin.v1.DeletePosixAccountRequest) {
         return mergeFrom((com.google.cloud.oslogin.v1.DeletePosixAccountRequest)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.oslogin.v1.DeletePosixAccountRequest o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.oslogin.v1.DeletePosixAccountRequest getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeletePosixAccountRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeletePosixAccountRequest(input, extensionRegistry);
+        return new DeletePosixAccountRequest(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.oslogin.v1.DeletePosixAccountRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/DeleteSshPublicKeyRequest.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/DeleteSshPublicKeyRequest.java
index f3c813dbf9d2..bb6d79e584be 100644
--- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/DeleteSshPublicKeyRequest.java
+++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/DeleteSshPublicKeyRequest.java
@@ -33,9 +33,6 @@ private DeleteSshPublicKeyRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteSshPublicKeyRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteSshPublicKeyRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteSshPublicKeyRequest(
     return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_DeleteSshPublicKeyRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_DeleteSshPublicKeyRequest_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.oslogin.v1.DeleteSshPublicKeyRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.oslogin.v1.DeleteSshPublicKeyRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_DeleteSshPublicKeyRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_DeleteSshPublicKeyRequest_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_DeleteSshPublicKeyRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.oslogin.v1.DeleteSshPublicKeyRequest getDefaultInstanceForType() {
       return com.google.cloud.oslogin.v1.DeleteSshPublicKeyRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.oslogin.v1.DeleteSshPublicKeyRequest build() {
       com.google.cloud.oslogin.v1.DeleteSshPublicKeyRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.oslogin.v1.DeleteSshPublicKeyRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.oslogin.v1.DeleteSshPublicKeyRequest buildPartial() {
       com.google.cloud.oslogin.v1.DeleteSshPublicKeyRequest result = new com.google.cloud.oslogin.v1.DeleteSshPublicKeyRequest(this);
       result.name_ = name_;
@@ -361,39 +346,32 @@ public com.google.cloud.oslogin.v1.DeleteSshPublicKeyRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.oslogin.v1.DeleteSshPublicKeyRequest) {
         return mergeFrom((com.google.cloud.oslogin.v1.DeleteSshPublicKeyRequest)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.oslogin.v1.DeleteSshPublicKeyRequest o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.oslogin.v1.DeleteSshPublicKeyRequest getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteSshPublicKeyRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteSshPublicKeyRequest(input, extensionRegistry);
+        return new DeleteSshPublicKeyRequest(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.oslogin.v1.DeleteSshPublicKeyRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/GetLoginProfileRequest.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/GetLoginProfileRequest.java
index f10b19063767..fe2429499d0d 100644
--- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/GetLoginProfileRequest.java
+++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/GetLoginProfileRequest.java
@@ -33,9 +33,6 @@ private GetLoginProfileRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetLoginProfileRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetLoginProfileRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetLoginProfileRequest(
     return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_GetLoginProfileRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_GetLoginProfileRequest_fieldAccessorTable
@@ -128,7 +124,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -138,7 +133,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -147,7 +141,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -262,7 +255,6 @@ public static com.google.cloud.oslogin.v1.GetLoginProfileRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -270,7 +262,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.oslogin.v1.GetLoginProfileRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -298,7 +289,6 @@ public static final class Builder extends
       return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_GetLoginProfileRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_GetLoginProfileRequest_fieldAccessorTable
@@ -321,7 +311,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -329,18 +318,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_GetLoginProfileRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.oslogin.v1.GetLoginProfileRequest getDefaultInstanceForType() {
       return com.google.cloud.oslogin.v1.GetLoginProfileRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.oslogin.v1.GetLoginProfileRequest build() {
       com.google.cloud.oslogin.v1.GetLoginProfileRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -349,7 +335,6 @@ public com.google.cloud.oslogin.v1.GetLoginProfileRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.oslogin.v1.GetLoginProfileRequest buildPartial() {
       com.google.cloud.oslogin.v1.GetLoginProfileRequest result = new com.google.cloud.oslogin.v1.GetLoginProfileRequest(this);
       result.name_ = name_;
@@ -357,39 +342,32 @@ public com.google.cloud.oslogin.v1.GetLoginProfileRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.oslogin.v1.GetLoginProfileRequest) {
         return mergeFrom((com.google.cloud.oslogin.v1.GetLoginProfileRequest)other);
@@ -410,12 +388,10 @@ public Builder mergeFrom(com.google.cloud.oslogin.v1.GetLoginProfileRequest othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -522,13 +498,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -550,12 +524,11 @@ public static com.google.cloud.oslogin.v1.GetLoginProfileRequest getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetLoginProfileRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetLoginProfileRequest(input, extensionRegistry);
+        return new GetLoginProfileRequest(input, extensionRegistry);
     }
   };
 
@@ -568,7 +541,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.oslogin.v1.GetLoginProfileRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/GetSshPublicKeyRequest.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/GetSshPublicKeyRequest.java
index 0c25d3b31a2f..5ac8b51a37fe 100644
--- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/GetSshPublicKeyRequest.java
+++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/GetSshPublicKeyRequest.java
@@ -33,9 +33,6 @@ private GetSshPublicKeyRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetSshPublicKeyRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetSshPublicKeyRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetSshPublicKeyRequest(
     return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_GetSshPublicKeyRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_GetSshPublicKeyRequest_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.oslogin.v1.GetSshPublicKeyRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.oslogin.v1.GetSshPublicKeyRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_GetSshPublicKeyRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_GetSshPublicKeyRequest_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_GetSshPublicKeyRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.oslogin.v1.GetSshPublicKeyRequest getDefaultInstanceForType() {
       return com.google.cloud.oslogin.v1.GetSshPublicKeyRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.oslogin.v1.GetSshPublicKeyRequest build() {
       com.google.cloud.oslogin.v1.GetSshPublicKeyRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.oslogin.v1.GetSshPublicKeyRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.oslogin.v1.GetSshPublicKeyRequest buildPartial() {
       com.google.cloud.oslogin.v1.GetSshPublicKeyRequest result = new com.google.cloud.oslogin.v1.GetSshPublicKeyRequest(this);
       result.name_ = name_;
@@ -361,39 +346,32 @@ public com.google.cloud.oslogin.v1.GetSshPublicKeyRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.oslogin.v1.GetSshPublicKeyRequest) {
         return mergeFrom((com.google.cloud.oslogin.v1.GetSshPublicKeyRequest)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.oslogin.v1.GetSshPublicKeyRequest othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.oslogin.v1.GetSshPublicKeyRequest getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetSshPublicKeyRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetSshPublicKeyRequest(input, extensionRegistry);
+        return new GetSshPublicKeyRequest(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.oslogin.v1.GetSshPublicKeyRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/ImportSshPublicKeyRequest.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/ImportSshPublicKeyRequest.java
index 9fbd1ef073bb..484de37d27a1 100644
--- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/ImportSshPublicKeyRequest.java
+++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/ImportSshPublicKeyRequest.java
@@ -34,9 +34,6 @@ private ImportSshPublicKeyRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ImportSshPublicKeyRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private ImportSshPublicKeyRequest(
             projectId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private ImportSshPublicKeyRequest(
     return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_ImportSshPublicKeyRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_ImportSshPublicKeyRequest_fieldAccessorTable
@@ -223,7 +219,6 @@ public java.lang.String getProjectId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -233,7 +228,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -248,7 +242,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -383,7 +376,6 @@ public static com.google.cloud.oslogin.v1.ImportSshPublicKeyRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -391,7 +383,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.oslogin.v1.ImportSshPublicKeyRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -419,7 +410,6 @@ public static final class Builder extends
       return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_ImportSshPublicKeyRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_ImportSshPublicKeyRequest_fieldAccessorTable
@@ -442,7 +432,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -458,18 +447,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_ImportSshPublicKeyRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.oslogin.v1.ImportSshPublicKeyRequest getDefaultInstanceForType() {
       return com.google.cloud.oslogin.v1.ImportSshPublicKeyRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.oslogin.v1.ImportSshPublicKeyRequest build() {
       com.google.cloud.oslogin.v1.ImportSshPublicKeyRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -478,7 +464,6 @@ public com.google.cloud.oslogin.v1.ImportSshPublicKeyRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.oslogin.v1.ImportSshPublicKeyRequest buildPartial() {
       com.google.cloud.oslogin.v1.ImportSshPublicKeyRequest result = new com.google.cloud.oslogin.v1.ImportSshPublicKeyRequest(this);
       result.parent_ = parent_;
@@ -492,39 +477,32 @@ public com.google.cloud.oslogin.v1.ImportSshPublicKeyRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.oslogin.v1.ImportSshPublicKeyRequest) {
         return mergeFrom((com.google.cloud.oslogin.v1.ImportSshPublicKeyRequest)other);
@@ -552,12 +530,10 @@ public Builder mergeFrom(com.google.cloud.oslogin.v1.ImportSshPublicKeyRequest o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -906,13 +882,11 @@ public Builder setProjectIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -934,12 +908,11 @@ public static com.google.cloud.oslogin.v1.ImportSshPublicKeyRequest getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ImportSshPublicKeyRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImportSshPublicKeyRequest(input, extensionRegistry);
+        return new ImportSshPublicKeyRequest(input, extensionRegistry);
     }
   };
 
@@ -952,7 +925,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.oslogin.v1.ImportSshPublicKeyRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/ImportSshPublicKeyResponse.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/ImportSshPublicKeyResponse.java
index a05db5158de7..90b79c168b06 100644
--- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/ImportSshPublicKeyResponse.java
+++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/ImportSshPublicKeyResponse.java
@@ -32,9 +32,6 @@ private ImportSshPublicKeyResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private ImportSshPublicKeyResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.oslogin.v1.LoginProfile.Builder subBuilder = null;
             if (loginProfile_ != null) {
@@ -59,13 +63,6 @@ private ImportSshPublicKeyResponse(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private ImportSshPublicKeyResponse(
     return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_ImportSshPublicKeyResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_ImportSshPublicKeyResponse_fieldAccessorTable
@@ -125,7 +121,6 @@ public com.google.cloud.oslogin.v1.LoginProfileOrBuilder getLoginProfileOrBuilde
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -135,7 +130,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (loginProfile_ != null) {
@@ -144,7 +138,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static com.google.cloud.oslogin.v1.ImportSshPublicKeyResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.oslogin.v1.ImportSshPublicKeyResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_ImportSshPublicKeyResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_ImportSshPublicKeyResponse_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (loginProfileBuilder_ == null) {
@@ -336,18 +325,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_ImportSshPublicKeyResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.oslogin.v1.ImportSshPublicKeyResponse getDefaultInstanceForType() {
       return com.google.cloud.oslogin.v1.ImportSshPublicKeyResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.oslogin.v1.ImportSshPublicKeyResponse build() {
       com.google.cloud.oslogin.v1.ImportSshPublicKeyResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -356,7 +342,6 @@ public com.google.cloud.oslogin.v1.ImportSshPublicKeyResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.oslogin.v1.ImportSshPublicKeyResponse buildPartial() {
       com.google.cloud.oslogin.v1.ImportSshPublicKeyResponse result = new com.google.cloud.oslogin.v1.ImportSshPublicKeyResponse(this);
       if (loginProfileBuilder_ == null) {
@@ -368,39 +353,32 @@ public com.google.cloud.oslogin.v1.ImportSshPublicKeyResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.oslogin.v1.ImportSshPublicKeyResponse) {
         return mergeFrom((com.google.cloud.oslogin.v1.ImportSshPublicKeyResponse)other);
@@ -420,12 +398,10 @@ public Builder mergeFrom(com.google.cloud.oslogin.v1.ImportSshPublicKeyResponse
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -596,13 +572,11 @@ public com.google.cloud.oslogin.v1.LoginProfileOrBuilder getLoginProfileOrBuilde
       }
       return loginProfileBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -624,12 +598,11 @@ public static com.google.cloud.oslogin.v1.ImportSshPublicKeyResponse getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ImportSshPublicKeyResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImportSshPublicKeyResponse(input, extensionRegistry);
+        return new ImportSshPublicKeyResponse(input, extensionRegistry);
     }
   };
 
@@ -642,7 +615,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.oslogin.v1.ImportSshPublicKeyResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/LoginProfile.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/LoginProfile.java
index 5b5abe70f1b0..8170a8c90ccd 100644
--- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/LoginProfile.java
+++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/LoginProfile.java
@@ -36,9 +36,6 @@ private LoginProfile(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private LoginProfile(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -83,13 +87,6 @@ private LoginProfile(
             suspended_ = input.readBool();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -111,7 +108,6 @@ private LoginProfile(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -122,7 +118,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_LoginProfile_fieldAccessorTable
@@ -335,7 +330,6 @@ public boolean getSuspended() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -345,7 +339,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -366,7 +359,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -516,7 +508,6 @@ public static com.google.cloud.oslogin.v1.LoginProfile parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -524,7 +515,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.oslogin.v1.LoginProfile prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -575,7 +565,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_LoginProfile_fieldAccessorTable
@@ -599,7 +588,6 @@ private void maybeForceBuilderInitialization() {
         getPosixAccountsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -616,18 +604,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_LoginProfile_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.oslogin.v1.LoginProfile getDefaultInstanceForType() {
       return com.google.cloud.oslogin.v1.LoginProfile.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.oslogin.v1.LoginProfile build() {
       com.google.cloud.oslogin.v1.LoginProfile result = buildPartial();
       if (!result.isInitialized()) {
@@ -636,7 +621,6 @@ public com.google.cloud.oslogin.v1.LoginProfile build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.oslogin.v1.LoginProfile buildPartial() {
       com.google.cloud.oslogin.v1.LoginProfile result = new com.google.cloud.oslogin.v1.LoginProfile(this);
       int from_bitField0_ = bitField0_;
@@ -659,39 +643,32 @@ public com.google.cloud.oslogin.v1.LoginProfile buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.oslogin.v1.LoginProfile) {
         return mergeFrom((com.google.cloud.oslogin.v1.LoginProfile)other);
@@ -743,12 +720,10 @@ public Builder mergeFrom(com.google.cloud.oslogin.v1.LoginProfile other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1360,13 +1335,11 @@ public Builder clearSuspended() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1388,12 +1361,11 @@ public static com.google.cloud.oslogin.v1.LoginProfile getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LoginProfile parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LoginProfile(input, extensionRegistry);
+        return new LoginProfile(input, extensionRegistry);
     }
   };
 
@@ -1406,7 +1378,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.oslogin.v1.LoginProfile getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/OsLoginProto.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/OsLoginProto.java
index d7ed6ad8b5b6..d3730b15db07 100644
--- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/OsLoginProto.java
+++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/OsLoginProto.java
@@ -77,7 +77,7 @@ public static void registerAllExtensions(
       "accounts\030\002 \003(\0132).google.cloud.oslogin.co" +
       "mmon.PosixAccount\022Q\n\017ssh_public_keys\030\003 \003" +
       "(\01328.google.cloud.oslogin.v1.LoginProfil" +
-      "e.SshPublicKeysEntry\022\021\n\tsuspended\030\004 \001(\010\032" +
+      "e.SshPublicKeysEntry\022\021\n\tsuspended\030\004 \001(\010\032",
       "_\n\022SshPublicKeysEntry\022\013\n\003key\030\001 \001(\t\0228\n\005va" +
       "lue\030\002 \001(\0132).google.cloud.oslogin.common." +
       "SshPublicKey:\0028\001\")\n\031DeletePosixAccountRe" +
@@ -87,7 +87,7 @@ public static void registerAllExtensions(
       "yRequest\022\014\n\004name\030\001 \001(\t\"\202\001\n\031ImportSshPubl" +
       "icKeyRequest\022\016\n\006parent\030\001 \001(\t\022A\n\016ssh_publ" +
       "ic_key\030\002 \001(\0132).google.cloud.oslogin.comm" +
-      "on.SshPublicKey\022\022\n\nproject_id\030\003 \001(\t\"Z\n\032I" +
+      "on.SshPublicKey\022\022\n\nproject_id\030\003 \001(\t\"Z\n\032I",
       "mportSshPublicKeyResponse\022<\n\rlogin_profi" +
       "le\030\001 \001(\0132%.google.cloud.oslogin.v1.Login" +
       "Profile\"\235\001\n\031UpdateSshPublicKeyRequest\022\014\n" +
@@ -97,7 +97,7 @@ public static void registerAllExtensions(
       "eldMask2\315\007\n\016OsLoginService\022\207\001\n\022DeletePos" +
       "ixAccount\0222.google.cloud.oslogin.v1.Dele" +
       "tePosixAccountRequest\032\026.google.protobuf." +
-      "Empty\"%\202\323\344\223\002\037*\035/v1/{name=users/*/project" +
+      "Empty\"%\202\323\344\223\002\037*\035/v1/{name=users/*/project",
       "s/*}\022\214\001\n\022DeleteSshPublicKey\0222.google.clo" +
       "ud.oslogin.v1.DeleteSshPublicKeyRequest\032" +
       "\026.google.protobuf.Empty\"*\202\323\344\223\002$*\"/v1/{na" +
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "v1.LoginProfile\"\'\202\323\344\223\002!\022\037/v1/{name=users" +
       "/*}/loginProfile\022\231\001\n\017GetSshPublicKey\022/.g" +
       "oogle.cloud.oslogin.v1.GetSshPublicKeyRe" +
-      "quest\032).google.cloud.oslogin.common.SshP" +
+      "quest\032).google.cloud.oslogin.common.SshP",
       "ublicKey\"*\202\323\344\223\002$\022\"/v1/{name=users/*/sshP" +
       "ublicKeys/*}\022\276\001\n\022ImportSshPublicKey\0222.go" +
       "ogle.cloud.oslogin.v1.ImportSshPublicKey" +
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       "c_key\022\257\001\n\022UpdateSshPublicKey\0222.google.cl" +
       "oud.oslogin.v1.UpdateSshPublicKeyRequest" +
       "\032).google.cloud.oslogin.common.SshPublic" +
-      "Key\":\202\323\344\223\00242\"/v1/{name=users/*/sshPublic" +
+      "Key\":\202\323\344\223\00242\"/v1/{name=users/*/sshPublic",
       "Keys/*}:\016ssh_public_keyB\241\001\n\033com.google.c" +
       "loud.oslogin.v1B\014OsLoginProtoP\001Z>google." +
       "golang.org/genproto/googleapis/cloud/osl" +
diff --git a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/UpdateSshPublicKeyRequest.java b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/UpdateSshPublicKeyRequest.java
index 313be8725010..87ef2570f9bd 100644
--- a/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/UpdateSshPublicKeyRequest.java
+++ b/google-api-grpc/proto-google-cloud-os-login-v1/src/main/java/com/google/cloud/oslogin/v1/UpdateSshPublicKeyRequest.java
@@ -33,9 +33,6 @@ private UpdateSshPublicKeyRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private UpdateSshPublicKeyRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -79,13 +83,6 @@ private UpdateSshPublicKeyRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private UpdateSshPublicKeyRequest(
     return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_UpdateSshPublicKeyRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_UpdateSshPublicKeyRequest_fieldAccessorTable
@@ -224,7 +220,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -234,7 +229,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -249,7 +243,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -390,7 +383,6 @@ public static com.google.cloud.oslogin.v1.UpdateSshPublicKeyRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -398,7 +390,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.oslogin.v1.UpdateSshPublicKeyRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -426,7 +417,6 @@ public static final class Builder extends
       return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_UpdateSshPublicKeyRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_UpdateSshPublicKeyRequest_fieldAccessorTable
@@ -449,7 +439,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -469,18 +458,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.oslogin.v1.OsLoginProto.internal_static_google_cloud_oslogin_v1_UpdateSshPublicKeyRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.oslogin.v1.UpdateSshPublicKeyRequest getDefaultInstanceForType() {
       return com.google.cloud.oslogin.v1.UpdateSshPublicKeyRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.oslogin.v1.UpdateSshPublicKeyRequest build() {
       com.google.cloud.oslogin.v1.UpdateSshPublicKeyRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -489,7 +475,6 @@ public com.google.cloud.oslogin.v1.UpdateSshPublicKeyRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.oslogin.v1.UpdateSshPublicKeyRequest buildPartial() {
       com.google.cloud.oslogin.v1.UpdateSshPublicKeyRequest result = new com.google.cloud.oslogin.v1.UpdateSshPublicKeyRequest(this);
       result.name_ = name_;
@@ -507,39 +492,32 @@ public com.google.cloud.oslogin.v1.UpdateSshPublicKeyRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.oslogin.v1.UpdateSshPublicKeyRequest) {
         return mergeFrom((com.google.cloud.oslogin.v1.UpdateSshPublicKeyRequest)other);
@@ -566,12 +544,10 @@ public Builder mergeFrom(com.google.cloud.oslogin.v1.UpdateSshPublicKeyRequest o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -994,13 +970,11 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
       }
       return updateMaskBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1022,12 +996,11 @@ public static com.google.cloud.oslogin.v1.UpdateSshPublicKeyRequest getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateSshPublicKeyRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateSshPublicKeyRequest(input, extensionRegistry);
+        return new UpdateSshPublicKeyRequest(input, extensionRegistry);
     }
   };
 
@@ -1040,7 +1013,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.oslogin.v1.UpdateSshPublicKeyRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/AcknowledgeRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/AcknowledgeRequest.java
index a5520a9b52e1..70c45825b8ac 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/AcknowledgeRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/AcknowledgeRequest.java
@@ -34,9 +34,6 @@ private AcknowledgeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private AcknowledgeRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -63,13 +67,6 @@ private AcknowledgeRequest(
             ackIds_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private AcknowledgeRequest(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_AcknowledgeRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_AcknowledgeRequest_fieldAccessorTable
@@ -193,7 +189,6 @@ public java.lang.String getAckIds(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -203,7 +198,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getSubscriptionBytes().isEmpty()) {
@@ -215,7 +209,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -344,7 +337,6 @@ public static com.google.pubsub.v1.AcknowledgeRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -352,7 +344,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.AcknowledgeRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -380,7 +371,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_AcknowledgeRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_AcknowledgeRequest_fieldAccessorTable
@@ -403,7 +393,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       subscription_ = "";
@@ -413,18 +402,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_AcknowledgeRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.AcknowledgeRequest getDefaultInstanceForType() {
       return com.google.pubsub.v1.AcknowledgeRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.AcknowledgeRequest build() {
       com.google.pubsub.v1.AcknowledgeRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -433,7 +419,6 @@ public com.google.pubsub.v1.AcknowledgeRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.AcknowledgeRequest buildPartial() {
       com.google.pubsub.v1.AcknowledgeRequest result = new com.google.pubsub.v1.AcknowledgeRequest(this);
       int from_bitField0_ = bitField0_;
@@ -449,39 +434,32 @@ public com.google.pubsub.v1.AcknowledgeRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.AcknowledgeRequest) {
         return mergeFrom((com.google.pubsub.v1.AcknowledgeRequest)other);
@@ -512,12 +490,10 @@ public Builder mergeFrom(com.google.pubsub.v1.AcknowledgeRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -769,13 +745,11 @@ public Builder addAckIdsBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -797,12 +771,11 @@ public static com.google.pubsub.v1.AcknowledgeRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AcknowledgeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AcknowledgeRequest(input, extensionRegistry);
+        return new AcknowledgeRequest(input, extensionRegistry);
     }
   };
 
@@ -815,7 +788,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.AcknowledgeRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CreateSnapshotRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CreateSnapshotRequest.java
index 60a97f98bbf0..37d2152862c9 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CreateSnapshotRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/CreateSnapshotRequest.java
@@ -37,9 +37,6 @@ private CreateSnapshotRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private CreateSnapshotRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -76,13 +80,6 @@ private CreateSnapshotRequest(
                 labels__.getKey(), labels__.getValue());
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -101,7 +98,6 @@ private CreateSnapshotRequest(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -112,7 +108,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_CreateSnapshotRequest_fieldAccessorTable
@@ -322,7 +317,6 @@ public java.lang.String getLabelsOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -332,7 +326,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -350,7 +343,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -488,7 +480,6 @@ public static com.google.pubsub.v1.CreateSnapshotRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -496,7 +487,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.CreateSnapshotRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -549,7 +539,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_CreateSnapshotRequest_fieldAccessorTable
@@ -572,7 +561,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -583,18 +571,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_CreateSnapshotRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.CreateSnapshotRequest getDefaultInstanceForType() {
       return com.google.pubsub.v1.CreateSnapshotRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.CreateSnapshotRequest build() {
       com.google.pubsub.v1.CreateSnapshotRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -603,7 +588,6 @@ public com.google.pubsub.v1.CreateSnapshotRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.CreateSnapshotRequest buildPartial() {
       com.google.pubsub.v1.CreateSnapshotRequest result = new com.google.pubsub.v1.CreateSnapshotRequest(this);
       int from_bitField0_ = bitField0_;
@@ -617,39 +601,32 @@ public com.google.pubsub.v1.CreateSnapshotRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.CreateSnapshotRequest) {
         return mergeFrom((com.google.pubsub.v1.CreateSnapshotRequest)other);
@@ -676,12 +653,10 @@ public Builder mergeFrom(com.google.pubsub.v1.CreateSnapshotRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1089,13 +1064,11 @@ public Builder putAllLabels(
           .putAll(values);
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1117,12 +1090,11 @@ public static com.google.pubsub.v1.CreateSnapshotRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateSnapshotRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateSnapshotRequest(input, extensionRegistry);
+        return new CreateSnapshotRequest(input, extensionRegistry);
     }
   };
 
@@ -1135,7 +1107,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.CreateSnapshotRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteSnapshotRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteSnapshotRequest.java
index 3c8a6390dd31..42b16f4b8fee 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteSnapshotRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteSnapshotRequest.java
@@ -36,9 +36,6 @@ private DeleteSnapshotRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,12 +47,6 @@ private DeleteSnapshotRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            snapshot_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -63,6 +54,12 @@ private DeleteSnapshotRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            snapshot_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -80,7 +77,6 @@ private DeleteSnapshotRequest(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_DeleteSnapshotRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_DeleteSnapshotRequest_fieldAccessorTable
@@ -133,7 +129,6 @@ public java.lang.String getSnapshot() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -143,7 +138,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getSnapshotBytes().isEmpty()) {
@@ -152,7 +146,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -267,7 +260,6 @@ public static com.google.pubsub.v1.DeleteSnapshotRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -275,7 +267,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.DeleteSnapshotRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -306,7 +297,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_DeleteSnapshotRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_DeleteSnapshotRequest_fieldAccessorTable
@@ -329,7 +319,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       snapshot_ = "";
@@ -337,18 +326,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_DeleteSnapshotRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.DeleteSnapshotRequest getDefaultInstanceForType() {
       return com.google.pubsub.v1.DeleteSnapshotRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.DeleteSnapshotRequest build() {
       com.google.pubsub.v1.DeleteSnapshotRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -357,7 +343,6 @@ public com.google.pubsub.v1.DeleteSnapshotRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.DeleteSnapshotRequest buildPartial() {
       com.google.pubsub.v1.DeleteSnapshotRequest result = new com.google.pubsub.v1.DeleteSnapshotRequest(this);
       result.snapshot_ = snapshot_;
@@ -365,39 +350,32 @@ public com.google.pubsub.v1.DeleteSnapshotRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.DeleteSnapshotRequest) {
         return mergeFrom((com.google.pubsub.v1.DeleteSnapshotRequest)other);
@@ -418,12 +396,10 @@ public Builder mergeFrom(com.google.pubsub.v1.DeleteSnapshotRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -535,13 +511,11 @@ public Builder setSnapshotBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -563,12 +537,11 @@ public static com.google.pubsub.v1.DeleteSnapshotRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteSnapshotRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteSnapshotRequest(input, extensionRegistry);
+        return new DeleteSnapshotRequest(input, extensionRegistry);
     }
   };
 
@@ -581,7 +554,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.DeleteSnapshotRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteSubscriptionRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteSubscriptionRequest.java
index bc3a307361fb..2712f7b0aedd 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteSubscriptionRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteSubscriptionRequest.java
@@ -33,9 +33,6 @@ private DeleteSubscriptionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteSubscriptionRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            subscription_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteSubscriptionRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            subscription_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteSubscriptionRequest(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_DeleteSubscriptionRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_DeleteSubscriptionRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getSubscription() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getSubscriptionBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.pubsub.v1.DeleteSubscriptionRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.DeleteSubscriptionRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_DeleteSubscriptionRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_DeleteSubscriptionRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       subscription_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_DeleteSubscriptionRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.DeleteSubscriptionRequest getDefaultInstanceForType() {
       return com.google.pubsub.v1.DeleteSubscriptionRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.DeleteSubscriptionRequest build() {
       com.google.pubsub.v1.DeleteSubscriptionRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.pubsub.v1.DeleteSubscriptionRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.DeleteSubscriptionRequest buildPartial() {
       com.google.pubsub.v1.DeleteSubscriptionRequest result = new com.google.pubsub.v1.DeleteSubscriptionRequest(this);
       result.subscription_ = subscription_;
@@ -359,39 +344,32 @@ public com.google.pubsub.v1.DeleteSubscriptionRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.DeleteSubscriptionRequest) {
         return mergeFrom((com.google.pubsub.v1.DeleteSubscriptionRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.pubsub.v1.DeleteSubscriptionRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setSubscriptionBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.pubsub.v1.DeleteSubscriptionRequest getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteSubscriptionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteSubscriptionRequest(input, extensionRegistry);
+        return new DeleteSubscriptionRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.DeleteSubscriptionRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteTopicRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteTopicRequest.java
index 3035fb08c3f6..893570ab861f 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteTopicRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/DeleteTopicRequest.java
@@ -33,9 +33,6 @@ private DeleteTopicRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteTopicRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            topic_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteTopicRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            topic_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteTopicRequest(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_DeleteTopicRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_DeleteTopicRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getTopic() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getTopicBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.pubsub.v1.DeleteTopicRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.DeleteTopicRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_DeleteTopicRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_DeleteTopicRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       topic_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_DeleteTopicRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.DeleteTopicRequest getDefaultInstanceForType() {
       return com.google.pubsub.v1.DeleteTopicRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.DeleteTopicRequest build() {
       com.google.pubsub.v1.DeleteTopicRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.pubsub.v1.DeleteTopicRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.DeleteTopicRequest buildPartial() {
       com.google.pubsub.v1.DeleteTopicRequest result = new com.google.pubsub.v1.DeleteTopicRequest(this);
       result.topic_ = topic_;
@@ -359,39 +344,32 @@ public com.google.pubsub.v1.DeleteTopicRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.DeleteTopicRequest) {
         return mergeFrom((com.google.pubsub.v1.DeleteTopicRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.pubsub.v1.DeleteTopicRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setTopicBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.pubsub.v1.DeleteTopicRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteTopicRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteTopicRequest(input, extensionRegistry);
+        return new DeleteTopicRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.DeleteTopicRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetSnapshotRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetSnapshotRequest.java
index 188b2057aef9..369124096379 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetSnapshotRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetSnapshotRequest.java
@@ -36,9 +36,6 @@ private GetSnapshotRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,12 +47,6 @@ private GetSnapshotRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            snapshot_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -63,6 +54,12 @@ private GetSnapshotRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            snapshot_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -80,7 +77,6 @@ private GetSnapshotRequest(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_GetSnapshotRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_GetSnapshotRequest_fieldAccessorTable
@@ -133,7 +129,6 @@ public java.lang.String getSnapshot() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -143,7 +138,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getSnapshotBytes().isEmpty()) {
@@ -152,7 +146,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -267,7 +260,6 @@ public static com.google.pubsub.v1.GetSnapshotRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -275,7 +267,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.GetSnapshotRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -306,7 +297,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_GetSnapshotRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_GetSnapshotRequest_fieldAccessorTable
@@ -329,7 +319,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       snapshot_ = "";
@@ -337,18 +326,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_GetSnapshotRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.GetSnapshotRequest getDefaultInstanceForType() {
       return com.google.pubsub.v1.GetSnapshotRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.GetSnapshotRequest build() {
       com.google.pubsub.v1.GetSnapshotRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -357,7 +343,6 @@ public com.google.pubsub.v1.GetSnapshotRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.GetSnapshotRequest buildPartial() {
       com.google.pubsub.v1.GetSnapshotRequest result = new com.google.pubsub.v1.GetSnapshotRequest(this);
       result.snapshot_ = snapshot_;
@@ -365,39 +350,32 @@ public com.google.pubsub.v1.GetSnapshotRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.GetSnapshotRequest) {
         return mergeFrom((com.google.pubsub.v1.GetSnapshotRequest)other);
@@ -418,12 +396,10 @@ public Builder mergeFrom(com.google.pubsub.v1.GetSnapshotRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -535,13 +511,11 @@ public Builder setSnapshotBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -563,12 +537,11 @@ public static com.google.pubsub.v1.GetSnapshotRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetSnapshotRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetSnapshotRequest(input, extensionRegistry);
+        return new GetSnapshotRequest(input, extensionRegistry);
     }
   };
 
@@ -581,7 +554,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.GetSnapshotRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetSubscriptionRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetSubscriptionRequest.java
index 5acb2a1010a2..750eaf5a9d13 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetSubscriptionRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetSubscriptionRequest.java
@@ -33,9 +33,6 @@ private GetSubscriptionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetSubscriptionRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            subscription_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetSubscriptionRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            subscription_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetSubscriptionRequest(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_GetSubscriptionRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_GetSubscriptionRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getSubscription() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getSubscriptionBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.pubsub.v1.GetSubscriptionRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.GetSubscriptionRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_GetSubscriptionRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_GetSubscriptionRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       subscription_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_GetSubscriptionRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.GetSubscriptionRequest getDefaultInstanceForType() {
       return com.google.pubsub.v1.GetSubscriptionRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.GetSubscriptionRequest build() {
       com.google.pubsub.v1.GetSubscriptionRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.pubsub.v1.GetSubscriptionRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.GetSubscriptionRequest buildPartial() {
       com.google.pubsub.v1.GetSubscriptionRequest result = new com.google.pubsub.v1.GetSubscriptionRequest(this);
       result.subscription_ = subscription_;
@@ -359,39 +344,32 @@ public com.google.pubsub.v1.GetSubscriptionRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.GetSubscriptionRequest) {
         return mergeFrom((com.google.pubsub.v1.GetSubscriptionRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.pubsub.v1.GetSubscriptionRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setSubscriptionBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.pubsub.v1.GetSubscriptionRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetSubscriptionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetSubscriptionRequest(input, extensionRegistry);
+        return new GetSubscriptionRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.GetSubscriptionRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetTopicRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetTopicRequest.java
index 96a14ee3a1c1..413a9aec9a73 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetTopicRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/GetTopicRequest.java
@@ -33,9 +33,6 @@ private GetTopicRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetTopicRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            topic_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetTopicRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            topic_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetTopicRequest(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_GetTopicRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_GetTopicRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getTopic() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getTopicBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.pubsub.v1.GetTopicRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.GetTopicRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_GetTopicRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_GetTopicRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       topic_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_GetTopicRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.GetTopicRequest getDefaultInstanceForType() {
       return com.google.pubsub.v1.GetTopicRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.GetTopicRequest build() {
       com.google.pubsub.v1.GetTopicRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.pubsub.v1.GetTopicRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.GetTopicRequest buildPartial() {
       com.google.pubsub.v1.GetTopicRequest result = new com.google.pubsub.v1.GetTopicRequest(this);
       result.topic_ = topic_;
@@ -359,39 +344,32 @@ public com.google.pubsub.v1.GetTopicRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.GetTopicRequest) {
         return mergeFrom((com.google.pubsub.v1.GetTopicRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.pubsub.v1.GetTopicRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setTopicBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.pubsub.v1.GetTopicRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetTopicRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetTopicRequest(input, extensionRegistry);
+        return new GetTopicRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.GetTopicRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSnapshotsRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSnapshotsRequest.java
index 395981712496..ecb3cd5cc584 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSnapshotsRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSnapshotsRequest.java
@@ -38,9 +38,6 @@ private ListSnapshotsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private ListSnapshotsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -69,13 +73,6 @@ private ListSnapshotsRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -93,7 +90,6 @@ private ListSnapshotsRequest(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListSnapshotsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListSnapshotsRequest_fieldAccessorTable
@@ -205,7 +201,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -215,7 +210,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectBytes().isEmpty()) {
@@ -230,7 +224,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -360,7 +353,6 @@ public static com.google.pubsub.v1.ListSnapshotsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -368,7 +360,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.ListSnapshotsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -399,7 +390,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListSnapshotsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListSnapshotsRequest_fieldAccessorTable
@@ -422,7 +412,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       project_ = "";
@@ -434,18 +423,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListSnapshotsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ListSnapshotsRequest getDefaultInstanceForType() {
       return com.google.pubsub.v1.ListSnapshotsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ListSnapshotsRequest build() {
       com.google.pubsub.v1.ListSnapshotsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -454,7 +440,6 @@ public com.google.pubsub.v1.ListSnapshotsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ListSnapshotsRequest buildPartial() {
       com.google.pubsub.v1.ListSnapshotsRequest result = new com.google.pubsub.v1.ListSnapshotsRequest(this);
       result.project_ = project_;
@@ -464,39 +449,32 @@ public com.google.pubsub.v1.ListSnapshotsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.ListSnapshotsRequest) {
         return mergeFrom((com.google.pubsub.v1.ListSnapshotsRequest)other);
@@ -524,12 +502,10 @@ public Builder mergeFrom(com.google.pubsub.v1.ListSnapshotsRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -778,13 +754,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -806,12 +780,11 @@ public static com.google.pubsub.v1.ListSnapshotsRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListSnapshotsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListSnapshotsRequest(input, extensionRegistry);
+        return new ListSnapshotsRequest(input, extensionRegistry);
     }
   };
 
@@ -824,7 +797,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.ListSnapshotsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSnapshotsResponse.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSnapshotsResponse.java
index b2f0b97af288..db9523124c30 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSnapshotsResponse.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSnapshotsResponse.java
@@ -37,9 +37,6 @@ private ListSnapshotsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private ListSnapshotsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               snapshots_ = new java.util.ArrayList();
@@ -66,13 +70,6 @@ private ListSnapshotsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -93,7 +90,6 @@ private ListSnapshotsResponse(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListSnapshotsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListSnapshotsResponse_fieldAccessorTable
@@ -202,7 +198,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -212,7 +207,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < snapshots_.size(); i++) {
@@ -224,7 +218,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -349,7 +342,6 @@ public static com.google.pubsub.v1.ListSnapshotsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -357,7 +349,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.ListSnapshotsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -388,7 +379,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListSnapshotsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListSnapshotsResponse_fieldAccessorTable
@@ -412,7 +402,6 @@ private void maybeForceBuilderInitialization() {
         getSnapshotsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (snapshotsBuilder_ == null) {
@@ -426,18 +415,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListSnapshotsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ListSnapshotsResponse getDefaultInstanceForType() {
       return com.google.pubsub.v1.ListSnapshotsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ListSnapshotsResponse build() {
       com.google.pubsub.v1.ListSnapshotsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -446,7 +432,6 @@ public com.google.pubsub.v1.ListSnapshotsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ListSnapshotsResponse buildPartial() {
       com.google.pubsub.v1.ListSnapshotsResponse result = new com.google.pubsub.v1.ListSnapshotsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -466,39 +451,32 @@ public com.google.pubsub.v1.ListSnapshotsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.ListSnapshotsResponse) {
         return mergeFrom((com.google.pubsub.v1.ListSnapshotsResponse)other);
@@ -545,12 +523,10 @@ public Builder mergeFrom(com.google.pubsub.v1.ListSnapshotsResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -975,13 +951,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1003,12 +977,11 @@ public static com.google.pubsub.v1.ListSnapshotsResponse getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListSnapshotsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListSnapshotsResponse(input, extensionRegistry);
+        return new ListSnapshotsResponse(input, extensionRegistry);
     }
   };
 
@@ -1021,7 +994,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.ListSnapshotsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSubscriptionsRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSubscriptionsRequest.java
index 4bb9f157303a..5100a0e14cbc 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSubscriptionsRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSubscriptionsRequest.java
@@ -35,9 +35,6 @@ private ListSubscriptionsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListSubscriptionsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ListSubscriptionsRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListSubscriptionsRequest(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListSubscriptionsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListSubscriptionsRequest_fieldAccessorTable
@@ -202,7 +198,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -212,7 +207,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectBytes().isEmpty()) {
@@ -227,7 +221,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -357,7 +350,6 @@ public static com.google.pubsub.v1.ListSubscriptionsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -365,7 +357,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.ListSubscriptionsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -393,7 +384,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListSubscriptionsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListSubscriptionsRequest_fieldAccessorTable
@@ -416,7 +406,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       project_ = "";
@@ -428,18 +417,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListSubscriptionsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ListSubscriptionsRequest getDefaultInstanceForType() {
       return com.google.pubsub.v1.ListSubscriptionsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ListSubscriptionsRequest build() {
       com.google.pubsub.v1.ListSubscriptionsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -448,7 +434,6 @@ public com.google.pubsub.v1.ListSubscriptionsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ListSubscriptionsRequest buildPartial() {
       com.google.pubsub.v1.ListSubscriptionsRequest result = new com.google.pubsub.v1.ListSubscriptionsRequest(this);
       result.project_ = project_;
@@ -458,39 +443,32 @@ public com.google.pubsub.v1.ListSubscriptionsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.ListSubscriptionsRequest) {
         return mergeFrom((com.google.pubsub.v1.ListSubscriptionsRequest)other);
@@ -518,12 +496,10 @@ public Builder mergeFrom(com.google.pubsub.v1.ListSubscriptionsRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -772,13 +748,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -800,12 +774,11 @@ public static com.google.pubsub.v1.ListSubscriptionsRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListSubscriptionsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListSubscriptionsRequest(input, extensionRegistry);
+        return new ListSubscriptionsRequest(input, extensionRegistry);
     }
   };
 
@@ -818,7 +791,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.ListSubscriptionsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSubscriptionsResponse.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSubscriptionsResponse.java
index 4a6e2e45db6f..e5d36b843a19 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSubscriptionsResponse.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListSubscriptionsResponse.java
@@ -34,9 +34,6 @@ private ListSubscriptionsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListSubscriptionsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               subscriptions_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListSubscriptionsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListSubscriptionsResponse(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListSubscriptionsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListSubscriptionsResponse_fieldAccessorTable
@@ -201,7 +197,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -211,7 +206,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < subscriptions_.size(); i++) {
@@ -223,7 +217,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.pubsub.v1.ListSubscriptionsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.ListSubscriptionsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListSubscriptionsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListSubscriptionsResponse_fieldAccessorTable
@@ -408,7 +398,6 @@ private void maybeForceBuilderInitialization() {
         getSubscriptionsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (subscriptionsBuilder_ == null) {
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListSubscriptionsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ListSubscriptionsResponse getDefaultInstanceForType() {
       return com.google.pubsub.v1.ListSubscriptionsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ListSubscriptionsResponse build() {
       com.google.pubsub.v1.ListSubscriptionsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public com.google.pubsub.v1.ListSubscriptionsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ListSubscriptionsResponse buildPartial() {
       com.google.pubsub.v1.ListSubscriptionsResponse result = new com.google.pubsub.v1.ListSubscriptionsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -462,39 +447,32 @@ public com.google.pubsub.v1.ListSubscriptionsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.ListSubscriptionsResponse) {
         return mergeFrom((com.google.pubsub.v1.ListSubscriptionsResponse)other);
@@ -541,12 +519,10 @@ public Builder mergeFrom(com.google.pubsub.v1.ListSubscriptionsResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -976,13 +952,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1004,12 +978,11 @@ public static com.google.pubsub.v1.ListSubscriptionsResponse getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListSubscriptionsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListSubscriptionsResponse(input, extensionRegistry);
+        return new ListSubscriptionsResponse(input, extensionRegistry);
     }
   };
 
@@ -1022,7 +995,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.ListSubscriptionsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSnapshotsRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSnapshotsRequest.java
index 6d986b340ed1..adce7d938bbd 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSnapshotsRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSnapshotsRequest.java
@@ -38,9 +38,6 @@ private ListTopicSnapshotsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private ListTopicSnapshotsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -69,13 +73,6 @@ private ListTopicSnapshotsRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -93,7 +90,6 @@ private ListTopicSnapshotsRequest(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListTopicSnapshotsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListTopicSnapshotsRequest_fieldAccessorTable
@@ -205,7 +201,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -215,7 +210,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getTopicBytes().isEmpty()) {
@@ -230,7 +224,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -360,7 +353,6 @@ public static com.google.pubsub.v1.ListTopicSnapshotsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -368,7 +360,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.ListTopicSnapshotsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -399,7 +390,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListTopicSnapshotsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListTopicSnapshotsRequest_fieldAccessorTable
@@ -422,7 +412,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       topic_ = "";
@@ -434,18 +423,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListTopicSnapshotsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ListTopicSnapshotsRequest getDefaultInstanceForType() {
       return com.google.pubsub.v1.ListTopicSnapshotsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ListTopicSnapshotsRequest build() {
       com.google.pubsub.v1.ListTopicSnapshotsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -454,7 +440,6 @@ public com.google.pubsub.v1.ListTopicSnapshotsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ListTopicSnapshotsRequest buildPartial() {
       com.google.pubsub.v1.ListTopicSnapshotsRequest result = new com.google.pubsub.v1.ListTopicSnapshotsRequest(this);
       result.topic_ = topic_;
@@ -464,39 +449,32 @@ public com.google.pubsub.v1.ListTopicSnapshotsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.ListTopicSnapshotsRequest) {
         return mergeFrom((com.google.pubsub.v1.ListTopicSnapshotsRequest)other);
@@ -524,12 +502,10 @@ public Builder mergeFrom(com.google.pubsub.v1.ListTopicSnapshotsRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -778,13 +754,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -806,12 +780,11 @@ public static com.google.pubsub.v1.ListTopicSnapshotsRequest getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListTopicSnapshotsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTopicSnapshotsRequest(input, extensionRegistry);
+        return new ListTopicSnapshotsRequest(input, extensionRegistry);
     }
   };
 
@@ -824,7 +797,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.ListTopicSnapshotsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSnapshotsResponse.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSnapshotsResponse.java
index 6fd57022e4a6..e9effdd1b2c8 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSnapshotsResponse.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSnapshotsResponse.java
@@ -37,9 +37,6 @@ private ListTopicSnapshotsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private ListTopicSnapshotsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -66,13 +70,6 @@ private ListTopicSnapshotsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -93,7 +90,6 @@ private ListTopicSnapshotsResponse(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListTopicSnapshotsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListTopicSnapshotsResponse_fieldAccessorTable
@@ -194,7 +190,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -204,7 +199,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < snapshots_.size(); i++) {
@@ -216,7 +210,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -345,7 +338,6 @@ public static com.google.pubsub.v1.ListTopicSnapshotsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -353,7 +345,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.ListTopicSnapshotsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListTopicSnapshotsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListTopicSnapshotsResponse_fieldAccessorTable
@@ -407,7 +397,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       snapshots_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -417,18 +406,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListTopicSnapshotsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ListTopicSnapshotsResponse getDefaultInstanceForType() {
       return com.google.pubsub.v1.ListTopicSnapshotsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ListTopicSnapshotsResponse build() {
       com.google.pubsub.v1.ListTopicSnapshotsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -437,7 +423,6 @@ public com.google.pubsub.v1.ListTopicSnapshotsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ListTopicSnapshotsResponse buildPartial() {
       com.google.pubsub.v1.ListTopicSnapshotsResponse result = new com.google.pubsub.v1.ListTopicSnapshotsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -453,39 +438,32 @@ public com.google.pubsub.v1.ListTopicSnapshotsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.ListTopicSnapshotsResponse) {
         return mergeFrom((com.google.pubsub.v1.ListTopicSnapshotsResponse)other);
@@ -516,12 +494,10 @@ public Builder mergeFrom(com.google.pubsub.v1.ListTopicSnapshotsResponse other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -769,13 +745,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -797,12 +771,11 @@ public static com.google.pubsub.v1.ListTopicSnapshotsResponse getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListTopicSnapshotsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTopicSnapshotsResponse(input, extensionRegistry);
+        return new ListTopicSnapshotsResponse(input, extensionRegistry);
     }
   };
 
@@ -815,7 +788,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.ListTopicSnapshotsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSubscriptionsRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSubscriptionsRequest.java
index bc420cdc461a..56eed7315bb3 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSubscriptionsRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSubscriptionsRequest.java
@@ -35,9 +35,6 @@ private ListTopicSubscriptionsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListTopicSubscriptionsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ListTopicSubscriptionsRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListTopicSubscriptionsRequest(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListTopicSubscriptionsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListTopicSubscriptionsRequest_fieldAccessorTable
@@ -202,7 +198,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -212,7 +207,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getTopicBytes().isEmpty()) {
@@ -227,7 +221,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -357,7 +350,6 @@ public static com.google.pubsub.v1.ListTopicSubscriptionsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -365,7 +357,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.ListTopicSubscriptionsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -393,7 +384,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListTopicSubscriptionsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListTopicSubscriptionsRequest_fieldAccessorTable
@@ -416,7 +406,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       topic_ = "";
@@ -428,18 +417,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListTopicSubscriptionsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ListTopicSubscriptionsRequest getDefaultInstanceForType() {
       return com.google.pubsub.v1.ListTopicSubscriptionsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ListTopicSubscriptionsRequest build() {
       com.google.pubsub.v1.ListTopicSubscriptionsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -448,7 +434,6 @@ public com.google.pubsub.v1.ListTopicSubscriptionsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ListTopicSubscriptionsRequest buildPartial() {
       com.google.pubsub.v1.ListTopicSubscriptionsRequest result = new com.google.pubsub.v1.ListTopicSubscriptionsRequest(this);
       result.topic_ = topic_;
@@ -458,39 +443,32 @@ public com.google.pubsub.v1.ListTopicSubscriptionsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.ListTopicSubscriptionsRequest) {
         return mergeFrom((com.google.pubsub.v1.ListTopicSubscriptionsRequest)other);
@@ -518,12 +496,10 @@ public Builder mergeFrom(com.google.pubsub.v1.ListTopicSubscriptionsRequest othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -772,13 +748,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -800,12 +774,11 @@ public static com.google.pubsub.v1.ListTopicSubscriptionsRequest getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListTopicSubscriptionsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTopicSubscriptionsRequest(input, extensionRegistry);
+        return new ListTopicSubscriptionsRequest(input, extensionRegistry);
     }
   };
 
@@ -818,7 +791,6 @@ public com.google.protobuf.Parser getParserForTyp
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.ListTopicSubscriptionsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSubscriptionsResponse.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSubscriptionsResponse.java
index a25a85049c2f..4c2d99a2dd7e 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSubscriptionsResponse.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicSubscriptionsResponse.java
@@ -34,9 +34,6 @@ private ListTopicSubscriptionsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListTopicSubscriptionsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -63,13 +67,6 @@ private ListTopicSubscriptionsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListTopicSubscriptionsResponse(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListTopicSubscriptionsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListTopicSubscriptionsResponse_fieldAccessorTable
@@ -191,7 +187,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -201,7 +196,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < subscriptions_.size(); i++) {
@@ -213,7 +207,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -342,7 +335,6 @@ public static com.google.pubsub.v1.ListTopicSubscriptionsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -350,7 +342,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.ListTopicSubscriptionsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -378,7 +369,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListTopicSubscriptionsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListTopicSubscriptionsResponse_fieldAccessorTable
@@ -401,7 +391,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       subscriptions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -411,18 +400,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListTopicSubscriptionsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ListTopicSubscriptionsResponse getDefaultInstanceForType() {
       return com.google.pubsub.v1.ListTopicSubscriptionsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ListTopicSubscriptionsResponse build() {
       com.google.pubsub.v1.ListTopicSubscriptionsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -431,7 +417,6 @@ public com.google.pubsub.v1.ListTopicSubscriptionsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ListTopicSubscriptionsResponse buildPartial() {
       com.google.pubsub.v1.ListTopicSubscriptionsResponse result = new com.google.pubsub.v1.ListTopicSubscriptionsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -447,39 +432,32 @@ public com.google.pubsub.v1.ListTopicSubscriptionsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.ListTopicSubscriptionsResponse) {
         return mergeFrom((com.google.pubsub.v1.ListTopicSubscriptionsResponse)other);
@@ -510,12 +488,10 @@ public Builder mergeFrom(com.google.pubsub.v1.ListTopicSubscriptionsResponse oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -763,13 +739,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -791,12 +765,11 @@ public static com.google.pubsub.v1.ListTopicSubscriptionsResponse getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListTopicSubscriptionsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTopicSubscriptionsResponse(input, extensionRegistry);
+        return new ListTopicSubscriptionsResponse(input, extensionRegistry);
     }
   };
 
@@ -809,7 +782,6 @@ public com.google.protobuf.Parser getParserForTy
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.ListTopicSubscriptionsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicsRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicsRequest.java
index 6e0349fb2bf9..d3805cecf8f1 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicsRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicsRequest.java
@@ -35,9 +35,6 @@ private ListTopicsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListTopicsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ListTopicsRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListTopicsRequest(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListTopicsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListTopicsRequest_fieldAccessorTable
@@ -202,7 +198,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -212,7 +207,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectBytes().isEmpty()) {
@@ -227,7 +221,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -357,7 +350,6 @@ public static com.google.pubsub.v1.ListTopicsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -365,7 +357,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.ListTopicsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -393,7 +384,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListTopicsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListTopicsRequest_fieldAccessorTable
@@ -416,7 +406,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       project_ = "";
@@ -428,18 +417,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListTopicsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ListTopicsRequest getDefaultInstanceForType() {
       return com.google.pubsub.v1.ListTopicsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ListTopicsRequest build() {
       com.google.pubsub.v1.ListTopicsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -448,7 +434,6 @@ public com.google.pubsub.v1.ListTopicsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ListTopicsRequest buildPartial() {
       com.google.pubsub.v1.ListTopicsRequest result = new com.google.pubsub.v1.ListTopicsRequest(this);
       result.project_ = project_;
@@ -458,39 +443,32 @@ public com.google.pubsub.v1.ListTopicsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.ListTopicsRequest) {
         return mergeFrom((com.google.pubsub.v1.ListTopicsRequest)other);
@@ -518,12 +496,10 @@ public Builder mergeFrom(com.google.pubsub.v1.ListTopicsRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -772,13 +748,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -800,12 +774,11 @@ public static com.google.pubsub.v1.ListTopicsRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListTopicsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTopicsRequest(input, extensionRegistry);
+        return new ListTopicsRequest(input, extensionRegistry);
     }
   };
 
@@ -818,7 +791,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.ListTopicsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicsResponse.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicsResponse.java
index 73aeea01f63e..2bfb90b1de3b 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicsResponse.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ListTopicsResponse.java
@@ -34,9 +34,6 @@ private ListTopicsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListTopicsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               topics_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListTopicsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListTopicsResponse(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListTopicsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListTopicsResponse_fieldAccessorTable
@@ -199,7 +195,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -209,7 +204,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < topics_.size(); i++) {
@@ -221,7 +215,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -346,7 +339,6 @@ public static com.google.pubsub.v1.ListTopicsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -354,7 +346,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.ListTopicsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -382,7 +373,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListTopicsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListTopicsResponse_fieldAccessorTable
@@ -406,7 +396,6 @@ private void maybeForceBuilderInitialization() {
         getTopicsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (topicsBuilder_ == null) {
@@ -420,18 +409,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ListTopicsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ListTopicsResponse getDefaultInstanceForType() {
       return com.google.pubsub.v1.ListTopicsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ListTopicsResponse build() {
       com.google.pubsub.v1.ListTopicsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -440,7 +426,6 @@ public com.google.pubsub.v1.ListTopicsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ListTopicsResponse buildPartial() {
       com.google.pubsub.v1.ListTopicsResponse result = new com.google.pubsub.v1.ListTopicsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -460,39 +445,32 @@ public com.google.pubsub.v1.ListTopicsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.ListTopicsResponse) {
         return mergeFrom((com.google.pubsub.v1.ListTopicsResponse)other);
@@ -539,12 +517,10 @@ public Builder mergeFrom(com.google.pubsub.v1.ListTopicsResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -969,13 +945,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -997,12 +971,11 @@ public static com.google.pubsub.v1.ListTopicsResponse getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListTopicsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTopicsResponse(input, extensionRegistry);
+        return new ListTopicsResponse(input, extensionRegistry);
     }
   };
 
@@ -1015,7 +988,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.ListTopicsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/MessageStoragePolicy.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/MessageStoragePolicy.java
index 75852188aea0..b878fc91eba1 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/MessageStoragePolicy.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/MessageStoragePolicy.java
@@ -29,9 +29,6 @@ private MessageStoragePolicy(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -43,6 +40,13 @@ private MessageStoragePolicy(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -52,13 +56,6 @@ private MessageStoragePolicy(
             allowedPersistenceRegions_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -79,7 +76,6 @@ private MessageStoragePolicy(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_MessageStoragePolicy_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_MessageStoragePolicy_fieldAccessorTable
@@ -153,7 +149,6 @@ public java.lang.String getAllowedPersistenceRegions(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -163,7 +158,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < allowedPersistenceRegions_.size(); i++) {
@@ -172,7 +166,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -294,7 +287,6 @@ public static com.google.pubsub.v1.MessageStoragePolicy parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -302,7 +294,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.MessageStoragePolicy prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -326,7 +317,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_MessageStoragePolicy_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_MessageStoragePolicy_fieldAccessorTable
@@ -349,7 +339,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       allowedPersistenceRegions_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -357,18 +346,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_MessageStoragePolicy_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.MessageStoragePolicy getDefaultInstanceForType() {
       return com.google.pubsub.v1.MessageStoragePolicy.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.MessageStoragePolicy build() {
       com.google.pubsub.v1.MessageStoragePolicy result = buildPartial();
       if (!result.isInitialized()) {
@@ -377,7 +363,6 @@ public com.google.pubsub.v1.MessageStoragePolicy build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.MessageStoragePolicy buildPartial() {
       com.google.pubsub.v1.MessageStoragePolicy result = new com.google.pubsub.v1.MessageStoragePolicy(this);
       int from_bitField0_ = bitField0_;
@@ -390,39 +375,32 @@ public com.google.pubsub.v1.MessageStoragePolicy buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.MessageStoragePolicy) {
         return mergeFrom((com.google.pubsub.v1.MessageStoragePolicy)other);
@@ -449,12 +427,10 @@ public Builder mergeFrom(com.google.pubsub.v1.MessageStoragePolicy other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -648,13 +624,11 @@ public Builder addAllowedPersistenceRegionsBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -676,12 +650,11 @@ public static com.google.pubsub.v1.MessageStoragePolicy getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public MessageStoragePolicy parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new MessageStoragePolicy(input, extensionRegistry);
+        return new MessageStoragePolicy(input, extensionRegistry);
     }
   };
 
@@ -694,7 +667,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.MessageStoragePolicy getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ModifyAckDeadlineRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ModifyAckDeadlineRequest.java
index e5b5f07c18ea..90da0e1ed7d7 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ModifyAckDeadlineRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ModifyAckDeadlineRequest.java
@@ -35,9 +35,6 @@ private ModifyAckDeadlineRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ModifyAckDeadlineRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -69,13 +73,6 @@ private ModifyAckDeadlineRequest(
             ackIds_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private ModifyAckDeadlineRequest(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ModifyAckDeadlineRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ModifyAckDeadlineRequest_fieldAccessorTable
@@ -214,7 +210,6 @@ public int getAckDeadlineSeconds() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -224,7 +219,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getSubscriptionBytes().isEmpty()) {
@@ -239,7 +233,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -376,7 +369,6 @@ public static com.google.pubsub.v1.ModifyAckDeadlineRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -384,7 +376,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.ModifyAckDeadlineRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -412,7 +403,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ModifyAckDeadlineRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ModifyAckDeadlineRequest_fieldAccessorTable
@@ -435,7 +425,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       subscription_ = "";
@@ -447,18 +436,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ModifyAckDeadlineRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ModifyAckDeadlineRequest getDefaultInstanceForType() {
       return com.google.pubsub.v1.ModifyAckDeadlineRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ModifyAckDeadlineRequest build() {
       com.google.pubsub.v1.ModifyAckDeadlineRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -467,7 +453,6 @@ public com.google.pubsub.v1.ModifyAckDeadlineRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ModifyAckDeadlineRequest buildPartial() {
       com.google.pubsub.v1.ModifyAckDeadlineRequest result = new com.google.pubsub.v1.ModifyAckDeadlineRequest(this);
       int from_bitField0_ = bitField0_;
@@ -484,39 +469,32 @@ public com.google.pubsub.v1.ModifyAckDeadlineRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.ModifyAckDeadlineRequest) {
         return mergeFrom((com.google.pubsub.v1.ModifyAckDeadlineRequest)other);
@@ -550,12 +528,10 @@ public Builder mergeFrom(com.google.pubsub.v1.ModifyAckDeadlineRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -854,13 +830,11 @@ public Builder clearAckDeadlineSeconds() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -882,12 +856,11 @@ public static com.google.pubsub.v1.ModifyAckDeadlineRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ModifyAckDeadlineRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ModifyAckDeadlineRequest(input, extensionRegistry);
+        return new ModifyAckDeadlineRequest(input, extensionRegistry);
     }
   };
 
@@ -900,7 +873,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.ModifyAckDeadlineRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ModifyPushConfigRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ModifyPushConfigRequest.java
index bbc1ae913421..0921ba9af322 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ModifyPushConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ModifyPushConfigRequest.java
@@ -33,9 +33,6 @@ private ModifyPushConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ModifyPushConfigRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ModifyPushConfigRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ModifyPushConfigRequest(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ModifyPushConfigRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ModifyPushConfigRequest_fieldAccessorTable
@@ -188,7 +184,6 @@ public com.google.pubsub.v1.PushConfigOrBuilder getPushConfigOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -198,7 +193,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getSubscriptionBytes().isEmpty()) {
@@ -210,7 +204,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -338,7 +331,6 @@ public static com.google.pubsub.v1.ModifyPushConfigRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -346,7 +338,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.ModifyPushConfigRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -374,7 +365,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ModifyPushConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ModifyPushConfigRequest_fieldAccessorTable
@@ -397,7 +387,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       subscription_ = "";
@@ -411,18 +400,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ModifyPushConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ModifyPushConfigRequest getDefaultInstanceForType() {
       return com.google.pubsub.v1.ModifyPushConfigRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ModifyPushConfigRequest build() {
       com.google.pubsub.v1.ModifyPushConfigRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -431,7 +417,6 @@ public com.google.pubsub.v1.ModifyPushConfigRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ModifyPushConfigRequest buildPartial() {
       com.google.pubsub.v1.ModifyPushConfigRequest result = new com.google.pubsub.v1.ModifyPushConfigRequest(this);
       result.subscription_ = subscription_;
@@ -444,39 +429,32 @@ public com.google.pubsub.v1.ModifyPushConfigRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.ModifyPushConfigRequest) {
         return mergeFrom((com.google.pubsub.v1.ModifyPushConfigRequest)other);
@@ -500,12 +478,10 @@ public Builder mergeFrom(com.google.pubsub.v1.ModifyPushConfigRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -806,13 +782,11 @@ public com.google.pubsub.v1.PushConfigOrBuilder getPushConfigOrBuilder() {
       }
       return pushConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -834,12 +808,11 @@ public static com.google.pubsub.v1.ModifyPushConfigRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ModifyPushConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ModifyPushConfigRequest(input, extensionRegistry);
+        return new ModifyPushConfigRequest(input, extensionRegistry);
     }
   };
 
@@ -852,7 +825,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.ModifyPushConfigRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublishRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublishRequest.java
index 9cc50d4286c2..83bb1a7a6410 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublishRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublishRequest.java
@@ -34,9 +34,6 @@ private PublishRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private PublishRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -63,13 +67,6 @@ private PublishRequest(
                 input.readMessage(com.google.pubsub.v1.PubsubMessage.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private PublishRequest(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_PublishRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_PublishRequest_fieldAccessorTable
@@ -199,7 +195,6 @@ public com.google.pubsub.v1.PubsubMessageOrBuilder getMessagesOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -209,7 +204,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getTopicBytes().isEmpty()) {
@@ -221,7 +215,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -346,7 +339,6 @@ public static com.google.pubsub.v1.PublishRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -354,7 +346,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.PublishRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -382,7 +373,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_PublishRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_PublishRequest_fieldAccessorTable
@@ -406,7 +396,6 @@ private void maybeForceBuilderInitialization() {
         getMessagesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       topic_ = "";
@@ -420,18 +409,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_PublishRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.PublishRequest getDefaultInstanceForType() {
       return com.google.pubsub.v1.PublishRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.PublishRequest build() {
       com.google.pubsub.v1.PublishRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -440,7 +426,6 @@ public com.google.pubsub.v1.PublishRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.PublishRequest buildPartial() {
       com.google.pubsub.v1.PublishRequest result = new com.google.pubsub.v1.PublishRequest(this);
       int from_bitField0_ = bitField0_;
@@ -460,39 +445,32 @@ public com.google.pubsub.v1.PublishRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.PublishRequest) {
         return mergeFrom((com.google.pubsub.v1.PublishRequest)other);
@@ -539,12 +517,10 @@ public Builder mergeFrom(com.google.pubsub.v1.PublishRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -969,13 +945,11 @@ public com.google.pubsub.v1.PubsubMessage.Builder addMessagesBuilder(
       }
       return messagesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -997,12 +971,11 @@ public static com.google.pubsub.v1.PublishRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PublishRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PublishRequest(input, extensionRegistry);
+        return new PublishRequest(input, extensionRegistry);
     }
   };
 
@@ -1015,7 +988,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.PublishRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublishResponse.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublishResponse.java
index ec61a1cd0823..f5a167742930 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublishResponse.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PublishResponse.java
@@ -33,9 +33,6 @@ private PublishResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private PublishResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -56,13 +60,6 @@ private PublishResponse(
             messageIds_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private PublishResponse(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_PublishResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_PublishResponse_fieldAccessorTable
@@ -145,7 +141,6 @@ public java.lang.String getMessageIds(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -155,7 +150,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < messageIds_.size(); i++) {
@@ -164,7 +158,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -286,7 +279,6 @@ public static com.google.pubsub.v1.PublishResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -294,7 +286,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.PublishResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -322,7 +313,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_PublishResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_PublishResponse_fieldAccessorTable
@@ -345,7 +335,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       messageIds_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -353,18 +342,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_PublishResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.PublishResponse getDefaultInstanceForType() {
       return com.google.pubsub.v1.PublishResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.PublishResponse build() {
       com.google.pubsub.v1.PublishResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -373,7 +359,6 @@ public com.google.pubsub.v1.PublishResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.PublishResponse buildPartial() {
       com.google.pubsub.v1.PublishResponse result = new com.google.pubsub.v1.PublishResponse(this);
       int from_bitField0_ = bitField0_;
@@ -386,39 +371,32 @@ public com.google.pubsub.v1.PublishResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.PublishResponse) {
         return mergeFrom((com.google.pubsub.v1.PublishResponse)other);
@@ -445,12 +423,10 @@ public Builder mergeFrom(com.google.pubsub.v1.PublishResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -617,13 +593,11 @@ public Builder addMessageIdsBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -645,12 +619,11 @@ public static com.google.pubsub.v1.PublishResponse getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PublishResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PublishResponse(input, extensionRegistry);
+        return new PublishResponse(input, extensionRegistry);
     }
   };
 
@@ -663,7 +636,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.PublishResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PubsubMessage.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PubsubMessage.java
index c9bd7aa3d858..8229f3bd9ccc 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PubsubMessage.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PubsubMessage.java
@@ -35,9 +35,6 @@ private PubsubMessage(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private PubsubMessage(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
 
             data_ = input.readBytes();
@@ -86,13 +90,6 @@ private PubsubMessage(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -111,7 +108,6 @@ private PubsubMessage(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -122,7 +118,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_PubsubMessage_fieldAccessorTable
@@ -324,7 +319,6 @@ public com.google.protobuf.TimestampOrBuilder getPublishTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -334,7 +328,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!data_.isEmpty()) {
@@ -355,7 +348,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -507,7 +499,6 @@ public static com.google.pubsub.v1.PubsubMessage parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -515,7 +506,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.PubsubMessage prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -566,7 +556,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_PubsubMessage_fieldAccessorTable
@@ -589,7 +578,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       data_ = com.google.protobuf.ByteString.EMPTY;
@@ -606,18 +594,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_PubsubMessage_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.PubsubMessage getDefaultInstanceForType() {
       return com.google.pubsub.v1.PubsubMessage.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.PubsubMessage build() {
       com.google.pubsub.v1.PubsubMessage result = buildPartial();
       if (!result.isInitialized()) {
@@ -626,7 +611,6 @@ public com.google.pubsub.v1.PubsubMessage build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.PubsubMessage buildPartial() {
       com.google.pubsub.v1.PubsubMessage result = new com.google.pubsub.v1.PubsubMessage(this);
       int from_bitField0_ = bitField0_;
@@ -645,39 +629,32 @@ public com.google.pubsub.v1.PubsubMessage buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.PubsubMessage) {
         return mergeFrom((com.google.pubsub.v1.PubsubMessage)other);
@@ -706,12 +683,10 @@ public Builder mergeFrom(com.google.pubsub.v1.PubsubMessage other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1197,13 +1172,11 @@ public com.google.protobuf.TimestampOrBuilder getPublishTimeOrBuilder() {
       }
       return publishTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1225,12 +1198,11 @@ public static com.google.pubsub.v1.PubsubMessage getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PubsubMessage parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PubsubMessage(input, extensionRegistry);
+        return new PubsubMessage(input, extensionRegistry);
     }
   };
 
@@ -1243,7 +1215,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.PubsubMessage getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PubsubProto.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PubsubProto.java
index 31cbf40afb8b..5b803c36f257 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PubsubProto.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PubsubProto.java
@@ -252,7 +252,7 @@ public static void registerAllExtensions(
       "ed_persistence_regions\030\001 \003(\t\"\301\001\n\005Topic\022\014" +
       "\n\004name\030\001 \001(\t\0223\n\006labels\030\002 \003(\0132#.google.pu" +
       "bsub.v1.Topic.LabelsEntry\022F\n\026message_sto" +
-      "rage_policy\030\003 \001(\0132&.google.pubsub.v1.Mes" +
+      "rage_policy\030\003 \001(\0132&.google.pubsub.v1.Mes",
       "sageStoragePolicy\032-\n\013LabelsEntry\022\013\n\003key\030" +
       "\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\333\001\n\rPubsubMessa" +
       "ge\022\014\n\004data\030\001 \001(\014\022C\n\nattributes\030\002 \003(\0132/.g" +
@@ -262,7 +262,7 @@ public static void registerAllExtensions(
       "ttributesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001" +
       "(\t:\0028\001\" \n\017GetTopicRequest\022\r\n\005topic\030\001 \001(\t" +
       "\"m\n\022UpdateTopicRequest\022&\n\005topic\030\001 \001(\0132\027." +
-      "google.pubsub.v1.Topic\022/\n\013update_mask\030\002 " +
+      "google.pubsub.v1.Topic\022/\n\013update_mask\030\002 ",
       "\001(\0132\032.google.protobuf.FieldMask\"R\n\016Publi" +
       "shRequest\022\r\n\005topic\030\001 \001(\t\0221\n\010messages\030\002 \003" +
       "(\0132\037.google.pubsub.v1.PubsubMessage\"&\n\017P" +
@@ -272,7 +272,7 @@ public static void registerAllExtensions(
       "TopicsResponse\022\'\n\006topics\030\001 \003(\0132\027.google." +
       "pubsub.v1.Topic\022\027\n\017next_page_token\030\002 \001(\t" +
       "\"U\n\035ListTopicSubscriptionsRequest\022\r\n\005top" +
-      "ic\030\001 \001(\t\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_toke" +
+      "ic\030\001 \001(\t\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_toke",
       "n\030\003 \001(\t\"P\n\036ListTopicSubscriptionsRespons" +
       "e\022\025\n\rsubscriptions\030\001 \003(\t\022\027\n\017next_page_to" +
       "ken\030\002 \001(\t\"Q\n\031ListTopicSnapshotsRequest\022\r" +
@@ -282,7 +282,7 @@ public static void registerAllExtensions(
       "\030\002 \001(\t\"#\n\022DeleteTopicRequest\022\r\n\005topic\030\001 " +
       "\001(\t\"\305\002\n\014Subscription\022\014\n\004name\030\001 \001(\t\022\r\n\005to" +
       "pic\030\002 \001(\t\0221\n\013push_config\030\004 \001(\0132\034.google." +
-      "pubsub.v1.PushConfig\022\034\n\024ack_deadline_sec" +
+      "pubsub.v1.PushConfig\022\034\n\024ack_deadline_sec",
       "onds\030\005 \001(\005\022\035\n\025retain_acked_messages\030\007 \001(" +
       "\010\022=\n\032message_retention_duration\030\010 \001(\0132\031." +
       "google.protobuf.Duration\022:\n\006labels\030\t \003(\013" +
@@ -292,7 +292,7 @@ public static void registerAllExtensions(
       "int\030\001 \001(\t\022@\n\nattributes\030\002 \003(\0132,.google.p" +
       "ubsub.v1.PushConfig.AttributesEntry\0321\n\017A" +
       "ttributesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001" +
-      "(\t:\0028\001\"S\n\017ReceivedMessage\022\016\n\006ack_id\030\001 \001(" +
+      "(\t:\0028\001\"S\n\017ReceivedMessage\022\016\n\006ack_id\030\001 \001(",
       "\t\0220\n\007message\030\002 \001(\0132\037.google.pubsub.v1.Pu" +
       "bsubMessage\".\n\026GetSubscriptionRequest\022\024\n" +
       "\014subscription\030\001 \001(\t\"\202\001\n\031UpdateSubscripti" +
@@ -302,7 +302,7 @@ public static void registerAllExtensions(
       "SubscriptionsRequest\022\017\n\007project\030\001 \001(\t\022\021\n" +
       "\tpage_size\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\"k\n\031" +
       "ListSubscriptionsResponse\0225\n\rsubscriptio" +
-      "ns\030\001 \003(\0132\036.google.pubsub.v1.Subscription" +
+      "ns\030\001 \003(\0132\036.google.pubsub.v1.Subscription",
       "\022\027\n\017next_page_token\030\002 \001(\t\"1\n\031DeleteSubsc" +
       "riptionRequest\022\024\n\014subscription\030\001 \001(\t\"b\n\027" +
       "ModifyPushConfigRequest\022\024\n\014subscription\030" +
@@ -312,7 +312,7 @@ public static void registerAllExtensions(
       "\010\022\024\n\014max_messages\030\003 \001(\005\"L\n\014PullResponse\022" +
       "<\n\021received_messages\030\001 \003(\0132!.google.pubs" +
       "ub.v1.ReceivedMessage\"_\n\030ModifyAckDeadli" +
-      "neRequest\022\024\n\014subscription\030\001 \001(\t\022\017\n\007ack_i" +
+      "neRequest\022\024\n\014subscription\030\001 \001(\t\022\017\n\007ack_i",
       "ds\030\004 \003(\t\022\034\n\024ack_deadline_seconds\030\003 \001(\005\";" +
       "\n\022AcknowledgeRequest\022\024\n\014subscription\030\001 \001" +
       "(\t\022\017\n\007ack_ids\030\002 \003(\t\"\244\001\n\024StreamingPullReq" +
@@ -322,7 +322,7 @@ public static void registerAllExtensions(
       "ack_deadline_seconds\030\005 \001(\005\"U\n\025StreamingP" +
       "ullResponse\022<\n\021received_messages\030\001 \003(\0132!" +
       ".google.pubsub.v1.ReceivedMessage\"\257\001\n\025Cr" +
-      "eateSnapshotRequest\022\014\n\004name\030\001 \001(\t\022\024\n\014sub" +
+      "eateSnapshotRequest\022\014\n\004name\030\001 \001(\t\022\024\n\014sub",
       "scription\030\002 \001(\t\022C\n\006labels\030\003 \003(\01323.google" +
       ".pubsub.v1.CreateSnapshotRequest.LabelsE" +
       "ntry\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005valu" +
@@ -332,7 +332,7 @@ public static void registerAllExtensions(
       "f.FieldMask\"\277\001\n\010Snapshot\022\014\n\004name\030\001 \001(\t\022\r" +
       "\n\005topic\030\002 \001(\t\022/\n\013expire_time\030\003 \001(\0132\032.goo" +
       "gle.protobuf.Timestamp\0226\n\006labels\030\004 \003(\0132&" +
-      ".google.pubsub.v1.Snapshot.LabelsEntry\032-" +
+      ".google.pubsub.v1.Snapshot.LabelsEntry\032-",
       "\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(" +
       "\t:\0028\001\"&\n\022GetSnapshotRequest\022\020\n\010snapshot\030" +
       "\001 \001(\t\"N\n\024ListSnapshotsRequest\022\017\n\007project" +
@@ -342,7 +342,7 @@ public static void registerAllExtensions(
       "\017next_page_token\030\002 \001(\t\")\n\025DeleteSnapshot" +
       "Request\022\020\n\010snapshot\030\001 \001(\t\"m\n\013SeekRequest" +
       "\022\024\n\014subscription\030\001 \001(\t\022*\n\004time\030\002 \001(\0132\032.g" +
-      "oogle.protobuf.TimestampH\000\022\022\n\010snapshot\030\003" +
+      "oogle.protobuf.TimestampH\000\022\022\n\010snapshot\030\003",
       " \001(\tH\000B\010\n\006target\"\016\n\014SeekResponse2\277\010\n\tPub" +
       "lisher\022j\n\013CreateTopic\022\027.google.pubsub.v1" +
       ".Topic\032\027.google.pubsub.v1.Topic\")\202\323\344\223\002#\032" +
@@ -352,7 +352,7 @@ public static void registerAllExtensions(
       "2$/v1/{topic.name=projects/*/topics/*}:\001" +
       "*\022\202\001\n\007Publish\022 .google.pubsub.v1.Publish" +
       "Request\032!.google.pubsub.v1.PublishRespon" +
-      "se\"2\202\323\344\223\002,\"\'/v1/{topic=projects/*/topics" +
+      "se\"2\202\323\344\223\002,\"\'/v1/{topic=projects/*/topics",
       "/*}:publish:\001*\022o\n\010GetTopic\022!.google.pubs" +
       "ub.v1.GetTopicRequest\032\027.google.pubsub.v1" +
       ".Topic\"\'\202\323\344\223\002!\022\037/v1/{topic=projects/*/to" +
@@ -362,7 +362,7 @@ public static void registerAllExtensions(
       "projects/*}/topics\022\262\001\n\026ListTopicSubscrip" +
       "tions\022/.google.pubsub.v1.ListTopicSubscr" +
       "iptionsRequest\0320.google.pubsub.v1.ListTo" +
-      "picSubscriptionsResponse\"5\202\323\344\223\002/\022-/v1/{t" +
+      "picSubscriptionsResponse\"5\202\323\344\223\002/\022-/v1/{t",
       "opic=projects/*/topics/*}/subscriptions\022" +
       "\242\001\n\022ListTopicSnapshots\022+.google.pubsub.v" +
       "1.ListTopicSnapshotsRequest\032,.google.pub" +
@@ -372,7 +372,7 @@ public static void registerAllExtensions(
       "eleteTopicRequest\032\026.google.protobuf.Empt" +
       "y\"\'\202\323\344\223\002!*\037/v1/{topic=projects/*/topics/" +
       "*}2\367\021\n\nSubscriber\022\206\001\n\022CreateSubscription" +
-      "\022\036.google.pubsub.v1.Subscription\032\036.googl" +
+      "\022\036.google.pubsub.v1.Subscription\032\036.googl",
       "e.pubsub.v1.Subscription\"0\202\323\344\223\002*\032%/v1/{n" +
       "ame=projects/*/subscriptions/*}:\001*\022\222\001\n\017G" +
       "etSubscription\022(.google.pubsub.v1.GetSub" +
@@ -382,7 +382,7 @@ public static void registerAllExtensions(
       "iption\022+.google.pubsub.v1.UpdateSubscrip" +
       "tionRequest\032\036.google.pubsub.v1.Subscript" +
       "ion\"=\202\323\344\223\002722/v1/{subscription.name=proj" +
-      "ects/*/subscriptions/*}:\001*\022\234\001\n\021ListSubsc" +
+      "ects/*/subscriptions/*}:\001*\022\234\001\n\021ListSubsc",
       "riptions\022*.google.pubsub.v1.ListSubscrip" +
       "tionsRequest\032+.google.pubsub.v1.ListSubs" +
       "criptionsResponse\".\202\323\344\223\002(\022&/v1/{project=" +
@@ -392,7 +392,7 @@ public static void registerAllExtensions(
       "\323\344\223\002/*-/v1/{subscription=projects/*/subs" +
       "criptions/*}\022\243\001\n\021ModifyAckDeadline\022*.goo" +
       "gle.pubsub.v1.ModifyAckDeadlineRequest\032\026" +
-      ".google.protobuf.Empty\"J\202\323\344\223\002D\"?/v1/{sub" +
+      ".google.protobuf.Empty\"J\202\323\344\223\002D\"?/v1/{sub",
       "scription=projects/*/subscriptions/*}:mo" +
       "difyAckDeadline:\001*\022\221\001\n\013Acknowledge\022$.goo" +
       "gle.pubsub.v1.AcknowledgeRequest\032\026.googl" +
@@ -402,7 +402,7 @@ public static void registerAllExtensions(
       "equest\032\036.google.pubsub.v1.PullResponse\"=" +
       "\202\323\344\223\0027\"2/v1/{subscription=projects/*/sub" +
       "scriptions/*}:pull:\001*\022d\n\rStreamingPull\022&" +
-      ".google.pubsub.v1.StreamingPullRequest\032\'" +
+      ".google.pubsub.v1.StreamingPullRequest\032\'",
       ".google.pubsub.v1.StreamingPullResponse(" +
       "\0010\001\022\240\001\n\020ModifyPushConfig\022).google.pubsub" +
       ".v1.ModifyPushConfigRequest\032\026.google.pro" +
@@ -412,7 +412,7 @@ public static void registerAllExtensions(
       ".GetSnapshotRequest\032\032.google.pubsub.v1.S" +
       "napshot\"-\202\323\344\223\002\'\022%/v1/{snapshot=projects/" +
       "*/snapshots/*}\022\214\001\n\rListSnapshots\022&.googl" +
-      "e.pubsub.v1.ListSnapshotsRequest\032\'.googl" +
+      "e.pubsub.v1.ListSnapshotsRequest\032\'.googl",
       "e.pubsub.v1.ListSnapshotsResponse\"*\202\323\344\223\002" +
       "$\022\"/v1/{project=projects/*}/snapshots\022\203\001" +
       "\n\016CreateSnapshot\022\'.google.pubsub.v1.Crea" +
@@ -422,7 +422,7 @@ public static void registerAllExtensions(
       "pubsub.v1.UpdateSnapshotRequest\032\032.google" +
       ".pubsub.v1.Snapshot\"5\202\323\344\223\002/2*/v1/{snapsh" +
       "ot.name=projects/*/snapshots/*}:\001*\022\200\001\n\016D" +
-      "eleteSnapshot\022\'.google.pubsub.v1.DeleteS" +
+      "eleteSnapshot\022\'.google.pubsub.v1.DeleteS",
       "napshotRequest\032\026.google.protobuf.Empty\"-" +
       "\202\323\344\223\002\'*%/v1/{snapshot=projects/*/snapsho" +
       "ts/*}\022\204\001\n\004Seek\022\035.google.pubsub.v1.SeekRe" +
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequest.java
index 4c1aaa51d06b..aaeecd93372b 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullRequest.java
@@ -35,9 +35,6 @@ private PullRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private PullRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -65,13 +69,6 @@ private PullRequest(
             maxMessages_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -89,7 +86,6 @@ private PullRequest(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_PullRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_PullRequest_fieldAccessorTable
@@ -174,7 +170,6 @@ public int getMaxMessages() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -184,7 +179,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getSubscriptionBytes().isEmpty()) {
@@ -199,7 +193,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -331,7 +324,6 @@ public static com.google.pubsub.v1.PullRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -339,7 +331,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.PullRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -367,7 +358,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_PullRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_PullRequest_fieldAccessorTable
@@ -390,7 +380,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       subscription_ = "";
@@ -402,18 +391,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_PullRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.PullRequest getDefaultInstanceForType() {
       return com.google.pubsub.v1.PullRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.PullRequest build() {
       com.google.pubsub.v1.PullRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -422,7 +408,6 @@ public com.google.pubsub.v1.PullRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.PullRequest buildPartial() {
       com.google.pubsub.v1.PullRequest result = new com.google.pubsub.v1.PullRequest(this);
       result.subscription_ = subscription_;
@@ -432,39 +417,32 @@ public com.google.pubsub.v1.PullRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.PullRequest) {
         return mergeFrom((com.google.pubsub.v1.PullRequest)other);
@@ -491,12 +469,10 @@ public Builder mergeFrom(com.google.pubsub.v1.PullRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -702,13 +678,11 @@ public Builder clearMaxMessages() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -730,12 +704,11 @@ public static com.google.pubsub.v1.PullRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PullRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PullRequest(input, extensionRegistry);
+        return new PullRequest(input, extensionRegistry);
     }
   };
 
@@ -748,7 +721,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.PullRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullResponse.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullResponse.java
index 170040815345..a8c84a96529d 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullResponse.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PullResponse.java
@@ -33,9 +33,6 @@ private PullResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private PullResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               receivedMessages_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private PullResponse(
                 input.readMessage(com.google.pubsub.v1.ReceivedMessage.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private PullResponse(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_PullResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_PullResponse_fieldAccessorTable
@@ -162,7 +158,6 @@ public com.google.pubsub.v1.ReceivedMessageOrBuilder getReceivedMessagesOrBuilde
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -172,7 +167,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < receivedMessages_.size(); i++) {
@@ -181,7 +175,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -299,7 +292,6 @@ public static com.google.pubsub.v1.PullResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -307,7 +299,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.PullResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -335,7 +326,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_PullResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_PullResponse_fieldAccessorTable
@@ -359,7 +349,6 @@ private void maybeForceBuilderInitialization() {
         getReceivedMessagesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (receivedMessagesBuilder_ == null) {
@@ -371,18 +360,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_PullResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.PullResponse getDefaultInstanceForType() {
       return com.google.pubsub.v1.PullResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.PullResponse build() {
       com.google.pubsub.v1.PullResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -391,7 +377,6 @@ public com.google.pubsub.v1.PullResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.PullResponse buildPartial() {
       com.google.pubsub.v1.PullResponse result = new com.google.pubsub.v1.PullResponse(this);
       int from_bitField0_ = bitField0_;
@@ -408,39 +393,32 @@ public com.google.pubsub.v1.PullResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.PullResponse) {
         return mergeFrom((com.google.pubsub.v1.PullResponse)other);
@@ -483,12 +461,10 @@ public Builder mergeFrom(com.google.pubsub.v1.PullResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -873,13 +849,11 @@ public com.google.pubsub.v1.ReceivedMessage.Builder addReceivedMessagesBuilder(
       }
       return receivedMessagesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -901,12 +875,11 @@ public static com.google.pubsub.v1.PullResponse getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PullResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PullResponse(input, extensionRegistry);
+        return new PullResponse(input, extensionRegistry);
     }
   };
 
@@ -919,7 +892,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.PullResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PushConfig.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PushConfig.java
index 7dcac690833b..e0bfc14b592f 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PushConfig.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/PushConfig.java
@@ -33,9 +33,6 @@ private PushConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private PushConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private PushConfig(
                 attributes__.getKey(), attributes__.getValue());
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private PushConfig(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -102,7 +98,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_PushConfig_fieldAccessorTable
@@ -308,7 +303,6 @@ public java.lang.String getAttributesOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -318,7 +312,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getPushEndpointBytes().isEmpty()) {
@@ -333,7 +326,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -464,7 +456,6 @@ public static com.google.pubsub.v1.PushConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -472,7 +463,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.PushConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -522,7 +512,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_PushConfig_fieldAccessorTable
@@ -545,7 +534,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       pushEndpoint_ = "";
@@ -554,18 +542,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_PushConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.PushConfig getDefaultInstanceForType() {
       return com.google.pubsub.v1.PushConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.PushConfig build() {
       com.google.pubsub.v1.PushConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -574,7 +559,6 @@ public com.google.pubsub.v1.PushConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.PushConfig buildPartial() {
       com.google.pubsub.v1.PushConfig result = new com.google.pubsub.v1.PushConfig(this);
       int from_bitField0_ = bitField0_;
@@ -587,39 +571,32 @@ public com.google.pubsub.v1.PushConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.PushConfig) {
         return mergeFrom((com.google.pubsub.v1.PushConfig)other);
@@ -642,12 +619,10 @@ public Builder mergeFrom(com.google.pubsub.v1.PushConfig other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1016,13 +991,11 @@ public Builder putAllAttributes(
           .putAll(values);
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1044,12 +1017,11 @@ public static com.google.pubsub.v1.PushConfig getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PushConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PushConfig(input, extensionRegistry);
+        return new PushConfig(input, extensionRegistry);
     }
   };
 
@@ -1062,7 +1034,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.PushConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ReceivedMessage.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ReceivedMessage.java
index 911dd5e6bf88..c50f2bfa1310 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ReceivedMessage.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/ReceivedMessage.java
@@ -33,9 +33,6 @@ private ReceivedMessage(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ReceivedMessage(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ReceivedMessage(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ReceivedMessage(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ReceivedMessage_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ReceivedMessage_fieldAccessorTable
@@ -174,7 +170,6 @@ public com.google.pubsub.v1.PubsubMessageOrBuilder getMessageOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -184,7 +179,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getAckIdBytes().isEmpty()) {
@@ -196,7 +190,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -324,7 +317,6 @@ public static com.google.pubsub.v1.ReceivedMessage parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -332,7 +324,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.ReceivedMessage prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -360,7 +351,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ReceivedMessage_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ReceivedMessage_fieldAccessorTable
@@ -383,7 +373,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       ackId_ = "";
@@ -397,18 +386,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_ReceivedMessage_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ReceivedMessage getDefaultInstanceForType() {
       return com.google.pubsub.v1.ReceivedMessage.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ReceivedMessage build() {
       com.google.pubsub.v1.ReceivedMessage result = buildPartial();
       if (!result.isInitialized()) {
@@ -417,7 +403,6 @@ public com.google.pubsub.v1.ReceivedMessage build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.ReceivedMessage buildPartial() {
       com.google.pubsub.v1.ReceivedMessage result = new com.google.pubsub.v1.ReceivedMessage(this);
       result.ackId_ = ackId_;
@@ -430,39 +415,32 @@ public com.google.pubsub.v1.ReceivedMessage buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.ReceivedMessage) {
         return mergeFrom((com.google.pubsub.v1.ReceivedMessage)other);
@@ -486,12 +464,10 @@ public Builder mergeFrom(com.google.pubsub.v1.ReceivedMessage other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -751,13 +727,11 @@ public com.google.pubsub.v1.PubsubMessageOrBuilder getMessageOrBuilder() {
       }
       return messageBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -779,12 +753,11 @@ public static com.google.pubsub.v1.ReceivedMessage getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ReceivedMessage parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReceivedMessage(input, extensionRegistry);
+        return new ReceivedMessage(input, extensionRegistry);
     }
   };
 
@@ -797,7 +770,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.ReceivedMessage getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SeekRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SeekRequest.java
index fbfd4f5b9bad..1fb2babdc68e 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SeekRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SeekRequest.java
@@ -36,9 +36,6 @@ private SeekRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private SeekRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -76,13 +80,6 @@ private SeekRequest(
             target_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -100,7 +97,6 @@ private SeekRequest(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_SeekRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_SeekRequest_fieldAccessorTable
@@ -312,7 +308,6 @@ public java.lang.String getSnapshot() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -322,7 +317,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getSubscriptionBytes().isEmpty()) {
@@ -337,7 +331,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -486,7 +479,6 @@ public static com.google.pubsub.v1.SeekRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -494,7 +486,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.SeekRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -525,7 +516,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_SeekRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_SeekRequest_fieldAccessorTable
@@ -548,7 +538,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       subscription_ = "";
@@ -558,18 +547,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_SeekRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.SeekRequest getDefaultInstanceForType() {
       return com.google.pubsub.v1.SeekRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.SeekRequest build() {
       com.google.pubsub.v1.SeekRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -578,7 +564,6 @@ public com.google.pubsub.v1.SeekRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.SeekRequest buildPartial() {
       com.google.pubsub.v1.SeekRequest result = new com.google.pubsub.v1.SeekRequest(this);
       result.subscription_ = subscription_;
@@ -597,39 +582,32 @@ public com.google.pubsub.v1.SeekRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.SeekRequest) {
         return mergeFrom((com.google.pubsub.v1.SeekRequest)other);
@@ -665,12 +643,10 @@ public Builder mergeFrom(com.google.pubsub.v1.SeekRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1164,13 +1140,11 @@ public Builder setSnapshotBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1192,12 +1166,11 @@ public static com.google.pubsub.v1.SeekRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SeekRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SeekRequest(input, extensionRegistry);
+        return new SeekRequest(input, extensionRegistry);
     }
   };
 
@@ -1210,7 +1183,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.SeekRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SeekResponse.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SeekResponse.java
index 3fd4c8871eb4..deb1a5a59eed 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SeekResponse.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/SeekResponse.java
@@ -28,9 +28,6 @@ private SeekResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -65,7 +62,6 @@ private SeekResponse(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_SeekResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_SeekResponse_fieldAccessorTable
@@ -74,7 +70,6 @@ private SeekResponse(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -84,13 +79,11 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -198,7 +191,6 @@ public static com.google.pubsub.v1.SeekResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -206,7 +198,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.SeekResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -230,7 +221,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_SeekResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_SeekResponse_fieldAccessorTable
@@ -253,24 +243,20 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_SeekResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.SeekResponse getDefaultInstanceForType() {
       return com.google.pubsub.v1.SeekResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.SeekResponse build() {
       com.google.pubsub.v1.SeekResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -279,46 +265,38 @@ public com.google.pubsub.v1.SeekResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.SeekResponse buildPartial() {
       com.google.pubsub.v1.SeekResponse result = new com.google.pubsub.v1.SeekResponse(this);
       onBuilt();
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.SeekResponse) {
         return mergeFrom((com.google.pubsub.v1.SeekResponse)other);
@@ -335,12 +313,10 @@ public Builder mergeFrom(com.google.pubsub.v1.SeekResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -358,13 +334,11 @@ public Builder mergeFrom(
       }
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -386,12 +360,11 @@ public static com.google.pubsub.v1.SeekResponse getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SeekResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SeekResponse(input, extensionRegistry);
+        return new SeekResponse(input, extensionRegistry);
     }
   };
 
@@ -404,7 +377,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.SeekResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Snapshot.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Snapshot.java
index 7c1399f90305..f6d53216d0f0 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Snapshot.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Snapshot.java
@@ -37,9 +37,6 @@ private Snapshot(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private Snapshot(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -89,13 +93,6 @@ private Snapshot(
                 labels__.getKey(), labels__.getValue());
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -114,7 +111,6 @@ private Snapshot(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -125,7 +121,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_Snapshot_fieldAccessorTable
@@ -371,7 +366,6 @@ public java.lang.String getLabelsOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -381,7 +375,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -402,7 +395,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -553,7 +545,6 @@ public static com.google.pubsub.v1.Snapshot parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -561,7 +552,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.Snapshot prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -614,7 +604,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_Snapshot_fieldAccessorTable
@@ -637,7 +626,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -654,18 +642,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_Snapshot_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.Snapshot getDefaultInstanceForType() {
       return com.google.pubsub.v1.Snapshot.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.Snapshot build() {
       com.google.pubsub.v1.Snapshot result = buildPartial();
       if (!result.isInitialized()) {
@@ -674,7 +659,6 @@ public com.google.pubsub.v1.Snapshot build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.Snapshot buildPartial() {
       com.google.pubsub.v1.Snapshot result = new com.google.pubsub.v1.Snapshot(this);
       int from_bitField0_ = bitField0_;
@@ -693,39 +677,32 @@ public com.google.pubsub.v1.Snapshot buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.Snapshot) {
         return mergeFrom((com.google.pubsub.v1.Snapshot)other);
@@ -755,12 +732,10 @@ public Builder mergeFrom(com.google.pubsub.v1.Snapshot other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1342,13 +1317,11 @@ public Builder putAllLabels(
           .putAll(values);
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1370,12 +1343,11 @@ public static com.google.pubsub.v1.Snapshot getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Snapshot parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Snapshot(input, extensionRegistry);
+        return new Snapshot(input, extensionRegistry);
     }
   };
 
@@ -1388,7 +1360,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.Snapshot getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/StreamingPullRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/StreamingPullRequest.java
index 11df06758c2c..ff90912ace24 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/StreamingPullRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/StreamingPullRequest.java
@@ -39,9 +39,6 @@ private StreamingPullRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private StreamingPullRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -103,13 +107,6 @@ private StreamingPullRequest(
             streamAckDeadlineSeconds_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -136,7 +133,6 @@ private StreamingPullRequest(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_StreamingPullRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_StreamingPullRequest_fieldAccessorTable
@@ -397,7 +393,6 @@ public int getStreamAckDeadlineSeconds() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -407,7 +402,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     getSerializedSize();
@@ -433,7 +427,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -604,7 +597,6 @@ public static com.google.pubsub.v1.StreamingPullRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -612,7 +604,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.StreamingPullRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -642,7 +633,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_StreamingPullRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_StreamingPullRequest_fieldAccessorTable
@@ -665,7 +655,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       subscription_ = "";
@@ -681,18 +670,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_StreamingPullRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.StreamingPullRequest getDefaultInstanceForType() {
       return com.google.pubsub.v1.StreamingPullRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.StreamingPullRequest build() {
       com.google.pubsub.v1.StreamingPullRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -701,7 +687,6 @@ public com.google.pubsub.v1.StreamingPullRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.StreamingPullRequest buildPartial() {
       com.google.pubsub.v1.StreamingPullRequest result = new com.google.pubsub.v1.StreamingPullRequest(this);
       int from_bitField0_ = bitField0_;
@@ -728,39 +713,32 @@ public com.google.pubsub.v1.StreamingPullRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.StreamingPullRequest) {
         return mergeFrom((com.google.pubsub.v1.StreamingPullRequest)other);
@@ -814,12 +792,10 @@ public Builder mergeFrom(com.google.pubsub.v1.StreamingPullRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1485,13 +1461,11 @@ public Builder clearStreamAckDeadlineSeconds() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1513,12 +1487,11 @@ public static com.google.pubsub.v1.StreamingPullRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public StreamingPullRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StreamingPullRequest(input, extensionRegistry);
+        return new StreamingPullRequest(input, extensionRegistry);
     }
   };
 
@@ -1531,7 +1504,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.StreamingPullRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/StreamingPullResponse.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/StreamingPullResponse.java
index fd6e40943b9b..4e460e8a2b17 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/StreamingPullResponse.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/StreamingPullResponse.java
@@ -34,9 +34,6 @@ private StreamingPullResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private StreamingPullResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               receivedMessages_ = new java.util.ArrayList();
@@ -57,13 +61,6 @@ private StreamingPullResponse(
                 input.readMessage(com.google.pubsub.v1.ReceivedMessage.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private StreamingPullResponse(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_StreamingPullResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_StreamingPullResponse_fieldAccessorTable
@@ -148,7 +144,6 @@ public com.google.pubsub.v1.ReceivedMessageOrBuilder getReceivedMessagesOrBuilde
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -158,7 +153,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < receivedMessages_.size(); i++) {
@@ -167,7 +161,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -285,7 +278,6 @@ public static com.google.pubsub.v1.StreamingPullResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -293,7 +285,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.StreamingPullResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -322,7 +313,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_StreamingPullResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_StreamingPullResponse_fieldAccessorTable
@@ -346,7 +336,6 @@ private void maybeForceBuilderInitialization() {
         getReceivedMessagesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (receivedMessagesBuilder_ == null) {
@@ -358,18 +347,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_StreamingPullResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.StreamingPullResponse getDefaultInstanceForType() {
       return com.google.pubsub.v1.StreamingPullResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.StreamingPullResponse build() {
       com.google.pubsub.v1.StreamingPullResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -378,7 +364,6 @@ public com.google.pubsub.v1.StreamingPullResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.StreamingPullResponse buildPartial() {
       com.google.pubsub.v1.StreamingPullResponse result = new com.google.pubsub.v1.StreamingPullResponse(this);
       int from_bitField0_ = bitField0_;
@@ -395,39 +380,32 @@ public com.google.pubsub.v1.StreamingPullResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.StreamingPullResponse) {
         return mergeFrom((com.google.pubsub.v1.StreamingPullResponse)other);
@@ -470,12 +448,10 @@ public Builder mergeFrom(com.google.pubsub.v1.StreamingPullResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -806,13 +782,11 @@ public com.google.pubsub.v1.ReceivedMessage.Builder addReceivedMessagesBuilder(
       }
       return receivedMessagesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -834,12 +808,11 @@ public static com.google.pubsub.v1.StreamingPullResponse getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public StreamingPullResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StreamingPullResponse(input, extensionRegistry);
+        return new StreamingPullResponse(input, extensionRegistry);
     }
   };
 
@@ -852,7 +825,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.StreamingPullResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Subscription.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Subscription.java
index bfe88e6107ee..ba7cadbffadd 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Subscription.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Subscription.java
@@ -36,9 +36,6 @@ private Subscription(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private Subscription(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -111,13 +115,6 @@ private Subscription(
                 labels__.getKey(), labels__.getValue());
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -136,7 +133,6 @@ private Subscription(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -147,7 +143,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_Subscription_fieldAccessorTable
@@ -493,7 +488,6 @@ public java.lang.String getLabelsOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -503,7 +497,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -533,7 +526,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -714,7 +706,6 @@ public static com.google.pubsub.v1.Subscription parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -722,7 +713,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.Subscription prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -772,7 +762,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_Subscription_fieldAccessorTable
@@ -795,7 +784,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -822,18 +810,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_Subscription_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.Subscription getDefaultInstanceForType() {
       return com.google.pubsub.v1.Subscription.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.Subscription build() {
       com.google.pubsub.v1.Subscription result = buildPartial();
       if (!result.isInitialized()) {
@@ -842,7 +827,6 @@ public com.google.pubsub.v1.Subscription build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.Subscription buildPartial() {
       com.google.pubsub.v1.Subscription result = new com.google.pubsub.v1.Subscription(this);
       int from_bitField0_ = bitField0_;
@@ -868,39 +852,32 @@ public com.google.pubsub.v1.Subscription buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.Subscription) {
         return mergeFrom((com.google.pubsub.v1.Subscription)other);
@@ -939,12 +916,10 @@ public Builder mergeFrom(com.google.pubsub.v1.Subscription other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1870,13 +1845,11 @@ public Builder putAllLabels(
           .putAll(values);
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1898,12 +1871,11 @@ public static com.google.pubsub.v1.Subscription getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Subscription parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Subscription(input, extensionRegistry);
+        return new Subscription(input, extensionRegistry);
     }
   };
 
@@ -1916,7 +1888,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.Subscription getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Topic.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Topic.java
index 07b861121aeb..ab8d006b6c29 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Topic.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/Topic.java
@@ -33,9 +33,6 @@ private Topic(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private Topic(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -79,13 +83,6 @@ private Topic(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private Topic(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -115,7 +111,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_Topic_fieldAccessorTable
@@ -317,7 +312,6 @@ public com.google.pubsub.v1.MessageStoragePolicyOrBuilder getMessageStoragePolic
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -327,7 +321,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -345,7 +338,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -489,7 +481,6 @@ public static com.google.pubsub.v1.Topic parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -497,7 +488,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.Topic prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -547,7 +537,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_Topic_fieldAccessorTable
@@ -570,7 +559,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -585,18 +573,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_Topic_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.Topic getDefaultInstanceForType() {
       return com.google.pubsub.v1.Topic.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.Topic build() {
       com.google.pubsub.v1.Topic result = buildPartial();
       if (!result.isInitialized()) {
@@ -605,7 +590,6 @@ public com.google.pubsub.v1.Topic build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.Topic buildPartial() {
       com.google.pubsub.v1.Topic result = new com.google.pubsub.v1.Topic(this);
       int from_bitField0_ = bitField0_;
@@ -623,39 +607,32 @@ public com.google.pubsub.v1.Topic buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.Topic) {
         return mergeFrom((com.google.pubsub.v1.Topic)other);
@@ -681,12 +658,10 @@ public Builder mergeFrom(com.google.pubsub.v1.Topic other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1168,13 +1143,11 @@ public com.google.pubsub.v1.MessageStoragePolicyOrBuilder getMessageStoragePolic
       }
       return messageStoragePolicyBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1196,12 +1169,11 @@ public static com.google.pubsub.v1.Topic getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Topic parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Topic(input, extensionRegistry);
+        return new Topic(input, extensionRegistry);
     }
   };
 
@@ -1214,7 +1186,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.Topic getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateSnapshotRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateSnapshotRequest.java
index 454443468ba2..a678b4e8e01d 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateSnapshotRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateSnapshotRequest.java
@@ -35,9 +35,6 @@ private UpdateSnapshotRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private UpdateSnapshotRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.pubsub.v1.Snapshot.Builder subBuilder = null;
             if (snapshot_ != null) {
@@ -75,13 +79,6 @@ private UpdateSnapshotRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -99,7 +96,6 @@ private UpdateSnapshotRequest(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_UpdateSnapshotRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_UpdateSnapshotRequest_fieldAccessorTable
@@ -177,7 +173,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -187,7 +182,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (snapshot_ != null) {
@@ -199,7 +193,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -333,7 +326,6 @@ public static com.google.pubsub.v1.UpdateSnapshotRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -341,7 +333,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.UpdateSnapshotRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -372,7 +363,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_UpdateSnapshotRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_UpdateSnapshotRequest_fieldAccessorTable
@@ -395,7 +385,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (snapshotBuilder_ == null) {
@@ -413,18 +402,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_UpdateSnapshotRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.UpdateSnapshotRequest getDefaultInstanceForType() {
       return com.google.pubsub.v1.UpdateSnapshotRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.UpdateSnapshotRequest build() {
       com.google.pubsub.v1.UpdateSnapshotRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -433,7 +419,6 @@ public com.google.pubsub.v1.UpdateSnapshotRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.UpdateSnapshotRequest buildPartial() {
       com.google.pubsub.v1.UpdateSnapshotRequest result = new com.google.pubsub.v1.UpdateSnapshotRequest(this);
       if (snapshotBuilder_ == null) {
@@ -450,39 +435,32 @@ public com.google.pubsub.v1.UpdateSnapshotRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.UpdateSnapshotRequest) {
         return mergeFrom((com.google.pubsub.v1.UpdateSnapshotRequest)other);
@@ -505,12 +483,10 @@ public Builder mergeFrom(com.google.pubsub.v1.UpdateSnapshotRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -843,13 +819,11 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
       }
       return updateMaskBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -871,12 +845,11 @@ public static com.google.pubsub.v1.UpdateSnapshotRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateSnapshotRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateSnapshotRequest(input, extensionRegistry);
+        return new UpdateSnapshotRequest(input, extensionRegistry);
     }
   };
 
@@ -889,7 +862,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.UpdateSnapshotRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateSubscriptionRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateSubscriptionRequest.java
index 83413ab9760b..c15df7942b7d 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateSubscriptionRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateSubscriptionRequest.java
@@ -32,9 +32,6 @@ private UpdateSubscriptionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private UpdateSubscriptionRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.pubsub.v1.Subscription.Builder subBuilder = null;
             if (subscription_ != null) {
@@ -72,13 +76,6 @@ private UpdateSubscriptionRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private UpdateSubscriptionRequest(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_UpdateSubscriptionRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_UpdateSubscriptionRequest_fieldAccessorTable
@@ -174,7 +170,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -184,7 +179,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (subscription_ != null) {
@@ -196,7 +190,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -330,7 +323,6 @@ public static com.google.pubsub.v1.UpdateSubscriptionRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -338,7 +330,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.UpdateSubscriptionRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -366,7 +357,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_UpdateSubscriptionRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_UpdateSubscriptionRequest_fieldAccessorTable
@@ -389,7 +379,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (subscriptionBuilder_ == null) {
@@ -407,18 +396,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_UpdateSubscriptionRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.UpdateSubscriptionRequest getDefaultInstanceForType() {
       return com.google.pubsub.v1.UpdateSubscriptionRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.UpdateSubscriptionRequest build() {
       com.google.pubsub.v1.UpdateSubscriptionRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -427,7 +413,6 @@ public com.google.pubsub.v1.UpdateSubscriptionRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.UpdateSubscriptionRequest buildPartial() {
       com.google.pubsub.v1.UpdateSubscriptionRequest result = new com.google.pubsub.v1.UpdateSubscriptionRequest(this);
       if (subscriptionBuilder_ == null) {
@@ -444,39 +429,32 @@ public com.google.pubsub.v1.UpdateSubscriptionRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.UpdateSubscriptionRequest) {
         return mergeFrom((com.google.pubsub.v1.UpdateSubscriptionRequest)other);
@@ -499,12 +477,10 @@ public Builder mergeFrom(com.google.pubsub.v1.UpdateSubscriptionRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -837,13 +813,11 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
       }
       return updateMaskBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -865,12 +839,11 @@ public static com.google.pubsub.v1.UpdateSubscriptionRequest getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateSubscriptionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateSubscriptionRequest(input, extensionRegistry);
+        return new UpdateSubscriptionRequest(input, extensionRegistry);
     }
   };
 
@@ -883,7 +856,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.UpdateSubscriptionRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateTopicRequest.java b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateTopicRequest.java
index ba77db8ac8b5..57d809e7b338 100644
--- a/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateTopicRequest.java
+++ b/google-api-grpc/proto-google-cloud-pubsub-v1/src/main/java/com/google/pubsub/v1/UpdateTopicRequest.java
@@ -32,9 +32,6 @@ private UpdateTopicRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private UpdateTopicRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.pubsub.v1.Topic.Builder subBuilder = null;
             if (topic_ != null) {
@@ -72,13 +76,6 @@ private UpdateTopicRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private UpdateTopicRequest(
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_UpdateTopicRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_UpdateTopicRequest_fieldAccessorTable
@@ -183,7 +179,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -193,7 +188,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (topic_ != null) {
@@ -205,7 +199,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -339,7 +332,6 @@ public static com.google.pubsub.v1.UpdateTopicRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -347,7 +339,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.pubsub.v1.UpdateTopicRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -375,7 +366,6 @@ public static final class Builder extends
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_UpdateTopicRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_UpdateTopicRequest_fieldAccessorTable
@@ -398,7 +388,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (topicBuilder_ == null) {
@@ -416,18 +405,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.pubsub.v1.PubsubProto.internal_static_google_pubsub_v1_UpdateTopicRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.UpdateTopicRequest getDefaultInstanceForType() {
       return com.google.pubsub.v1.UpdateTopicRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.UpdateTopicRequest build() {
       com.google.pubsub.v1.UpdateTopicRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -436,7 +422,6 @@ public com.google.pubsub.v1.UpdateTopicRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.pubsub.v1.UpdateTopicRequest buildPartial() {
       com.google.pubsub.v1.UpdateTopicRequest result = new com.google.pubsub.v1.UpdateTopicRequest(this);
       if (topicBuilder_ == null) {
@@ -453,39 +438,32 @@ public com.google.pubsub.v1.UpdateTopicRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.pubsub.v1.UpdateTopicRequest) {
         return mergeFrom((com.google.pubsub.v1.UpdateTopicRequest)other);
@@ -508,12 +486,10 @@ public Builder mergeFrom(com.google.pubsub.v1.UpdateTopicRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -873,13 +849,11 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
       }
       return updateMaskBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -901,12 +875,11 @@ public static com.google.pubsub.v1.UpdateTopicRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateTopicRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateTopicRequest(input, extensionRegistry);
+        return new UpdateTopicRequest(input, extensionRegistry);
     }
   };
 
@@ -919,7 +892,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.pubsub.v1.UpdateTopicRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisServiceBetaProto.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisServiceBetaProto.java
index 200a261d78e8..d8c4dc026e70 100644
--- a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisServiceBetaProto.java
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CloudRedisServiceBetaProto.java
@@ -92,7 +92,7 @@ public static void registerAllExtensions(
       "isplay_name\030\002 \001(\t\022@\n\006labels\030\003 \003(\01320.goog" +
       "le.cloud.redis.v1beta1.Instance.LabelsEn" +
       "try\022\023\n\013location_id\030\004 \001(\t\022\037\n\027alternative_" +
-      "location_id\030\005 \001(\t\022\025\n\rredis_version\030\007 \001(\t" +
+      "location_id\030\005 \001(\t\022\025\n\rredis_version\030\007 \001(\t",
       "\022\031\n\021reserved_ip_range\030\t \001(\t\022\014\n\004host\030\n \001(" +
       "\t\022\014\n\004port\030\013 \001(\005\022\033\n\023current_location_id\030\014" +
       " \001(\t\022/\n\013create_time\030\r \001(\0132\032.google.proto" +
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "6.google.cloud.redis.v1beta1.Instance.Re" +
       "disConfigsEntry\0227\n\004tier\030\021 \001(\0162).google.c" +
       "loud.redis.v1beta1.Instance.Tier\022\026\n\016memo" +
-      "ry_size_gb\030\022 \001(\005\022\032\n\022authorized_network\030\024" +
+      "ry_size_gb\030\022 \001(\005\022\032\n\022authorized_network\030\024",
       " \001(\t\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005valu" +
       "e\030\002 \001(\t:\0028\001\0323\n\021RedisConfigsEntry\022\013\n\003key\030" +
       "\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"s\n\005State\022\025\n\021STA" +
@@ -112,7 +112,7 @@ public static void registerAllExtensions(
       "SPECIFIED\020\000\022\t\n\005BASIC\020\001\022\017\n\013STANDARD_HA\020\003\"" +
       "M\n\024ListInstancesRequest\022\016\n\006parent\030\001 \001(\t\022" +
       "\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\"i" +
-      "\n\025ListInstancesResponse\0227\n\tinstances\030\001 \003" +
+      "\n\025ListInstancesResponse\0227\n\tinstances\030\001 \003",
       "(\0132$.google.cloud.redis.v1beta1.Instance" +
       "\022\027\n\017next_page_token\030\002 \001(\t\"\"\n\022GetInstance" +
       "Request\022\014\n\004name\030\001 \001(\t\"t\n\025CreateInstanceR" +
@@ -122,7 +122,7 @@ public static void registerAllExtensions(
       "quest\022/\n\013update_mask\030\001 \001(\0132\032.google.prot" +
       "obuf.FieldMask\0226\n\010instance\030\002 \001(\0132$.googl" +
       "e.cloud.redis.v1beta1.Instance\"%\n\025Delete" +
-      "InstanceRequest\022\014\n\004name\030\001 \001(\t\"\316\001\n\020Locati" +
+      "InstanceRequest\022\014\n\004name\030\001 \001(\t\"\316\001\n\020Locati",
       "onMetadata\022Y\n\017available_zones\030\001 \003(\0132@.go" +
       "ogle.cloud.redis.v1beta1.LocationMetadat" +
       "a.AvailableZonesEntry\032_\n\023AvailableZonesE" +
@@ -132,7 +132,7 @@ public static void registerAllExtensions(
       "stances\0220.google.cloud.redis.v1beta1.Lis" +
       "tInstancesRequest\0321.google.cloud.redis.v" +
       "1beta1.ListInstancesResponse\":\202\323\344\223\0024\0222/v" +
-      "1beta1/{parent=projects/*/locations/*}/i" +
+      "1beta1/{parent=projects/*/locations/*}/i",
       "nstances\022\237\001\n\013GetInstance\022..google.cloud." +
       "redis.v1beta1.GetInstanceRequest\032$.googl" +
       "e.cloud.redis.v1beta1.Instance\":\202\323\344\223\0024\0222" +
@@ -142,7 +142,7 @@ public static void registerAllExtensions(
       "\032\035.google.longrunning.Operation\"D\202\323\344\223\002>\"" +
       "2/v1beta1/{parent=projects/*/locations/*" +
       "}/instances:\010instance\022\261\001\n\016UpdateInstance" +
-      "\0221.google.cloud.redis.v1beta1.UpdateInst" +
+      "\0221.google.cloud.redis.v1beta1.UpdateInst",
       "anceRequest\032\035.google.longrunning.Operati" +
       "on\"M\202\323\344\223\002G2;/v1beta1/{instance.name=proj" +
       "ects/*/locations/*/instances/*}:\010instanc" +
@@ -152,7 +152,7 @@ public static void registerAllExtensions(
       "/{name=projects/*/locations/*/instances/" +
       "*}B\177\n\036com.google.cloud.redis.v1beta1B\032Cl" +
       "oudRedisServiceBetaProtoP\001Z?google.golan" +
-      "g.org/genproto/googleapis/cloud/redis/v1" +
+      "g.org/genproto/googleapis/cloud/redis/v1",
       "beta1;redisb\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CreateInstanceRequest.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CreateInstanceRequest.java
index c053ed617ac6..d745a53d2bc6 100644
--- a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CreateInstanceRequest.java
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/CreateInstanceRequest.java
@@ -34,9 +34,6 @@ private CreateInstanceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private CreateInstanceRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private CreateInstanceRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private CreateInstanceRequest(
     return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_CreateInstanceRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_CreateInstanceRequest_fieldAccessorTable
@@ -239,7 +235,6 @@ public com.google.cloud.redis.v1beta1.InstanceOrBuilder getInstanceOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -249,7 +244,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -264,7 +258,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -399,7 +392,6 @@ public static com.google.cloud.redis.v1beta1.CreateInstanceRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -407,7 +399,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.redis.v1beta1.CreateInstanceRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -435,7 +426,6 @@ public static final class Builder extends
       return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_CreateInstanceRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_CreateInstanceRequest_fieldAccessorTable
@@ -458,7 +448,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -474,18 +463,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_CreateInstanceRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.redis.v1beta1.CreateInstanceRequest getDefaultInstanceForType() {
       return com.google.cloud.redis.v1beta1.CreateInstanceRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.redis.v1beta1.CreateInstanceRequest build() {
       com.google.cloud.redis.v1beta1.CreateInstanceRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -494,7 +480,6 @@ public com.google.cloud.redis.v1beta1.CreateInstanceRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.redis.v1beta1.CreateInstanceRequest buildPartial() {
       com.google.cloud.redis.v1beta1.CreateInstanceRequest result = new com.google.cloud.redis.v1beta1.CreateInstanceRequest(this);
       result.parent_ = parent_;
@@ -508,39 +493,32 @@ public com.google.cloud.redis.v1beta1.CreateInstanceRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.redis.v1beta1.CreateInstanceRequest) {
         return mergeFrom((com.google.cloud.redis.v1beta1.CreateInstanceRequest)other);
@@ -568,12 +546,10 @@ public Builder mergeFrom(com.google.cloud.redis.v1beta1.CreateInstanceRequest ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -962,13 +938,11 @@ public com.google.cloud.redis.v1beta1.InstanceOrBuilder getInstanceOrBuilder() {
       }
       return instanceBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -990,12 +964,11 @@ public static com.google.cloud.redis.v1beta1.CreateInstanceRequest getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateInstanceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateInstanceRequest(input, extensionRegistry);
+        return new CreateInstanceRequest(input, extensionRegistry);
     }
   };
 
@@ -1008,7 +981,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.redis.v1beta1.CreateInstanceRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/DeleteInstanceRequest.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/DeleteInstanceRequest.java
index c1c9bc6eb9b4..f15a313d9770 100644
--- a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/DeleteInstanceRequest.java
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/DeleteInstanceRequest.java
@@ -33,9 +33,6 @@ private DeleteInstanceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteInstanceRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteInstanceRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteInstanceRequest(
     return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_DeleteInstanceRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_DeleteInstanceRequest_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.redis.v1beta1.DeleteInstanceRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.redis.v1beta1.DeleteInstanceRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_DeleteInstanceRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_DeleteInstanceRequest_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_DeleteInstanceRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.redis.v1beta1.DeleteInstanceRequest getDefaultInstanceForType() {
       return com.google.cloud.redis.v1beta1.DeleteInstanceRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.redis.v1beta1.DeleteInstanceRequest build() {
       com.google.cloud.redis.v1beta1.DeleteInstanceRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.redis.v1beta1.DeleteInstanceRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.redis.v1beta1.DeleteInstanceRequest buildPartial() {
       com.google.cloud.redis.v1beta1.DeleteInstanceRequest result = new com.google.cloud.redis.v1beta1.DeleteInstanceRequest(this);
       result.name_ = name_;
@@ -361,39 +346,32 @@ public com.google.cloud.redis.v1beta1.DeleteInstanceRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.redis.v1beta1.DeleteInstanceRequest) {
         return mergeFrom((com.google.cloud.redis.v1beta1.DeleteInstanceRequest)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.redis.v1beta1.DeleteInstanceRequest ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.redis.v1beta1.DeleteInstanceRequest getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteInstanceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteInstanceRequest(input, extensionRegistry);
+        return new DeleteInstanceRequest(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.redis.v1beta1.DeleteInstanceRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/GetInstanceRequest.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/GetInstanceRequest.java
index 40bef4117be8..44f705b13ce1 100644
--- a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/GetInstanceRequest.java
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/GetInstanceRequest.java
@@ -33,9 +33,6 @@ private GetInstanceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetInstanceRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetInstanceRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetInstanceRequest(
     return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_GetInstanceRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_GetInstanceRequest_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.redis.v1beta1.GetInstanceRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.redis.v1beta1.GetInstanceRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_GetInstanceRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_GetInstanceRequest_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_GetInstanceRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.redis.v1beta1.GetInstanceRequest getDefaultInstanceForType() {
       return com.google.cloud.redis.v1beta1.GetInstanceRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.redis.v1beta1.GetInstanceRequest build() {
       com.google.cloud.redis.v1beta1.GetInstanceRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.redis.v1beta1.GetInstanceRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.redis.v1beta1.GetInstanceRequest buildPartial() {
       com.google.cloud.redis.v1beta1.GetInstanceRequest result = new com.google.cloud.redis.v1beta1.GetInstanceRequest(this);
       result.name_ = name_;
@@ -361,39 +346,32 @@ public com.google.cloud.redis.v1beta1.GetInstanceRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.redis.v1beta1.GetInstanceRequest) {
         return mergeFrom((com.google.cloud.redis.v1beta1.GetInstanceRequest)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.redis.v1beta1.GetInstanceRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.redis.v1beta1.GetInstanceRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetInstanceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetInstanceRequest(input, extensionRegistry);
+        return new GetInstanceRequest(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.redis.v1beta1.GetInstanceRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/Instance.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/Instance.java
index 7f63f7faad29..2682d0dc5366 100644
--- a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/Instance.java
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/Instance.java
@@ -46,9 +46,6 @@ private Instance(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -60,6 +57,13 @@ private Instance(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -181,13 +185,6 @@ private Instance(
             authorizedNetwork_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -206,7 +203,6 @@ private Instance(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -219,7 +215,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_Instance_fieldAccessorTable
@@ -1110,7 +1105,6 @@ public int getStateValue() {
    * .google.cloud.redis.v1beta1.Instance.State state = 14;
    */
   public com.google.cloud.redis.v1beta1.Instance.State getState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.redis.v1beta1.Instance.State result = com.google.cloud.redis.v1beta1.Instance.State.valueOf(state_);
     return result == null ? com.google.cloud.redis.v1beta1.Instance.State.UNRECOGNIZED : result;
   }
@@ -1287,7 +1281,6 @@ public int getTierValue() {
    * .google.cloud.redis.v1beta1.Instance.Tier tier = 17;
    */
   public com.google.cloud.redis.v1beta1.Instance.Tier getTier() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.redis.v1beta1.Instance.Tier result = com.google.cloud.redis.v1beta1.Instance.Tier.valueOf(tier_);
     return result == null ? com.google.cloud.redis.v1beta1.Instance.Tier.UNRECOGNIZED : result;
   }
@@ -1354,7 +1347,6 @@ public java.lang.String getAuthorizedNetwork() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1364,7 +1356,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -1427,7 +1418,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1680,7 +1670,6 @@ public static com.google.cloud.redis.v1beta1.Instance parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1688,7 +1677,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.redis.v1beta1.Instance prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1742,7 +1730,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_Instance_fieldAccessorTable
@@ -1765,7 +1752,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -1807,18 +1793,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_Instance_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.redis.v1beta1.Instance getDefaultInstanceForType() {
       return com.google.cloud.redis.v1beta1.Instance.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.redis.v1beta1.Instance build() {
       com.google.cloud.redis.v1beta1.Instance result = buildPartial();
       if (!result.isInitialized()) {
@@ -1827,7 +1810,6 @@ public com.google.cloud.redis.v1beta1.Instance build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.redis.v1beta1.Instance buildPartial() {
       com.google.cloud.redis.v1beta1.Instance result = new com.google.cloud.redis.v1beta1.Instance(this);
       int from_bitField0_ = bitField0_;
@@ -1860,39 +1842,32 @@ public com.google.cloud.redis.v1beta1.Instance buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.redis.v1beta1.Instance) {
         return mergeFrom((com.google.cloud.redis.v1beta1.Instance)other);
@@ -1968,12 +1943,10 @@ public Builder mergeFrom(com.google.cloud.redis.v1beta1.Instance other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3188,7 +3161,6 @@ public Builder setStateValue(int value) {
      * .google.cloud.redis.v1beta1.Instance.State state = 14;
      */
     public com.google.cloud.redis.v1beta1.Instance.State getState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.redis.v1beta1.Instance.State result = com.google.cloud.redis.v1beta1.Instance.State.valueOf(state_);
       return result == null ? com.google.cloud.redis.v1beta1.Instance.State.UNRECOGNIZED : result;
     }
@@ -3526,7 +3498,6 @@ public Builder setTierValue(int value) {
      * .google.cloud.redis.v1beta1.Instance.Tier tier = 17;
      */
     public com.google.cloud.redis.v1beta1.Instance.Tier getTier() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.redis.v1beta1.Instance.Tier result = com.google.cloud.redis.v1beta1.Instance.Tier.valueOf(tier_);
       return result == null ? com.google.cloud.redis.v1beta1.Instance.Tier.UNRECOGNIZED : result;
     }
@@ -3701,13 +3672,11 @@ public Builder setAuthorizedNetworkBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -3729,12 +3698,11 @@ public static com.google.cloud.redis.v1beta1.Instance getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Instance parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Instance(input, extensionRegistry);
+        return new Instance(input, extensionRegistry);
     }
   };
 
@@ -3747,7 +3715,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.redis.v1beta1.Instance getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesRequest.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesRequest.java
index 0bbddec83b71..c3b5caa8553d 100644
--- a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesRequest.java
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesRequest.java
@@ -35,9 +35,6 @@ private ListInstancesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListInstancesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ListInstancesRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListInstancesRequest(
     return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_ListInstancesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_ListInstancesRequest_fieldAccessorTable
@@ -207,7 +203,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -217,7 +212,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -232,7 +226,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -362,7 +355,6 @@ public static com.google.cloud.redis.v1beta1.ListInstancesRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -370,7 +362,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.redis.v1beta1.ListInstancesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -398,7 +389,6 @@ public static final class Builder extends
       return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_ListInstancesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_ListInstancesRequest_fieldAccessorTable
@@ -421,7 +411,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -433,18 +422,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_ListInstancesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.redis.v1beta1.ListInstancesRequest getDefaultInstanceForType() {
       return com.google.cloud.redis.v1beta1.ListInstancesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.redis.v1beta1.ListInstancesRequest build() {
       com.google.cloud.redis.v1beta1.ListInstancesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -453,7 +439,6 @@ public com.google.cloud.redis.v1beta1.ListInstancesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.redis.v1beta1.ListInstancesRequest buildPartial() {
       com.google.cloud.redis.v1beta1.ListInstancesRequest result = new com.google.cloud.redis.v1beta1.ListInstancesRequest(this);
       result.parent_ = parent_;
@@ -463,39 +448,32 @@ public com.google.cloud.redis.v1beta1.ListInstancesRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.redis.v1beta1.ListInstancesRequest) {
         return mergeFrom((com.google.cloud.redis.v1beta1.ListInstancesRequest)other);
@@ -523,12 +501,10 @@ public Builder mergeFrom(com.google.cloud.redis.v1beta1.ListInstancesRequest oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -792,13 +768,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -820,12 +794,11 @@ public static com.google.cloud.redis.v1beta1.ListInstancesRequest getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListInstancesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListInstancesRequest(input, extensionRegistry);
+        return new ListInstancesRequest(input, extensionRegistry);
     }
   };
 
@@ -838,7 +811,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.redis.v1beta1.ListInstancesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesResponse.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesResponse.java
index b6935cd3d2fc..02bc1b058c68 100644
--- a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesResponse.java
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ListInstancesResponse.java
@@ -34,9 +34,6 @@ private ListInstancesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListInstancesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               instances_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListInstancesResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListInstancesResponse(
     return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_ListInstancesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_ListInstancesResponse_fieldAccessorTable
@@ -239,7 +235,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -249,7 +244,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < instances_.size(); i++) {
@@ -261,7 +255,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -386,7 +379,6 @@ public static com.google.cloud.redis.v1beta1.ListInstancesResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -394,7 +386,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.redis.v1beta1.ListInstancesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -422,7 +413,6 @@ public static final class Builder extends
       return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_ListInstancesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_ListInstancesResponse_fieldAccessorTable
@@ -446,7 +436,6 @@ private void maybeForceBuilderInitialization() {
         getInstancesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (instancesBuilder_ == null) {
@@ -460,18 +449,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_ListInstancesResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.redis.v1beta1.ListInstancesResponse getDefaultInstanceForType() {
       return com.google.cloud.redis.v1beta1.ListInstancesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.redis.v1beta1.ListInstancesResponse build() {
       com.google.cloud.redis.v1beta1.ListInstancesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -480,7 +466,6 @@ public com.google.cloud.redis.v1beta1.ListInstancesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.redis.v1beta1.ListInstancesResponse buildPartial() {
       com.google.cloud.redis.v1beta1.ListInstancesResponse result = new com.google.cloud.redis.v1beta1.ListInstancesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -500,39 +485,32 @@ public com.google.cloud.redis.v1beta1.ListInstancesResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.redis.v1beta1.ListInstancesResponse) {
         return mergeFrom((com.google.cloud.redis.v1beta1.ListInstancesResponse)other);
@@ -579,12 +557,10 @@ public Builder mergeFrom(com.google.cloud.redis.v1beta1.ListInstancesResponse ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1153,13 +1129,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1181,12 +1155,11 @@ public static com.google.cloud.redis.v1beta1.ListInstancesResponse getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListInstancesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListInstancesResponse(input, extensionRegistry);
+        return new ListInstancesResponse(input, extensionRegistry);
     }
   };
 
@@ -1199,7 +1172,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.redis.v1beta1.ListInstancesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/LocationMetadata.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/LocationMetadata.java
index 7f51736dbde4..a95b6f3af113 100644
--- a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/LocationMetadata.java
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/LocationMetadata.java
@@ -35,9 +35,6 @@ private LocationMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private LocationMetadata(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               availableZones_ = com.google.protobuf.MapField.newMapField(
@@ -62,13 +66,6 @@ private LocationMetadata(
                 availableZones__.getKey(), availableZones__.getValue());
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -87,7 +84,6 @@ private LocationMetadata(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -98,7 +94,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_LocationMetadata_fieldAccessorTable
@@ -211,7 +206,6 @@ public com.google.cloud.redis.v1beta1.ZoneMetadata getAvailableZonesOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -221,7 +215,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     com.google.protobuf.GeneratedMessageV3
@@ -233,7 +226,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -357,7 +349,6 @@ public static com.google.cloud.redis.v1beta1.LocationMetadata parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -365,7 +356,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.redis.v1beta1.LocationMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -418,7 +408,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_LocationMetadata_fieldAccessorTable
@@ -441,25 +430,21 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       internalGetMutableAvailableZones().clear();
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_LocationMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.redis.v1beta1.LocationMetadata getDefaultInstanceForType() {
       return com.google.cloud.redis.v1beta1.LocationMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.redis.v1beta1.LocationMetadata build() {
       com.google.cloud.redis.v1beta1.LocationMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -468,7 +453,6 @@ public com.google.cloud.redis.v1beta1.LocationMetadata build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.redis.v1beta1.LocationMetadata buildPartial() {
       com.google.cloud.redis.v1beta1.LocationMetadata result = new com.google.cloud.redis.v1beta1.LocationMetadata(this);
       int from_bitField0_ = bitField0_;
@@ -478,39 +462,32 @@ public com.google.cloud.redis.v1beta1.LocationMetadata buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.redis.v1beta1.LocationMetadata) {
         return mergeFrom((com.google.cloud.redis.v1beta1.LocationMetadata)other);
@@ -529,12 +506,10 @@ public Builder mergeFrom(com.google.cloud.redis.v1beta1.LocationMetadata other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -725,13 +700,11 @@ public Builder putAllAvailableZones(
           .putAll(values);
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -753,12 +726,11 @@ public static com.google.cloud.redis.v1beta1.LocationMetadata getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LocationMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LocationMetadata(input, extensionRegistry);
+        return new LocationMetadata(input, extensionRegistry);
     }
   };
 
@@ -771,7 +743,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.redis.v1beta1.LocationMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/UpdateInstanceRequest.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/UpdateInstanceRequest.java
index e2b418379e6b..202432e34715 100644
--- a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/UpdateInstanceRequest.java
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/UpdateInstanceRequest.java
@@ -32,9 +32,6 @@ private UpdateInstanceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private UpdateInstanceRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.protobuf.FieldMask.Builder subBuilder = null;
             if (updateMask_ != null) {
@@ -72,13 +76,6 @@ private UpdateInstanceRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private UpdateInstanceRequest(
     return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_UpdateInstanceRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_UpdateInstanceRequest_fieldAccessorTable
@@ -192,7 +188,6 @@ public com.google.cloud.redis.v1beta1.InstanceOrBuilder getInstanceOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -202,7 +197,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (updateMask_ != null) {
@@ -214,7 +208,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.cloud.redis.v1beta1.UpdateInstanceRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.redis.v1beta1.UpdateInstanceRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_UpdateInstanceRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_UpdateInstanceRequest_fieldAccessorTable
@@ -407,7 +397,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (updateMaskBuilder_ == null) {
@@ -425,18 +414,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_UpdateInstanceRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.redis.v1beta1.UpdateInstanceRequest getDefaultInstanceForType() {
       return com.google.cloud.redis.v1beta1.UpdateInstanceRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.redis.v1beta1.UpdateInstanceRequest build() {
       com.google.cloud.redis.v1beta1.UpdateInstanceRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -445,7 +431,6 @@ public com.google.cloud.redis.v1beta1.UpdateInstanceRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.redis.v1beta1.UpdateInstanceRequest buildPartial() {
       com.google.cloud.redis.v1beta1.UpdateInstanceRequest result = new com.google.cloud.redis.v1beta1.UpdateInstanceRequest(this);
       if (updateMaskBuilder_ == null) {
@@ -462,39 +447,32 @@ public com.google.cloud.redis.v1beta1.UpdateInstanceRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.redis.v1beta1.UpdateInstanceRequest) {
         return mergeFrom((com.google.cloud.redis.v1beta1.UpdateInstanceRequest)other);
@@ -517,12 +495,10 @@ public Builder mergeFrom(com.google.cloud.redis.v1beta1.UpdateInstanceRequest ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -909,13 +885,11 @@ public com.google.cloud.redis.v1beta1.InstanceOrBuilder getInstanceOrBuilder() {
       }
       return instanceBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -937,12 +911,11 @@ public static com.google.cloud.redis.v1beta1.UpdateInstanceRequest getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateInstanceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateInstanceRequest(input, extensionRegistry);
+        return new UpdateInstanceRequest(input, extensionRegistry);
     }
   };
 
@@ -955,7 +928,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.redis.v1beta1.UpdateInstanceRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ZoneMetadata.java b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ZoneMetadata.java
index 9033f70147d5..e589f9fa60de 100644
--- a/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ZoneMetadata.java
+++ b/google-api-grpc/proto-google-cloud-redis-v1beta1/src/main/java/com/google/cloud/redis/v1beta1/ZoneMetadata.java
@@ -33,9 +33,6 @@ private ZoneMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -70,7 +67,6 @@ private ZoneMetadata(
     return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_ZoneMetadata_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_ZoneMetadata_fieldAccessorTable
@@ -79,7 +75,6 @@ private ZoneMetadata(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -89,13 +84,11 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -203,7 +196,6 @@ public static com.google.cloud.redis.v1beta1.ZoneMetadata parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -211,7 +203,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.redis.v1beta1.ZoneMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -240,7 +231,6 @@ public static final class Builder extends
       return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_ZoneMetadata_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_ZoneMetadata_fieldAccessorTable
@@ -263,24 +253,20 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.redis.v1beta1.CloudRedisServiceBetaProto.internal_static_google_cloud_redis_v1beta1_ZoneMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.redis.v1beta1.ZoneMetadata getDefaultInstanceForType() {
       return com.google.cloud.redis.v1beta1.ZoneMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.redis.v1beta1.ZoneMetadata build() {
       com.google.cloud.redis.v1beta1.ZoneMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -289,46 +275,38 @@ public com.google.cloud.redis.v1beta1.ZoneMetadata build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.redis.v1beta1.ZoneMetadata buildPartial() {
       com.google.cloud.redis.v1beta1.ZoneMetadata result = new com.google.cloud.redis.v1beta1.ZoneMetadata(this);
       onBuilt();
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.redis.v1beta1.ZoneMetadata) {
         return mergeFrom((com.google.cloud.redis.v1beta1.ZoneMetadata)other);
@@ -345,12 +323,10 @@ public Builder mergeFrom(com.google.cloud.redis.v1beta1.ZoneMetadata other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -368,13 +344,11 @@ public Builder mergeFrom(
       }
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -396,12 +370,11 @@ public static com.google.cloud.redis.v1beta1.ZoneMetadata getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ZoneMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ZoneMetadata(input, extensionRegistry);
+        return new ZoneMetadata(input, extensionRegistry);
     }
   };
 
@@ -414,7 +387,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.redis.v1beta1.ZoneMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/CreateDatabaseMetadata.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/CreateDatabaseMetadata.java
index dc56c3a3ce41..627d388315ad 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/CreateDatabaseMetadata.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/CreateDatabaseMetadata.java
@@ -34,9 +34,6 @@ private CreateDatabaseMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,12 +45,6 @@ private CreateDatabaseMetadata(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            database_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -61,6 +52,12 @@ private CreateDatabaseMetadata(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            database_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -78,7 +75,6 @@ private CreateDatabaseMetadata(
     return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_CreateDatabaseMetadata_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_CreateDatabaseMetadata_fieldAccessorTable
@@ -129,7 +125,6 @@ public java.lang.String getDatabase() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -139,7 +134,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getDatabaseBytes().isEmpty()) {
@@ -148,7 +142,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -263,7 +256,6 @@ public static com.google.spanner.admin.database.v1.CreateDatabaseMetadata parseF
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -271,7 +263,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.admin.database.v1.CreateDatabaseMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_CreateDatabaseMetadata_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_CreateDatabaseMetadata_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       database_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_CreateDatabaseMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.CreateDatabaseMetadata getDefaultInstanceForType() {
       return com.google.spanner.admin.database.v1.CreateDatabaseMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.CreateDatabaseMetadata build() {
       com.google.spanner.admin.database.v1.CreateDatabaseMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.spanner.admin.database.v1.CreateDatabaseMetadata build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.CreateDatabaseMetadata buildPartial() {
       com.google.spanner.admin.database.v1.CreateDatabaseMetadata result = new com.google.spanner.admin.database.v1.CreateDatabaseMetadata(this);
       result.database_ = database_;
@@ -359,39 +344,32 @@ public com.google.spanner.admin.database.v1.CreateDatabaseMetadata buildPartial(
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.admin.database.v1.CreateDatabaseMetadata) {
         return mergeFrom((com.google.spanner.admin.database.v1.CreateDatabaseMetadata)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.spanner.admin.database.v1.CreateDatabaseMeta
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -524,13 +500,11 @@ public Builder setDatabaseBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -552,12 +526,11 @@ public static com.google.spanner.admin.database.v1.CreateDatabaseMetadata getDef
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateDatabaseMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateDatabaseMetadata(input, extensionRegistry);
+        return new CreateDatabaseMetadata(input, extensionRegistry);
     }
   };
 
@@ -570,7 +543,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.admin.database.v1.CreateDatabaseMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/CreateDatabaseRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/CreateDatabaseRequest.java
index d61a40503d0b..2c09f083e21c 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/CreateDatabaseRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/CreateDatabaseRequest.java
@@ -35,9 +35,6 @@ private CreateDatabaseRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private CreateDatabaseRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -70,13 +74,6 @@ private CreateDatabaseRequest(
             extraStatements_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private CreateDatabaseRequest(
     return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_CreateDatabaseRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_CreateDatabaseRequest_fieldAccessorTable
@@ -258,7 +254,6 @@ public java.lang.String getExtraStatements(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -268,7 +263,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -283,7 +277,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -419,7 +412,6 @@ public static com.google.spanner.admin.database.v1.CreateDatabaseRequest parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -427,7 +419,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.admin.database.v1.CreateDatabaseRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -455,7 +446,6 @@ public static final class Builder extends
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_CreateDatabaseRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_CreateDatabaseRequest_fieldAccessorTable
@@ -478,7 +468,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -490,18 +479,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_CreateDatabaseRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.CreateDatabaseRequest getDefaultInstanceForType() {
       return com.google.spanner.admin.database.v1.CreateDatabaseRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.CreateDatabaseRequest build() {
       com.google.spanner.admin.database.v1.CreateDatabaseRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -510,7 +496,6 @@ public com.google.spanner.admin.database.v1.CreateDatabaseRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.CreateDatabaseRequest buildPartial() {
       com.google.spanner.admin.database.v1.CreateDatabaseRequest result = new com.google.spanner.admin.database.v1.CreateDatabaseRequest(this);
       int from_bitField0_ = bitField0_;
@@ -527,39 +512,32 @@ public com.google.spanner.admin.database.v1.CreateDatabaseRequest buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.admin.database.v1.CreateDatabaseRequest) {
         return mergeFrom((com.google.spanner.admin.database.v1.CreateDatabaseRequest)other);
@@ -594,12 +572,10 @@ public Builder mergeFrom(com.google.spanner.admin.database.v1.CreateDatabaseRequ
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -978,13 +954,11 @@ public Builder addExtraStatementsBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1006,12 +980,11 @@ public static com.google.spanner.admin.database.v1.CreateDatabaseRequest getDefa
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateDatabaseRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateDatabaseRequest(input, extensionRegistry);
+        return new CreateDatabaseRequest(input, extensionRegistry);
     }
   };
 
@@ -1024,7 +997,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.admin.database.v1.CreateDatabaseRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/Database.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/Database.java
index 2319595269d7..497ef2c9d393 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/Database.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/Database.java
@@ -34,9 +34,6 @@ private Database(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private Database(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private Database(
             state_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private Database(
     return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_Database_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_Database_fieldAccessorTable
@@ -299,13 +295,11 @@ public int getStateValue() {
    * .google.spanner.admin.database.v1.Database.State state = 2;
    */
   public com.google.spanner.admin.database.v1.Database.State getState() {
-    @SuppressWarnings("deprecation")
     com.google.spanner.admin.database.v1.Database.State result = com.google.spanner.admin.database.v1.Database.State.valueOf(state_);
     return result == null ? com.google.spanner.admin.database.v1.Database.State.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -315,7 +309,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -327,7 +320,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -449,7 +441,6 @@ public static com.google.spanner.admin.database.v1.Database parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -457,7 +448,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.admin.database.v1.Database prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -485,7 +475,6 @@ public static final class Builder extends
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_Database_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_Database_fieldAccessorTable
@@ -508,7 +497,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -518,18 +506,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_Database_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.Database getDefaultInstanceForType() {
       return com.google.spanner.admin.database.v1.Database.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.Database build() {
       com.google.spanner.admin.database.v1.Database result = buildPartial();
       if (!result.isInitialized()) {
@@ -538,7 +523,6 @@ public com.google.spanner.admin.database.v1.Database build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.Database buildPartial() {
       com.google.spanner.admin.database.v1.Database result = new com.google.spanner.admin.database.v1.Database(this);
       result.name_ = name_;
@@ -547,39 +531,32 @@ public com.google.spanner.admin.database.v1.Database buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.admin.database.v1.Database) {
         return mergeFrom((com.google.spanner.admin.database.v1.Database)other);
@@ -603,12 +580,10 @@ public Builder mergeFrom(com.google.spanner.admin.database.v1.Database other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -767,7 +742,6 @@ public Builder setStateValue(int value) {
      * .google.spanner.admin.database.v1.Database.State state = 2;
      */
     public com.google.spanner.admin.database.v1.Database.State getState() {
-      @SuppressWarnings("deprecation")
       com.google.spanner.admin.database.v1.Database.State result = com.google.spanner.admin.database.v1.Database.State.valueOf(state_);
       return result == null ? com.google.spanner.admin.database.v1.Database.State.UNRECOGNIZED : result;
     }
@@ -800,13 +774,11 @@ public Builder clearState() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -828,12 +800,11 @@ public static com.google.spanner.admin.database.v1.Database getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Database parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Database(input, extensionRegistry);
+        return new Database(input, extensionRegistry);
     }
   };
 
@@ -846,7 +817,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.admin.database.v1.Database getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/DropDatabaseRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/DropDatabaseRequest.java
index b757b5c40797..29796aec2ac5 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/DropDatabaseRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/DropDatabaseRequest.java
@@ -33,9 +33,6 @@ private DropDatabaseRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DropDatabaseRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            database_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DropDatabaseRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            database_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DropDatabaseRequest(
     return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_DropDatabaseRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_DropDatabaseRequest_fieldAccessorTable
@@ -128,7 +124,6 @@ public java.lang.String getDatabase() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -138,7 +133,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getDatabaseBytes().isEmpty()) {
@@ -147,7 +141,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -262,7 +255,6 @@ public static com.google.spanner.admin.database.v1.DropDatabaseRequest parseFrom
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -270,7 +262,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.admin.database.v1.DropDatabaseRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -298,7 +289,6 @@ public static final class Builder extends
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_DropDatabaseRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_DropDatabaseRequest_fieldAccessorTable
@@ -321,7 +311,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       database_ = "";
@@ -329,18 +318,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_DropDatabaseRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.DropDatabaseRequest getDefaultInstanceForType() {
       return com.google.spanner.admin.database.v1.DropDatabaseRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.DropDatabaseRequest build() {
       com.google.spanner.admin.database.v1.DropDatabaseRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -349,7 +335,6 @@ public com.google.spanner.admin.database.v1.DropDatabaseRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.DropDatabaseRequest buildPartial() {
       com.google.spanner.admin.database.v1.DropDatabaseRequest result = new com.google.spanner.admin.database.v1.DropDatabaseRequest(this);
       result.database_ = database_;
@@ -357,39 +342,32 @@ public com.google.spanner.admin.database.v1.DropDatabaseRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.admin.database.v1.DropDatabaseRequest) {
         return mergeFrom((com.google.spanner.admin.database.v1.DropDatabaseRequest)other);
@@ -410,12 +388,10 @@ public Builder mergeFrom(com.google.spanner.admin.database.v1.DropDatabaseReques
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -522,13 +498,11 @@ public Builder setDatabaseBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -550,12 +524,11 @@ public static com.google.spanner.admin.database.v1.DropDatabaseRequest getDefaul
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DropDatabaseRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DropDatabaseRequest(input, extensionRegistry);
+        return new DropDatabaseRequest(input, extensionRegistry);
     }
   };
 
@@ -568,7 +541,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.admin.database.v1.DropDatabaseRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseDdlRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseDdlRequest.java
index eb995fc48546..58adcb34a720 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseDdlRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseDdlRequest.java
@@ -33,9 +33,6 @@ private GetDatabaseDdlRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetDatabaseDdlRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            database_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetDatabaseDdlRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            database_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetDatabaseDdlRequest(
     return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_GetDatabaseDdlRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_GetDatabaseDdlRequest_fieldAccessorTable
@@ -128,7 +124,6 @@ public java.lang.String getDatabase() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -138,7 +133,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getDatabaseBytes().isEmpty()) {
@@ -147,7 +141,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -262,7 +255,6 @@ public static com.google.spanner.admin.database.v1.GetDatabaseDdlRequest parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -270,7 +262,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.admin.database.v1.GetDatabaseDdlRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -298,7 +289,6 @@ public static final class Builder extends
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_GetDatabaseDdlRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_GetDatabaseDdlRequest_fieldAccessorTable
@@ -321,7 +311,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       database_ = "";
@@ -329,18 +318,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_GetDatabaseDdlRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.GetDatabaseDdlRequest getDefaultInstanceForType() {
       return com.google.spanner.admin.database.v1.GetDatabaseDdlRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.GetDatabaseDdlRequest build() {
       com.google.spanner.admin.database.v1.GetDatabaseDdlRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -349,7 +335,6 @@ public com.google.spanner.admin.database.v1.GetDatabaseDdlRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.GetDatabaseDdlRequest buildPartial() {
       com.google.spanner.admin.database.v1.GetDatabaseDdlRequest result = new com.google.spanner.admin.database.v1.GetDatabaseDdlRequest(this);
       result.database_ = database_;
@@ -357,39 +342,32 @@ public com.google.spanner.admin.database.v1.GetDatabaseDdlRequest buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.admin.database.v1.GetDatabaseDdlRequest) {
         return mergeFrom((com.google.spanner.admin.database.v1.GetDatabaseDdlRequest)other);
@@ -410,12 +388,10 @@ public Builder mergeFrom(com.google.spanner.admin.database.v1.GetDatabaseDdlRequ
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -522,13 +498,11 @@ public Builder setDatabaseBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -550,12 +524,11 @@ public static com.google.spanner.admin.database.v1.GetDatabaseDdlRequest getDefa
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetDatabaseDdlRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetDatabaseDdlRequest(input, extensionRegistry);
+        return new GetDatabaseDdlRequest(input, extensionRegistry);
     }
   };
 
@@ -568,7 +541,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.admin.database.v1.GetDatabaseDdlRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseDdlResponse.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseDdlResponse.java
index 6cbaaaa31161..a9c71a736a2a 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseDdlResponse.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseDdlResponse.java
@@ -33,9 +33,6 @@ private GetDatabaseDdlResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private GetDatabaseDdlResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -56,13 +60,6 @@ private GetDatabaseDdlResponse(
             statements_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private GetDatabaseDdlResponse(
     return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_GetDatabaseDdlResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_GetDatabaseDdlResponse_fieldAccessorTable
@@ -141,7 +137,6 @@ public java.lang.String getStatements(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -151,7 +146,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < statements_.size(); i++) {
@@ -160,7 +154,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -282,7 +275,6 @@ public static com.google.spanner.admin.database.v1.GetDatabaseDdlResponse parseF
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -290,7 +282,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.admin.database.v1.GetDatabaseDdlResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -318,7 +309,6 @@ public static final class Builder extends
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_GetDatabaseDdlResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_GetDatabaseDdlResponse_fieldAccessorTable
@@ -341,7 +331,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       statements_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -349,18 +338,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_GetDatabaseDdlResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.GetDatabaseDdlResponse getDefaultInstanceForType() {
       return com.google.spanner.admin.database.v1.GetDatabaseDdlResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.GetDatabaseDdlResponse build() {
       com.google.spanner.admin.database.v1.GetDatabaseDdlResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -369,7 +355,6 @@ public com.google.spanner.admin.database.v1.GetDatabaseDdlResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.GetDatabaseDdlResponse buildPartial() {
       com.google.spanner.admin.database.v1.GetDatabaseDdlResponse result = new com.google.spanner.admin.database.v1.GetDatabaseDdlResponse(this);
       int from_bitField0_ = bitField0_;
@@ -382,39 +367,32 @@ public com.google.spanner.admin.database.v1.GetDatabaseDdlResponse buildPartial(
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.admin.database.v1.GetDatabaseDdlResponse) {
         return mergeFrom((com.google.spanner.admin.database.v1.GetDatabaseDdlResponse)other);
@@ -441,12 +419,10 @@ public Builder mergeFrom(com.google.spanner.admin.database.v1.GetDatabaseDdlResp
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -604,13 +580,11 @@ public Builder addStatementsBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -632,12 +606,11 @@ public static com.google.spanner.admin.database.v1.GetDatabaseDdlResponse getDef
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetDatabaseDdlResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetDatabaseDdlResponse(input, extensionRegistry);
+        return new GetDatabaseDdlResponse(input, extensionRegistry);
     }
   };
 
@@ -650,7 +623,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.admin.database.v1.GetDatabaseDdlResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseRequest.java
index 43867d605e71..34de6339ce73 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseRequest.java
@@ -33,9 +33,6 @@ private GetDatabaseRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetDatabaseRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetDatabaseRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetDatabaseRequest(
     return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_GetDatabaseRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_GetDatabaseRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.spanner.admin.database.v1.GetDatabaseRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.admin.database.v1.GetDatabaseRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_GetDatabaseRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_GetDatabaseRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_GetDatabaseRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.GetDatabaseRequest getDefaultInstanceForType() {
       return com.google.spanner.admin.database.v1.GetDatabaseRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.GetDatabaseRequest build() {
       com.google.spanner.admin.database.v1.GetDatabaseRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.spanner.admin.database.v1.GetDatabaseRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.GetDatabaseRequest buildPartial() {
       com.google.spanner.admin.database.v1.GetDatabaseRequest result = new com.google.spanner.admin.database.v1.GetDatabaseRequest(this);
       result.name_ = name_;
@@ -359,39 +344,32 @@ public com.google.spanner.admin.database.v1.GetDatabaseRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.admin.database.v1.GetDatabaseRequest) {
         return mergeFrom((com.google.spanner.admin.database.v1.GetDatabaseRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.spanner.admin.database.v1.GetDatabaseRequest
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.spanner.admin.database.v1.GetDatabaseRequest getDefault
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetDatabaseRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetDatabaseRequest(input, extensionRegistry);
+        return new GetDatabaseRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.admin.database.v1.GetDatabaseRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/ListDatabasesRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/ListDatabasesRequest.java
index 3397f34a3e86..775f8739f1df 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/ListDatabasesRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/ListDatabasesRequest.java
@@ -35,9 +35,6 @@ private ListDatabasesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListDatabasesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ListDatabasesRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListDatabasesRequest(
     return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_ListDatabasesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_ListDatabasesRequest_fieldAccessorTable
@@ -203,7 +199,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -213,7 +208,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -228,7 +222,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -358,7 +351,6 @@ public static com.google.spanner.admin.database.v1.ListDatabasesRequest parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -366,7 +358,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.admin.database.v1.ListDatabasesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -394,7 +385,6 @@ public static final class Builder extends
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_ListDatabasesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_ListDatabasesRequest_fieldAccessorTable
@@ -417,7 +407,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -429,18 +418,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_ListDatabasesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.ListDatabasesRequest getDefaultInstanceForType() {
       return com.google.spanner.admin.database.v1.ListDatabasesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.ListDatabasesRequest build() {
       com.google.spanner.admin.database.v1.ListDatabasesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -449,7 +435,6 @@ public com.google.spanner.admin.database.v1.ListDatabasesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.ListDatabasesRequest buildPartial() {
       com.google.spanner.admin.database.v1.ListDatabasesRequest result = new com.google.spanner.admin.database.v1.ListDatabasesRequest(this);
       result.parent_ = parent_;
@@ -459,39 +444,32 @@ public com.google.spanner.admin.database.v1.ListDatabasesRequest buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.admin.database.v1.ListDatabasesRequest) {
         return mergeFrom((com.google.spanner.admin.database.v1.ListDatabasesRequest)other);
@@ -519,12 +497,10 @@ public Builder mergeFrom(com.google.spanner.admin.database.v1.ListDatabasesReque
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -776,13 +752,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -804,12 +778,11 @@ public static com.google.spanner.admin.database.v1.ListDatabasesRequest getDefau
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListDatabasesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDatabasesRequest(input, extensionRegistry);
+        return new ListDatabasesRequest(input, extensionRegistry);
     }
   };
 
@@ -822,7 +795,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.admin.database.v1.ListDatabasesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/ListDatabasesResponse.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/ListDatabasesResponse.java
index 389593672956..d2593c24e3d4 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/ListDatabasesResponse.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/ListDatabasesResponse.java
@@ -34,9 +34,6 @@ private ListDatabasesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListDatabasesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               databases_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListDatabasesResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListDatabasesResponse(
     return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_ListDatabasesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_ListDatabasesResponse_fieldAccessorTable
@@ -201,7 +197,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -211,7 +206,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < databases_.size(); i++) {
@@ -223,7 +217,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.spanner.admin.database.v1.ListDatabasesResponse parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.admin.database.v1.ListDatabasesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_ListDatabasesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_ListDatabasesResponse_fieldAccessorTable
@@ -408,7 +398,6 @@ private void maybeForceBuilderInitialization() {
         getDatabasesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (databasesBuilder_ == null) {
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_ListDatabasesResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.ListDatabasesResponse getDefaultInstanceForType() {
       return com.google.spanner.admin.database.v1.ListDatabasesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.ListDatabasesResponse build() {
       com.google.spanner.admin.database.v1.ListDatabasesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public com.google.spanner.admin.database.v1.ListDatabasesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.ListDatabasesResponse buildPartial() {
       com.google.spanner.admin.database.v1.ListDatabasesResponse result = new com.google.spanner.admin.database.v1.ListDatabasesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -462,39 +447,32 @@ public com.google.spanner.admin.database.v1.ListDatabasesResponse buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.admin.database.v1.ListDatabasesResponse) {
         return mergeFrom((com.google.spanner.admin.database.v1.ListDatabasesResponse)other);
@@ -541,12 +519,10 @@ public Builder mergeFrom(com.google.spanner.admin.database.v1.ListDatabasesRespo
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -976,13 +952,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1004,12 +978,11 @@ public static com.google.spanner.admin.database.v1.ListDatabasesResponse getDefa
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListDatabasesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListDatabasesResponse(input, extensionRegistry);
+        return new ListDatabasesResponse(input, extensionRegistry);
     }
   };
 
@@ -1022,7 +995,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.admin.database.v1.ListDatabasesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/SpannerDatabaseAdminProto.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/SpannerDatabaseAdminProto.java
index 5eceb522b1d0..b798be9ec9a2 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/SpannerDatabaseAdminProto.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/SpannerDatabaseAdminProto.java
@@ -87,7 +87,7 @@ public static void registerAllExtensions(
       "f/empty.proto\032\037google/protobuf/timestamp" +
       ".proto\"\222\001\n\010Database\022\014\n\004name\030\001 \001(\t\022?\n\005sta" +
       "te\030\002 \001(\01620.google.spanner.admin.database" +
-      ".v1.Database.State\"7\n\005State\022\025\n\021STATE_UNS" +
+      ".v1.Database.State\"7\n\005State\022\025\n\021STATE_UNS",
       "PECIFIED\020\000\022\014\n\010CREATING\020\001\022\t\n\005READY\020\002\"M\n\024L" +
       "istDatabasesRequest\022\016\n\006parent\030\001 \001(\t\022\021\n\tp" +
       "age_size\030\003 \001(\005\022\022\n\npage_token\030\004 \001(\t\"o\n\025Li" +
@@ -97,7 +97,7 @@ public static void registerAllExtensions(
       "abaseRequest\022\016\n\006parent\030\001 \001(\t\022\030\n\020create_s" +
       "tatement\030\002 \001(\t\022\030\n\020extra_statements\030\003 \003(\t" +
       "\"*\n\026CreateDatabaseMetadata\022\020\n\010database\030\001" +
-      " \001(\t\"\"\n\022GetDatabaseRequest\022\014\n\004name\030\001 \001(\t" +
+      " \001(\t\"\"\n\022GetDatabaseRequest\022\014\n\004name\030\001 \001(\t",
       "\"V\n\030UpdateDatabaseDdlRequest\022\020\n\010database" +
       "\030\001 \001(\t\022\022\n\nstatements\030\002 \003(\t\022\024\n\014operation_" +
       "id\030\003 \001(\t\"x\n\031UpdateDatabaseDdlMetadata\022\020\n" +
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "abase\030\001 \001(\t\")\n\025GetDatabaseDdlRequest\022\020\n\010" +
       "database\030\001 \001(\t\",\n\026GetDatabaseDdlResponse" +
       "\022\022\n\nstatements\030\001 \003(\t2\225\014\n\rDatabaseAdmin\022\267" +
-      "\001\n\rListDatabases\0226.google.spanner.admin." +
+      "\001\n\rListDatabases\0226.google.spanner.admin.",
       "database.v1.ListDatabasesRequest\0327.googl" +
       "e.spanner.admin.database.v1.ListDatabase" +
       "sResponse\"5\202\323\344\223\002/\022-/v1/{parent=projects/" +
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       "g.Operation\"8\202\323\344\223\0022\"-/v1/{parent=project" +
       "s/*/instances/*}/databases:\001*\022\246\001\n\013GetDat" +
       "abase\0224.google.spanner.admin.database.v1" +
-      ".GetDatabaseRequest\032*.google.spanner.adm" +
+      ".GetDatabaseRequest\032*.google.spanner.adm",
       "in.database.v1.Database\"5\202\323\344\223\002/\022-/v1/{na" +
       "me=projects/*/instances/*/databases/*}\022\260" +
       "\001\n\021UpdateDatabaseDdl\022:.google.spanner.ad" +
@@ -127,7 +127,7 @@ public static void registerAllExtensions(
       "tabases/*}/ddl:\001*\022\230\001\n\014DropDatabase\0225.goo" +
       "gle.spanner.admin.database.v1.DropDataba" +
       "seRequest\032\026.google.protobuf.Empty\"9\202\323\344\223\002" +
-      "3*1/v1/{database=projects/*/instances/*/" +
+      "3*1/v1/{database=projects/*/instances/*/",
       "databases/*}\022\302\001\n\016GetDatabaseDdl\0227.google" +
       ".spanner.admin.database.v1.GetDatabaseDd" +
       "lRequest\0328.google.spanner.admin.database" +
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       "v1.SetIamPolicyRequest\032\025.google.iam.v1.P" +
       "olicy\"I\202\323\344\223\002C\">/v1/{resource=projects/*/" +
       "instances/*/databases/*}:setIamPolicy:\001*" +
-      "\022\224\001\n\014GetIamPolicy\022\".google.iam.v1.GetIam" +
+      "\022\224\001\n\014GetIamPolicy\022\".google.iam.v1.GetIam",
       "PolicyRequest\032\025.google.iam.v1.Policy\"I\202\323" +
       "\344\223\002C\">/v1/{resource=projects/*/instances" +
       "/*/databases/*}:getIamPolicy:\001*\022\272\001\n\022Test" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "ce=projects/*/instances/*/databases/*}:t" +
       "estIamPermissions:\001*B\337\001\n$com.google.span" +
       "ner.admin.database.v1B\031SpannerDatabaseAd" +
-      "minProtoP\001ZHgoogle.golang.org/genproto/g" +
+      "minProtoP\001ZHgoogle.golang.org/genproto/g",
       "oogleapis/spanner/admin/database/v1;data" +
       "base\252\002&Google.Cloud.Spanner.Admin.Databa" +
       "se.V1\312\002&Google\\Cloud\\Spanner\\Admin\\Datab" +
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/UpdateDatabaseDdlMetadata.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/UpdateDatabaseDdlMetadata.java
index 4f0e061e37ac..93f35dffa6eb 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/UpdateDatabaseDdlMetadata.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/UpdateDatabaseDdlMetadata.java
@@ -36,9 +36,6 @@ private UpdateDatabaseDdlMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private UpdateDatabaseDdlMetadata(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -74,13 +78,6 @@ private UpdateDatabaseDdlMetadata(
                 input.readMessage(com.google.protobuf.Timestamp.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private UpdateDatabaseDdlMetadata(
     return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_UpdateDatabaseDdlMetadata_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_UpdateDatabaseDdlMetadata_fieldAccessorTable
@@ -270,7 +266,6 @@ public com.google.protobuf.TimestampOrBuilder getCommitTimestampsOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -280,7 +275,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getDatabaseBytes().isEmpty()) {
@@ -295,7 +289,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -434,7 +427,6 @@ public static com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata par
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -442,7 +434,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -471,7 +462,6 @@ public static final class Builder extends
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_UpdateDatabaseDdlMetadata_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_UpdateDatabaseDdlMetadata_fieldAccessorTable
@@ -495,7 +485,6 @@ private void maybeForceBuilderInitialization() {
         getCommitTimestampsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       database_ = "";
@@ -511,18 +500,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_UpdateDatabaseDdlMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata getDefaultInstanceForType() {
       return com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata build() {
       com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -531,7 +517,6 @@ public com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata buildPartial() {
       com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata result = new com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata(this);
       int from_bitField0_ = bitField0_;
@@ -556,39 +541,32 @@ public com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata buildParti
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata) {
         return mergeFrom((com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata)other);
@@ -645,12 +623,10 @@ public Builder mergeFrom(com.google.spanner.admin.database.v1.UpdateDatabaseDdlM
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1245,13 +1221,11 @@ public com.google.protobuf.Timestamp.Builder addCommitTimestampsBuilder(
       }
       return commitTimestampsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1273,12 +1247,11 @@ public static com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata get
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateDatabaseDdlMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateDatabaseDdlMetadata(input, extensionRegistry);
+        return new UpdateDatabaseDdlMetadata(input, extensionRegistry);
     }
   };
 
@@ -1291,7 +1264,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/UpdateDatabaseDdlRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/UpdateDatabaseDdlRequest.java
index 25c858e842e9..eec60588ede0 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/UpdateDatabaseDdlRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/UpdateDatabaseDdlRequest.java
@@ -49,9 +49,6 @@ private UpdateDatabaseDdlRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -63,6 +60,13 @@ private UpdateDatabaseDdlRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -84,13 +88,6 @@ private UpdateDatabaseDdlRequest(
             operationId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -111,7 +108,6 @@ private UpdateDatabaseDdlRequest(
     return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_UpdateDatabaseDdlRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_UpdateDatabaseDdlRequest_fieldAccessorTable
@@ -282,7 +278,6 @@ public java.lang.String getOperationId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -292,7 +287,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getDatabaseBytes().isEmpty()) {
@@ -307,7 +301,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -443,7 +436,6 @@ public static com.google.spanner.admin.database.v1.UpdateDatabaseDdlRequest pars
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -451,7 +443,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.admin.database.v1.UpdateDatabaseDdlRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -493,7 +484,6 @@ public static final class Builder extends
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_UpdateDatabaseDdlRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_UpdateDatabaseDdlRequest_fieldAccessorTable
@@ -516,7 +506,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       database_ = "";
@@ -528,18 +517,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.admin.database.v1.SpannerDatabaseAdminProto.internal_static_google_spanner_admin_database_v1_UpdateDatabaseDdlRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.UpdateDatabaseDdlRequest getDefaultInstanceForType() {
       return com.google.spanner.admin.database.v1.UpdateDatabaseDdlRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.UpdateDatabaseDdlRequest build() {
       com.google.spanner.admin.database.v1.UpdateDatabaseDdlRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -548,7 +534,6 @@ public com.google.spanner.admin.database.v1.UpdateDatabaseDdlRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.database.v1.UpdateDatabaseDdlRequest buildPartial() {
       com.google.spanner.admin.database.v1.UpdateDatabaseDdlRequest result = new com.google.spanner.admin.database.v1.UpdateDatabaseDdlRequest(this);
       int from_bitField0_ = bitField0_;
@@ -565,39 +550,32 @@ public com.google.spanner.admin.database.v1.UpdateDatabaseDdlRequest buildPartia
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.admin.database.v1.UpdateDatabaseDdlRequest) {
         return mergeFrom((com.google.spanner.admin.database.v1.UpdateDatabaseDdlRequest)other);
@@ -632,12 +610,10 @@ public Builder mergeFrom(com.google.spanner.admin.database.v1.UpdateDatabaseDdlR
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1044,13 +1020,11 @@ public Builder setOperationIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1072,12 +1046,11 @@ public static com.google.spanner.admin.database.v1.UpdateDatabaseDdlRequest getD
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateDatabaseDdlRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateDatabaseDdlRequest(input, extensionRegistry);
+        return new UpdateDatabaseDdlRequest(input, extensionRegistry);
     }
   };
 
@@ -1090,7 +1063,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.admin.database.v1.UpdateDatabaseDdlRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/CreateInstanceMetadata.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/CreateInstanceMetadata.java
index eab5dd975980..dcc9f6b56eed 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/CreateInstanceMetadata.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/CreateInstanceMetadata.java
@@ -33,9 +33,6 @@ private CreateInstanceMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private CreateInstanceMetadata(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.spanner.admin.instance.v1.Instance.Builder subBuilder = null;
             if (instance_ != null) {
@@ -99,13 +103,6 @@ private CreateInstanceMetadata(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -123,7 +120,6 @@ private CreateInstanceMetadata(
     return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_CreateInstanceMetadata_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_CreateInstanceMetadata_fieldAccessorTable
@@ -276,7 +272,6 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -286,7 +281,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (instance_ != null) {
@@ -304,7 +298,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -464,7 +457,6 @@ public static com.google.spanner.admin.instance.v1.CreateInstanceMetadata parseF
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -472,7 +464,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.admin.instance.v1.CreateInstanceMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -501,7 +492,6 @@ public static final class Builder extends
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_CreateInstanceMetadata_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_CreateInstanceMetadata_fieldAccessorTable
@@ -524,7 +514,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (instanceBuilder_ == null) {
@@ -554,18 +543,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_CreateInstanceMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.CreateInstanceMetadata getDefaultInstanceForType() {
       return com.google.spanner.admin.instance.v1.CreateInstanceMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.CreateInstanceMetadata build() {
       com.google.spanner.admin.instance.v1.CreateInstanceMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -574,7 +560,6 @@ public com.google.spanner.admin.instance.v1.CreateInstanceMetadata build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.CreateInstanceMetadata buildPartial() {
       com.google.spanner.admin.instance.v1.CreateInstanceMetadata result = new com.google.spanner.admin.instance.v1.CreateInstanceMetadata(this);
       if (instanceBuilder_ == null) {
@@ -601,39 +586,32 @@ public com.google.spanner.admin.instance.v1.CreateInstanceMetadata buildPartial(
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.admin.instance.v1.CreateInstanceMetadata) {
         return mergeFrom((com.google.spanner.admin.instance.v1.CreateInstanceMetadata)other);
@@ -662,12 +640,10 @@ public Builder mergeFrom(com.google.spanner.admin.instance.v1.CreateInstanceMeta
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1333,13 +1309,11 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
       }
       return endTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1361,12 +1335,11 @@ public static com.google.spanner.admin.instance.v1.CreateInstanceMetadata getDef
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateInstanceMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateInstanceMetadata(input, extensionRegistry);
+        return new CreateInstanceMetadata(input, extensionRegistry);
     }
   };
 
@@ -1379,7 +1352,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.admin.instance.v1.CreateInstanceMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/CreateInstanceRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/CreateInstanceRequest.java
index 5cb38fe3455b..1e6b5944cce9 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/CreateInstanceRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/CreateInstanceRequest.java
@@ -34,9 +34,6 @@ private CreateInstanceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private CreateInstanceRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private CreateInstanceRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private CreateInstanceRequest(
     return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_CreateInstanceRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_CreateInstanceRequest_fieldAccessorTable
@@ -232,7 +228,6 @@ public com.google.spanner.admin.instance.v1.InstanceOrBuilder getInstanceOrBuild
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -242,7 +237,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -257,7 +251,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -392,7 +385,6 @@ public static com.google.spanner.admin.instance.v1.CreateInstanceRequest parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -400,7 +392,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.admin.instance.v1.CreateInstanceRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -428,7 +419,6 @@ public static final class Builder extends
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_CreateInstanceRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_CreateInstanceRequest_fieldAccessorTable
@@ -451,7 +441,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -467,18 +456,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_CreateInstanceRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.CreateInstanceRequest getDefaultInstanceForType() {
       return com.google.spanner.admin.instance.v1.CreateInstanceRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.CreateInstanceRequest build() {
       com.google.spanner.admin.instance.v1.CreateInstanceRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -487,7 +473,6 @@ public com.google.spanner.admin.instance.v1.CreateInstanceRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.CreateInstanceRequest buildPartial() {
       com.google.spanner.admin.instance.v1.CreateInstanceRequest result = new com.google.spanner.admin.instance.v1.CreateInstanceRequest(this);
       result.parent_ = parent_;
@@ -501,39 +486,32 @@ public com.google.spanner.admin.instance.v1.CreateInstanceRequest buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.admin.instance.v1.CreateInstanceRequest) {
         return mergeFrom((com.google.spanner.admin.instance.v1.CreateInstanceRequest)other);
@@ -561,12 +539,10 @@ public Builder mergeFrom(com.google.spanner.admin.instance.v1.CreateInstanceRequ
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -939,13 +915,11 @@ public com.google.spanner.admin.instance.v1.InstanceOrBuilder getInstanceOrBuild
       }
       return instanceBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -967,12 +941,11 @@ public static com.google.spanner.admin.instance.v1.CreateInstanceRequest getDefa
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateInstanceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateInstanceRequest(input, extensionRegistry);
+        return new CreateInstanceRequest(input, extensionRegistry);
     }
   };
 
@@ -985,7 +958,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.admin.instance.v1.CreateInstanceRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/DeleteInstanceRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/DeleteInstanceRequest.java
index 372b0e0c5be7..cf804b0d04ec 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/DeleteInstanceRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/DeleteInstanceRequest.java
@@ -33,9 +33,6 @@ private DeleteInstanceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteInstanceRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteInstanceRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteInstanceRequest(
     return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_DeleteInstanceRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_DeleteInstanceRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.spanner.admin.instance.v1.DeleteInstanceRequest parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.admin.instance.v1.DeleteInstanceRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_DeleteInstanceRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_DeleteInstanceRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_DeleteInstanceRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.DeleteInstanceRequest getDefaultInstanceForType() {
       return com.google.spanner.admin.instance.v1.DeleteInstanceRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.DeleteInstanceRequest build() {
       com.google.spanner.admin.instance.v1.DeleteInstanceRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.spanner.admin.instance.v1.DeleteInstanceRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.DeleteInstanceRequest buildPartial() {
       com.google.spanner.admin.instance.v1.DeleteInstanceRequest result = new com.google.spanner.admin.instance.v1.DeleteInstanceRequest(this);
       result.name_ = name_;
@@ -359,39 +344,32 @@ public com.google.spanner.admin.instance.v1.DeleteInstanceRequest buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.admin.instance.v1.DeleteInstanceRequest) {
         return mergeFrom((com.google.spanner.admin.instance.v1.DeleteInstanceRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.spanner.admin.instance.v1.DeleteInstanceRequ
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.spanner.admin.instance.v1.DeleteInstanceRequest getDefa
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteInstanceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteInstanceRequest(input, extensionRegistry);
+        return new DeleteInstanceRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.admin.instance.v1.DeleteInstanceRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/GetInstanceConfigRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/GetInstanceConfigRequest.java
index e91765159815..1935657449e1 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/GetInstanceConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/GetInstanceConfigRequest.java
@@ -34,9 +34,6 @@ private GetInstanceConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,12 +45,6 @@ private GetInstanceConfigRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -61,6 +52,12 @@ private GetInstanceConfigRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -78,7 +75,6 @@ private GetInstanceConfigRequest(
     return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_GetInstanceConfigRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_GetInstanceConfigRequest_fieldAccessorTable
@@ -131,7 +127,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -141,7 +136,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -150,7 +144,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static com.google.spanner.admin.instance.v1.GetInstanceConfigRequest pars
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.admin.instance.v1.GetInstanceConfigRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_GetInstanceConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_GetInstanceConfigRequest_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_GetInstanceConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.GetInstanceConfigRequest getDefaultInstanceForType() {
       return com.google.spanner.admin.instance.v1.GetInstanceConfigRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.GetInstanceConfigRequest build() {
       com.google.spanner.admin.instance.v1.GetInstanceConfigRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.spanner.admin.instance.v1.GetInstanceConfigRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.GetInstanceConfigRequest buildPartial() {
       com.google.spanner.admin.instance.v1.GetInstanceConfigRequest result = new com.google.spanner.admin.instance.v1.GetInstanceConfigRequest(this);
       result.name_ = name_;
@@ -361,39 +346,32 @@ public com.google.spanner.admin.instance.v1.GetInstanceConfigRequest buildPartia
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.admin.instance.v1.GetInstanceConfigRequest) {
         return mergeFrom((com.google.spanner.admin.instance.v1.GetInstanceConfigRequest)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.spanner.admin.instance.v1.GetInstanceConfigR
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -531,13 +507,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -559,12 +533,11 @@ public static com.google.spanner.admin.instance.v1.GetInstanceConfigRequest getD
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetInstanceConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetInstanceConfigRequest(input, extensionRegistry);
+        return new GetInstanceConfigRequest(input, extensionRegistry);
     }
   };
 
@@ -577,7 +550,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.admin.instance.v1.GetInstanceConfigRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/GetInstanceRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/GetInstanceRequest.java
index e23439c1c11b..b140931e8c66 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/GetInstanceRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/GetInstanceRequest.java
@@ -33,9 +33,6 @@ private GetInstanceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetInstanceRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetInstanceRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetInstanceRequest(
     return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_GetInstanceRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_GetInstanceRequest_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.spanner.admin.instance.v1.GetInstanceRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.admin.instance.v1.GetInstanceRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_GetInstanceRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_GetInstanceRequest_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_GetInstanceRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.GetInstanceRequest getDefaultInstanceForType() {
       return com.google.spanner.admin.instance.v1.GetInstanceRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.GetInstanceRequest build() {
       com.google.spanner.admin.instance.v1.GetInstanceRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.spanner.admin.instance.v1.GetInstanceRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.GetInstanceRequest buildPartial() {
       com.google.spanner.admin.instance.v1.GetInstanceRequest result = new com.google.spanner.admin.instance.v1.GetInstanceRequest(this);
       result.name_ = name_;
@@ -359,39 +344,32 @@ public com.google.spanner.admin.instance.v1.GetInstanceRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.admin.instance.v1.GetInstanceRequest) {
         return mergeFrom((com.google.spanner.admin.instance.v1.GetInstanceRequest)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.spanner.admin.instance.v1.GetInstanceRequest
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.spanner.admin.instance.v1.GetInstanceRequest getDefault
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetInstanceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetInstanceRequest(input, extensionRegistry);
+        return new GetInstanceRequest(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.admin.instance.v1.GetInstanceRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/Instance.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/Instance.java
index 5ea0028d0363..3446ecd114d3 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/Instance.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/Instance.java
@@ -37,9 +37,6 @@ private Instance(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private Instance(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -93,13 +97,6 @@ private Instance(
                 labels__.getKey(), labels__.getValue());
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -118,7 +115,6 @@ private Instance(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -129,7 +125,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_Instance_fieldAccessorTable
@@ -463,7 +458,6 @@ public int getStateValue() {
    * .google.spanner.admin.instance.v1.Instance.State state = 6;
    */
   public com.google.spanner.admin.instance.v1.Instance.State getState() {
-    @SuppressWarnings("deprecation")
     com.google.spanner.admin.instance.v1.Instance.State result = com.google.spanner.admin.instance.v1.Instance.State.valueOf(state_);
     return result == null ? com.google.spanner.admin.instance.v1.Instance.State.UNRECOGNIZED : result;
   }
@@ -629,7 +623,6 @@ public java.lang.String getLabelsOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -639,7 +632,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -666,7 +658,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -826,7 +817,6 @@ public static com.google.spanner.admin.instance.v1.Instance parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -834,7 +824,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.admin.instance.v1.Instance prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -884,7 +873,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_Instance_fieldAccessorTable
@@ -907,7 +895,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -924,18 +911,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_Instance_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.Instance getDefaultInstanceForType() {
       return com.google.spanner.admin.instance.v1.Instance.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.Instance build() {
       com.google.spanner.admin.instance.v1.Instance result = buildPartial();
       if (!result.isInitialized()) {
@@ -944,7 +928,6 @@ public com.google.spanner.admin.instance.v1.Instance build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.Instance buildPartial() {
       com.google.spanner.admin.instance.v1.Instance result = new com.google.spanner.admin.instance.v1.Instance(this);
       int from_bitField0_ = bitField0_;
@@ -961,39 +944,32 @@ public com.google.spanner.admin.instance.v1.Instance buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.admin.instance.v1.Instance) {
         return mergeFrom((com.google.spanner.admin.instance.v1.Instance)other);
@@ -1030,12 +1006,10 @@ public Builder mergeFrom(com.google.spanner.admin.instance.v1.Instance other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1447,7 +1421,6 @@ public Builder setStateValue(int value) {
      * .google.spanner.admin.instance.v1.Instance.State state = 6;
      */
     public com.google.spanner.admin.instance.v1.Instance.State getState() {
-      @SuppressWarnings("deprecation")
       com.google.spanner.admin.instance.v1.Instance.State result = com.google.spanner.admin.instance.v1.Instance.State.valueOf(state_);
       return result == null ? com.google.spanner.admin.instance.v1.Instance.State.UNRECOGNIZED : result;
     }
@@ -1758,13 +1731,11 @@ public Builder putAllLabels(
           .putAll(values);
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1786,12 +1757,11 @@ public static com.google.spanner.admin.instance.v1.Instance getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Instance parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Instance(input, extensionRegistry);
+        return new Instance(input, extensionRegistry);
     }
   };
 
@@ -1804,7 +1774,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.admin.instance.v1.Instance getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/InstanceConfig.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/InstanceConfig.java
index 1a9795ed7960..b3a76cc91ff6 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/InstanceConfig.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/InstanceConfig.java
@@ -35,9 +35,6 @@ private InstanceConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private InstanceConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -61,13 +65,6 @@ private InstanceConfig(
             displayName_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -85,7 +82,6 @@ private InstanceConfig(
     return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_InstanceConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_InstanceConfig_fieldAccessorTable
@@ -182,7 +178,6 @@ public java.lang.String getDisplayName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -192,7 +187,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -204,7 +198,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -326,7 +319,6 @@ public static com.google.spanner.admin.instance.v1.InstanceConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -334,7 +326,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.admin.instance.v1.InstanceConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -363,7 +354,6 @@ public static final class Builder extends
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_InstanceConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_InstanceConfig_fieldAccessorTable
@@ -386,7 +376,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -396,18 +385,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_InstanceConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.InstanceConfig getDefaultInstanceForType() {
       return com.google.spanner.admin.instance.v1.InstanceConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.InstanceConfig build() {
       com.google.spanner.admin.instance.v1.InstanceConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -416,7 +402,6 @@ public com.google.spanner.admin.instance.v1.InstanceConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.InstanceConfig buildPartial() {
       com.google.spanner.admin.instance.v1.InstanceConfig result = new com.google.spanner.admin.instance.v1.InstanceConfig(this);
       result.name_ = name_;
@@ -425,39 +410,32 @@ public com.google.spanner.admin.instance.v1.InstanceConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.admin.instance.v1.InstanceConfig) {
         return mergeFrom((com.google.spanner.admin.instance.v1.InstanceConfig)other);
@@ -482,12 +460,10 @@ public Builder mergeFrom(com.google.spanner.admin.instance.v1.InstanceConfig oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -693,13 +669,11 @@ public Builder setDisplayNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -721,12 +695,11 @@ public static com.google.spanner.admin.instance.v1.InstanceConfig getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public InstanceConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InstanceConfig(input, extensionRegistry);
+        return new InstanceConfig(input, extensionRegistry);
     }
   };
 
@@ -739,7 +712,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.admin.instance.v1.InstanceConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstanceConfigsRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstanceConfigsRequest.java
index 3db08124baa6..fe59e9f76b8b 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstanceConfigsRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstanceConfigsRequest.java
@@ -35,9 +35,6 @@ private ListInstanceConfigsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListInstanceConfigsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ListInstanceConfigsRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListInstanceConfigsRequest(
     return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_ListInstanceConfigsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_ListInstanceConfigsRequest_fieldAccessorTable
@@ -205,7 +201,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -215,7 +210,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -230,7 +224,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -360,7 +353,6 @@ public static com.google.spanner.admin.instance.v1.ListInstanceConfigsRequest pa
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -368,7 +360,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.admin.instance.v1.ListInstanceConfigsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -396,7 +387,6 @@ public static final class Builder extends
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_ListInstanceConfigsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_ListInstanceConfigsRequest_fieldAccessorTable
@@ -419,7 +409,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -431,18 +420,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_ListInstanceConfigsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.ListInstanceConfigsRequest getDefaultInstanceForType() {
       return com.google.spanner.admin.instance.v1.ListInstanceConfigsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.ListInstanceConfigsRequest build() {
       com.google.spanner.admin.instance.v1.ListInstanceConfigsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -451,7 +437,6 @@ public com.google.spanner.admin.instance.v1.ListInstanceConfigsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.ListInstanceConfigsRequest buildPartial() {
       com.google.spanner.admin.instance.v1.ListInstanceConfigsRequest result = new com.google.spanner.admin.instance.v1.ListInstanceConfigsRequest(this);
       result.parent_ = parent_;
@@ -461,39 +446,32 @@ public com.google.spanner.admin.instance.v1.ListInstanceConfigsRequest buildPart
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.admin.instance.v1.ListInstanceConfigsRequest) {
         return mergeFrom((com.google.spanner.admin.instance.v1.ListInstanceConfigsRequest)other);
@@ -521,12 +499,10 @@ public Builder mergeFrom(com.google.spanner.admin.instance.v1.ListInstanceConfig
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -783,13 +759,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -811,12 +785,11 @@ public static com.google.spanner.admin.instance.v1.ListInstanceConfigsRequest ge
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListInstanceConfigsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListInstanceConfigsRequest(input, extensionRegistry);
+        return new ListInstanceConfigsRequest(input, extensionRegistry);
     }
   };
 
@@ -829,7 +802,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.admin.instance.v1.ListInstanceConfigsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstanceConfigsResponse.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstanceConfigsResponse.java
index 52a668b784c4..3114377c2dac 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstanceConfigsResponse.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstanceConfigsResponse.java
@@ -34,9 +34,6 @@ private ListInstanceConfigsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListInstanceConfigsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               instanceConfigs_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListInstanceConfigsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListInstanceConfigsResponse(
     return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_ListInstanceConfigsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_ListInstanceConfigsResponse_fieldAccessorTable
@@ -201,7 +197,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -211,7 +206,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < instanceConfigs_.size(); i++) {
@@ -223,7 +217,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.spanner.admin.instance.v1.ListInstanceConfigsResponse p
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.admin.instance.v1.ListInstanceConfigsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_ListInstanceConfigsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_ListInstanceConfigsResponse_fieldAccessorTable
@@ -408,7 +398,6 @@ private void maybeForceBuilderInitialization() {
         getInstanceConfigsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (instanceConfigsBuilder_ == null) {
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_ListInstanceConfigsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.ListInstanceConfigsResponse getDefaultInstanceForType() {
       return com.google.spanner.admin.instance.v1.ListInstanceConfigsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.ListInstanceConfigsResponse build() {
       com.google.spanner.admin.instance.v1.ListInstanceConfigsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public com.google.spanner.admin.instance.v1.ListInstanceConfigsResponse build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.ListInstanceConfigsResponse buildPartial() {
       com.google.spanner.admin.instance.v1.ListInstanceConfigsResponse result = new com.google.spanner.admin.instance.v1.ListInstanceConfigsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -462,39 +447,32 @@ public com.google.spanner.admin.instance.v1.ListInstanceConfigsResponse buildPar
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.admin.instance.v1.ListInstanceConfigsResponse) {
         return mergeFrom((com.google.spanner.admin.instance.v1.ListInstanceConfigsResponse)other);
@@ -541,12 +519,10 @@ public Builder mergeFrom(com.google.spanner.admin.instance.v1.ListInstanceConfig
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -976,13 +952,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1004,12 +978,11 @@ public static com.google.spanner.admin.instance.v1.ListInstanceConfigsResponse g
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListInstanceConfigsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListInstanceConfigsResponse(input, extensionRegistry);
+        return new ListInstanceConfigsResponse(input, extensionRegistry);
     }
   };
 
@@ -1022,7 +995,6 @@ public com.google.protobuf.Parser getParserForType(
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.admin.instance.v1.ListInstanceConfigsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstancesRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstancesRequest.java
index 9763de82a6a7..b53a505d60b8 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstancesRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstancesRequest.java
@@ -36,9 +36,6 @@ private ListInstancesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private ListInstancesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private ListInstancesRequest(
             filter_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private ListInstancesRequest(
     return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_ListInstancesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_ListInstancesRequest_fieldAccessorTable
@@ -282,7 +278,6 @@ public java.lang.String getFilter() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -292,7 +287,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -310,7 +304,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -447,7 +440,6 @@ public static com.google.spanner.admin.instance.v1.ListInstancesRequest parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -455,7 +447,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.admin.instance.v1.ListInstancesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -483,7 +474,6 @@ public static final class Builder extends
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_ListInstancesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_ListInstancesRequest_fieldAccessorTable
@@ -506,7 +496,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -520,18 +509,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_ListInstancesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.ListInstancesRequest getDefaultInstanceForType() {
       return com.google.spanner.admin.instance.v1.ListInstancesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.ListInstancesRequest build() {
       com.google.spanner.admin.instance.v1.ListInstancesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -540,7 +526,6 @@ public com.google.spanner.admin.instance.v1.ListInstancesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.ListInstancesRequest buildPartial() {
       com.google.spanner.admin.instance.v1.ListInstancesRequest result = new com.google.spanner.admin.instance.v1.ListInstancesRequest(this);
       result.parent_ = parent_;
@@ -551,39 +536,32 @@ public com.google.spanner.admin.instance.v1.ListInstancesRequest buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.admin.instance.v1.ListInstancesRequest) {
         return mergeFrom((com.google.spanner.admin.instance.v1.ListInstancesRequest)other);
@@ -615,12 +593,10 @@ public Builder mergeFrom(com.google.spanner.admin.instance.v1.ListInstancesReque
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1036,13 +1012,11 @@ public Builder setFilterBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1064,12 +1038,11 @@ public static com.google.spanner.admin.instance.v1.ListInstancesRequest getDefau
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListInstancesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListInstancesRequest(input, extensionRegistry);
+        return new ListInstancesRequest(input, extensionRegistry);
     }
   };
 
@@ -1082,7 +1055,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.admin.instance.v1.ListInstancesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstancesResponse.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstancesResponse.java
index e73c862b599b..ef6b1156cbea 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstancesResponse.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstancesResponse.java
@@ -34,9 +34,6 @@ private ListInstancesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListInstancesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               instances_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListInstancesResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListInstancesResponse(
     return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_ListInstancesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_ListInstancesResponse_fieldAccessorTable
@@ -201,7 +197,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -211,7 +206,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < instances_.size(); i++) {
@@ -223,7 +217,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.spanner.admin.instance.v1.ListInstancesResponse parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.admin.instance.v1.ListInstancesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_ListInstancesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_ListInstancesResponse_fieldAccessorTable
@@ -408,7 +398,6 @@ private void maybeForceBuilderInitialization() {
         getInstancesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (instancesBuilder_ == null) {
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_ListInstancesResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.ListInstancesResponse getDefaultInstanceForType() {
       return com.google.spanner.admin.instance.v1.ListInstancesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.ListInstancesResponse build() {
       com.google.spanner.admin.instance.v1.ListInstancesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public com.google.spanner.admin.instance.v1.ListInstancesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.ListInstancesResponse buildPartial() {
       com.google.spanner.admin.instance.v1.ListInstancesResponse result = new com.google.spanner.admin.instance.v1.ListInstancesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -462,39 +447,32 @@ public com.google.spanner.admin.instance.v1.ListInstancesResponse buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.admin.instance.v1.ListInstancesResponse) {
         return mergeFrom((com.google.spanner.admin.instance.v1.ListInstancesResponse)other);
@@ -541,12 +519,10 @@ public Builder mergeFrom(com.google.spanner.admin.instance.v1.ListInstancesRespo
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -976,13 +952,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1004,12 +978,11 @@ public static com.google.spanner.admin.instance.v1.ListInstancesResponse getDefa
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListInstancesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListInstancesResponse(input, extensionRegistry);
+        return new ListInstancesResponse(input, extensionRegistry);
     }
   };
 
@@ -1022,7 +995,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.admin.instance.v1.ListInstancesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/SpannerInstanceAdminProto.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/SpannerInstanceAdminProto.java
index 63cefbced136..e599b2ccc6d0 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/SpannerInstanceAdminProto.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/SpannerInstanceAdminProto.java
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "f/empty.proto\032 google/protobuf/field_mas" +
       "k.proto\032\037google/protobuf/timestamp.proto" +
       "\"4\n\016InstanceConfig\022\014\n\004name\030\001 \001(\t\022\024\n\014disp" +
-      "lay_name\030\002 \001(\t\"\303\002\n\010Instance\022\014\n\004name\030\001 \001(" +
+      "lay_name\030\002 \001(\t\"\303\002\n\010Instance\022\014\n\004name\030\001 \001(",
       "\t\022\016\n\006config\030\002 \001(\t\022\024\n\014display_name\030\003 \001(\t\022" +
       "\022\n\nnode_count\030\005 \001(\005\022?\n\005state\030\006 \001(\01620.goo" +
       "gle.spanner.admin.instance.v1.Instance.S" +
@@ -112,7 +112,7 @@ public static void registerAllExtensions(
       "\0028\001\"7\n\005State\022\025\n\021STATE_UNSPECIFIED\020\000\022\014\n\010C" +
       "REATING\020\001\022\t\n\005READY\020\002\"S\n\032ListInstanceConf" +
       "igsRequest\022\016\n\006parent\030\001 \001(\t\022\021\n\tpage_size\030" +
-      "\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\"\202\001\n\033ListInstan" +
+      "\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\"\202\001\n\033ListInstan",
       "ceConfigsResponse\022J\n\020instance_configs\030\001 " +
       "\003(\01320.google.spanner.admin.instance.v1.I" +
       "nstanceConfig\022\027\n\017next_page_token\030\002 \001(\t\"(" +
@@ -122,7 +122,7 @@ public static void registerAllExtensions(
       "\013instance_id\030\002 \001(\t\022<\n\010instance\030\003 \001(\0132*.g" +
       "oogle.spanner.admin.instance.v1.Instance" +
       "\"]\n\024ListInstancesRequest\022\016\n\006parent\030\001 \001(\t" +
-      "\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\022" +
+      "\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\022",
       "\016\n\006filter\030\004 \001(\t\"o\n\025ListInstancesResponse" +
       "\022=\n\tinstances\030\001 \003(\0132*.google.spanner.adm" +
       "in.instance.v1.Instance\022\027\n\017next_page_tok" +
@@ -132,7 +132,7 @@ public static void registerAllExtensions(
       "oogle.protobuf.FieldMask\"%\n\025DeleteInstan" +
       "ceRequest\022\014\n\004name\030\001 \001(\t\"\345\001\n\026CreateInstan" +
       "ceMetadata\022<\n\010instance\030\001 \001(\0132*.google.sp" +
-      "anner.admin.instance.v1.Instance\022.\n\nstar" +
+      "anner.admin.instance.v1.Instance\022.\n\nstar",
       "t_time\030\002 \001(\0132\032.google.protobuf.Timestamp" +
       "\022/\n\013cancel_time\030\003 \001(\0132\032.google.protobuf." +
       "Timestamp\022,\n\010end_time\030\004 \001(\0132\032.google.pro" +
@@ -142,7 +142,7 @@ public static void registerAllExtensions(
       " \001(\0132\032.google.protobuf.Timestamp\022/\n\013canc" +
       "el_time\030\003 \001(\0132\032.google.protobuf.Timestam" +
       "p\022,\n\010end_time\030\004 \001(\0132\032.google.protobuf.Ti" +
-      "mestamp2\346\014\n\rInstanceAdmin\022\303\001\n\023ListInstan" +
+      "mestamp2\346\014\n\rInstanceAdmin\022\303\001\n\023ListInstan",
       "ceConfigs\022<.google.spanner.admin.instanc" +
       "e.v1.ListInstanceConfigsRequest\032=.google" +
       ".spanner.admin.instance.v1.ListInstanceC" +
@@ -152,7 +152,7 @@ public static void registerAllExtensions(
       ".GetInstanceConfigRequest\0320.google.spann" +
       "er.admin.instance.v1.InstanceConfig\"/\202\323\344" +
       "\223\002)\022\'/v1/{name=projects/*/instanceConfig" +
-      "s/*}\022\253\001\n\rListInstances\0226.google.spanner." +
+      "s/*}\022\253\001\n\rListInstances\0226.google.spanner.",
       "admin.instance.v1.ListInstancesRequest\0327" +
       ".google.spanner.admin.instance.v1.ListIn" +
       "stancesResponse\")\202\323\344\223\002#\022!/v1/{parent=pro" +
@@ -162,7 +162,7 @@ public static void registerAllExtensions(
       ".v1.Instance\")\202\323\344\223\002#\022!/v1/{name=projects" +
       "/*/instances/*}\022\226\001\n\016CreateInstance\0227.goo" +
       "gle.spanner.admin.instance.v1.CreateInst" +
-      "anceRequest\032\035.google.longrunning.Operati" +
+      "anceRequest\032\035.google.longrunning.Operati",
       "on\",\202\323\344\223\002&\"!/v1/{parent=projects/*}/inst" +
       "ances:\001*\022\237\001\n\016UpdateInstance\0227.google.spa" +
       "nner.admin.instance.v1.UpdateInstanceReq" +
@@ -172,7 +172,7 @@ public static void registerAllExtensions(
       "panner.admin.instance.v1.DeleteInstanceR" +
       "equest\032\026.google.protobuf.Empty\")\202\323\344\223\002#*!" +
       "/v1/{name=projects/*/instances/*}\022\210\001\n\014Se" +
-      "tIamPolicy\022\".google.iam.v1.SetIamPolicyR" +
+      "tIamPolicy\022\".google.iam.v1.SetIamPolicyR",
       "equest\032\025.google.iam.v1.Policy\"=\202\323\344\223\0027\"2/" +
       "v1/{resource=projects/*/instances/*}:set" +
       "IamPolicy:\001*\022\210\001\n\014GetIamPolicy\022\".google.i" +
@@ -182,7 +182,7 @@ public static void registerAllExtensions(
       "IamPermissions\022(.google.iam.v1.TestIamPe" +
       "rmissionsRequest\032).google.iam.v1.TestIam" +
       "PermissionsResponse\"C\202\323\344\223\002=\"8/v1/{resour" +
-      "ce=projects/*/instances/*}:testIamPermis" +
+      "ce=projects/*/instances/*}:testIamPermis",
       "sions:\001*B\337\001\n$com.google.spanner.admin.in" +
       "stance.v1B\031SpannerInstanceAdminProtoP\001ZH" +
       "google.golang.org/genproto/googleapis/sp" +
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/UpdateInstanceMetadata.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/UpdateInstanceMetadata.java
index 75cbf8858771..73f37986ac67 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/UpdateInstanceMetadata.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/UpdateInstanceMetadata.java
@@ -33,9 +33,6 @@ private UpdateInstanceMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private UpdateInstanceMetadata(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.spanner.admin.instance.v1.Instance.Builder subBuilder = null;
             if (instance_ != null) {
@@ -99,13 +103,6 @@ private UpdateInstanceMetadata(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -123,7 +120,6 @@ private UpdateInstanceMetadata(
     return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_UpdateInstanceMetadata_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_UpdateInstanceMetadata_fieldAccessorTable
@@ -273,7 +269,6 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -283,7 +278,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (instance_ != null) {
@@ -301,7 +295,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -461,7 +454,6 @@ public static com.google.spanner.admin.instance.v1.UpdateInstanceMetadata parseF
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -469,7 +461,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.admin.instance.v1.UpdateInstanceMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -498,7 +489,6 @@ public static final class Builder extends
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_UpdateInstanceMetadata_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_UpdateInstanceMetadata_fieldAccessorTable
@@ -521,7 +511,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (instanceBuilder_ == null) {
@@ -551,18 +540,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_UpdateInstanceMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.UpdateInstanceMetadata getDefaultInstanceForType() {
       return com.google.spanner.admin.instance.v1.UpdateInstanceMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.UpdateInstanceMetadata build() {
       com.google.spanner.admin.instance.v1.UpdateInstanceMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -571,7 +557,6 @@ public com.google.spanner.admin.instance.v1.UpdateInstanceMetadata build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.UpdateInstanceMetadata buildPartial() {
       com.google.spanner.admin.instance.v1.UpdateInstanceMetadata result = new com.google.spanner.admin.instance.v1.UpdateInstanceMetadata(this);
       if (instanceBuilder_ == null) {
@@ -598,39 +583,32 @@ public com.google.spanner.admin.instance.v1.UpdateInstanceMetadata buildPartial(
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.admin.instance.v1.UpdateInstanceMetadata) {
         return mergeFrom((com.google.spanner.admin.instance.v1.UpdateInstanceMetadata)other);
@@ -659,12 +637,10 @@ public Builder mergeFrom(com.google.spanner.admin.instance.v1.UpdateInstanceMeta
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1321,13 +1297,11 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
       }
       return endTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1349,12 +1323,11 @@ public static com.google.spanner.admin.instance.v1.UpdateInstanceMetadata getDef
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateInstanceMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateInstanceMetadata(input, extensionRegistry);
+        return new UpdateInstanceMetadata(input, extensionRegistry);
     }
   };
 
@@ -1367,7 +1340,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.admin.instance.v1.UpdateInstanceMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/UpdateInstanceRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/UpdateInstanceRequest.java
index be946cf4591d..5d19c79b9b64 100644
--- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/UpdateInstanceRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/UpdateInstanceRequest.java
@@ -32,9 +32,6 @@ private UpdateInstanceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private UpdateInstanceRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.spanner.admin.instance.v1.Instance.Builder subBuilder = null;
             if (instance_ != null) {
@@ -72,13 +76,6 @@ private UpdateInstanceRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private UpdateInstanceRequest(
     return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_UpdateInstanceRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_UpdateInstanceRequest_fieldAccessorTable
@@ -183,7 +179,6 @@ public com.google.protobuf.FieldMaskOrBuilder getFieldMaskOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -193,7 +188,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (instance_ != null) {
@@ -205,7 +199,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -339,7 +332,6 @@ public static com.google.spanner.admin.instance.v1.UpdateInstanceRequest parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -347,7 +339,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.admin.instance.v1.UpdateInstanceRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -375,7 +366,6 @@ public static final class Builder extends
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_UpdateInstanceRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_UpdateInstanceRequest_fieldAccessorTable
@@ -398,7 +388,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (instanceBuilder_ == null) {
@@ -416,18 +405,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.admin.instance.v1.SpannerInstanceAdminProto.internal_static_google_spanner_admin_instance_v1_UpdateInstanceRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.UpdateInstanceRequest getDefaultInstanceForType() {
       return com.google.spanner.admin.instance.v1.UpdateInstanceRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.UpdateInstanceRequest build() {
       com.google.spanner.admin.instance.v1.UpdateInstanceRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -436,7 +422,6 @@ public com.google.spanner.admin.instance.v1.UpdateInstanceRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.admin.instance.v1.UpdateInstanceRequest buildPartial() {
       com.google.spanner.admin.instance.v1.UpdateInstanceRequest result = new com.google.spanner.admin.instance.v1.UpdateInstanceRequest(this);
       if (instanceBuilder_ == null) {
@@ -453,39 +438,32 @@ public com.google.spanner.admin.instance.v1.UpdateInstanceRequest buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.admin.instance.v1.UpdateInstanceRequest) {
         return mergeFrom((com.google.spanner.admin.instance.v1.UpdateInstanceRequest)other);
@@ -508,12 +486,10 @@ public Builder mergeFrom(com.google.spanner.admin.instance.v1.UpdateInstanceRequ
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -873,13 +849,11 @@ public com.google.protobuf.FieldMaskOrBuilder getFieldMaskOrBuilder() {
       }
       return fieldMaskBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -901,12 +875,11 @@ public static com.google.spanner.admin.instance.v1.UpdateInstanceRequest getDefa
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateInstanceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateInstanceRequest(input, extensionRegistry);
+        return new UpdateInstanceRequest(input, extensionRegistry);
     }
   };
 
@@ -919,7 +892,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.admin.instance.v1.UpdateInstanceRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BeginTransactionRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BeginTransactionRequest.java
index d575f306d75d..7f2f87790af7 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BeginTransactionRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BeginTransactionRequest.java
@@ -33,9 +33,6 @@ private BeginTransactionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private BeginTransactionRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private BeginTransactionRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private BeginTransactionRequest(
     return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_BeginTransactionRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_BeginTransactionRequest_fieldAccessorTable
@@ -174,7 +170,6 @@ public com.google.spanner.v1.TransactionOptionsOrBuilder getOptionsOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -184,7 +179,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getSessionBytes().isEmpty()) {
@@ -196,7 +190,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -324,7 +317,6 @@ public static com.google.spanner.v1.BeginTransactionRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -332,7 +324,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.v1.BeginTransactionRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -360,7 +351,6 @@ public static final class Builder extends
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_BeginTransactionRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_BeginTransactionRequest_fieldAccessorTable
@@ -383,7 +373,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       session_ = "";
@@ -397,18 +386,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_BeginTransactionRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.BeginTransactionRequest getDefaultInstanceForType() {
       return com.google.spanner.v1.BeginTransactionRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.BeginTransactionRequest build() {
       com.google.spanner.v1.BeginTransactionRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -417,7 +403,6 @@ public com.google.spanner.v1.BeginTransactionRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.BeginTransactionRequest buildPartial() {
       com.google.spanner.v1.BeginTransactionRequest result = new com.google.spanner.v1.BeginTransactionRequest(this);
       result.session_ = session_;
@@ -430,39 +415,32 @@ public com.google.spanner.v1.BeginTransactionRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.v1.BeginTransactionRequest) {
         return mergeFrom((com.google.spanner.v1.BeginTransactionRequest)other);
@@ -486,12 +464,10 @@ public Builder mergeFrom(com.google.spanner.v1.BeginTransactionRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -751,13 +727,11 @@ public com.google.spanner.v1.TransactionOptionsOrBuilder getOptionsOrBuilder() {
       }
       return optionsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -779,12 +753,11 @@ public static com.google.spanner.v1.BeginTransactionRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BeginTransactionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BeginTransactionRequest(input, extensionRegistry);
+        return new BeginTransactionRequest(input, extensionRegistry);
     }
   };
 
@@ -797,7 +770,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.v1.BeginTransactionRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitRequest.java
index 58313f134b42..63d08a354d1a 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitRequest.java
@@ -34,9 +34,6 @@ private CommitRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private CommitRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -82,13 +86,6 @@ private CommitRequest(
                 input.readMessage(com.google.spanner.v1.Mutation.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -109,7 +106,6 @@ private CommitRequest(
     return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_CommitRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_CommitRequest_fieldAccessorTable
@@ -341,7 +337,6 @@ public com.google.spanner.v1.MutationOrBuilder getMutationsOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -351,7 +346,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getSessionBytes().isEmpty()) {
@@ -370,7 +364,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -531,7 +524,6 @@ public static com.google.spanner.v1.CommitRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -539,7 +531,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.v1.CommitRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -567,7 +558,6 @@ public static final class Builder extends
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_CommitRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_CommitRequest_fieldAccessorTable
@@ -591,7 +581,6 @@ private void maybeForceBuilderInitialization() {
         getMutationsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       session_ = "";
@@ -607,18 +596,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_CommitRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.CommitRequest getDefaultInstanceForType() {
       return com.google.spanner.v1.CommitRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.CommitRequest build() {
       com.google.spanner.v1.CommitRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -627,7 +613,6 @@ public com.google.spanner.v1.CommitRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.CommitRequest buildPartial() {
       com.google.spanner.v1.CommitRequest result = new com.google.spanner.v1.CommitRequest(this);
       int from_bitField0_ = bitField0_;
@@ -658,39 +643,32 @@ public com.google.spanner.v1.CommitRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.v1.CommitRequest) {
         return mergeFrom((com.google.spanner.v1.CommitRequest)other);
@@ -750,12 +728,10 @@ public Builder mergeFrom(com.google.spanner.v1.CommitRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1515,13 +1491,11 @@ public com.google.spanner.v1.Mutation.Builder addMutationsBuilder(
       }
       return mutationsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1543,12 +1517,11 @@ public static com.google.spanner.v1.CommitRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CommitRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CommitRequest(input, extensionRegistry);
+        return new CommitRequest(input, extensionRegistry);
     }
   };
 
@@ -1561,7 +1534,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.v1.CommitRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitResponse.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitResponse.java
index fcb8b0587dc7..f9515517176b 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitResponse.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitResponse.java
@@ -32,9 +32,6 @@ private CommitResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private CommitResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.protobuf.Timestamp.Builder subBuilder = null;
             if (commitTimestamp_ != null) {
@@ -59,13 +63,6 @@ private CommitResponse(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private CommitResponse(
     return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_CommitResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_CommitResponse_fieldAccessorTable
@@ -125,7 +121,6 @@ public com.google.protobuf.TimestampOrBuilder getCommitTimestampOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -135,7 +130,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (commitTimestamp_ != null) {
@@ -144,7 +138,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static com.google.spanner.v1.CommitResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.v1.CommitResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_CommitResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_CommitResponse_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (commitTimestampBuilder_ == null) {
@@ -336,18 +325,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_CommitResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.CommitResponse getDefaultInstanceForType() {
       return com.google.spanner.v1.CommitResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.CommitResponse build() {
       com.google.spanner.v1.CommitResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -356,7 +342,6 @@ public com.google.spanner.v1.CommitResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.CommitResponse buildPartial() {
       com.google.spanner.v1.CommitResponse result = new com.google.spanner.v1.CommitResponse(this);
       if (commitTimestampBuilder_ == null) {
@@ -368,39 +353,32 @@ public com.google.spanner.v1.CommitResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.v1.CommitResponse) {
         return mergeFrom((com.google.spanner.v1.CommitResponse)other);
@@ -420,12 +398,10 @@ public Builder mergeFrom(com.google.spanner.v1.CommitResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -596,13 +572,11 @@ public com.google.protobuf.TimestampOrBuilder getCommitTimestampOrBuilder() {
       }
       return commitTimestampBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -624,12 +598,11 @@ public static com.google.spanner.v1.CommitResponse getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CommitResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CommitResponse(input, extensionRegistry);
+        return new CommitResponse(input, extensionRegistry);
     }
   };
 
@@ -642,7 +615,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.v1.CommitResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CreateSessionRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CreateSessionRequest.java
index f4717bf31c5e..754271d527ad 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CreateSessionRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CreateSessionRequest.java
@@ -33,9 +33,6 @@ private CreateSessionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private CreateSessionRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private CreateSessionRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private CreateSessionRequest(
     return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_CreateSessionRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_CreateSessionRequest_fieldAccessorTable
@@ -174,7 +170,6 @@ public com.google.spanner.v1.SessionOrBuilder getSessionOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -184,7 +179,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getDatabaseBytes().isEmpty()) {
@@ -196,7 +190,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -324,7 +317,6 @@ public static com.google.spanner.v1.CreateSessionRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -332,7 +324,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.v1.CreateSessionRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -360,7 +351,6 @@ public static final class Builder extends
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_CreateSessionRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_CreateSessionRequest_fieldAccessorTable
@@ -383,7 +373,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       database_ = "";
@@ -397,18 +386,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_CreateSessionRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.CreateSessionRequest getDefaultInstanceForType() {
       return com.google.spanner.v1.CreateSessionRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.CreateSessionRequest build() {
       com.google.spanner.v1.CreateSessionRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -417,7 +403,6 @@ public com.google.spanner.v1.CreateSessionRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.CreateSessionRequest buildPartial() {
       com.google.spanner.v1.CreateSessionRequest result = new com.google.spanner.v1.CreateSessionRequest(this);
       result.database_ = database_;
@@ -430,39 +415,32 @@ public com.google.spanner.v1.CreateSessionRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.v1.CreateSessionRequest) {
         return mergeFrom((com.google.spanner.v1.CreateSessionRequest)other);
@@ -486,12 +464,10 @@ public Builder mergeFrom(com.google.spanner.v1.CreateSessionRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -751,13 +727,11 @@ public com.google.spanner.v1.SessionOrBuilder getSessionOrBuilder() {
       }
       return sessionBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -779,12 +753,11 @@ public static com.google.spanner.v1.CreateSessionRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateSessionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateSessionRequest(input, extensionRegistry);
+        return new CreateSessionRequest(input, extensionRegistry);
     }
   };
 
@@ -797,7 +770,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.v1.CreateSessionRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DeleteSessionRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DeleteSessionRequest.java
index c7963fb58138..b8b962d91a69 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DeleteSessionRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DeleteSessionRequest.java
@@ -33,9 +33,6 @@ private DeleteSessionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteSessionRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteSessionRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteSessionRequest(
     return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_DeleteSessionRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_DeleteSessionRequest_fieldAccessorTable
@@ -128,7 +124,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -138,7 +133,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -147,7 +141,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -262,7 +255,6 @@ public static com.google.spanner.v1.DeleteSessionRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -270,7 +262,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.v1.DeleteSessionRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -298,7 +289,6 @@ public static final class Builder extends
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_DeleteSessionRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_DeleteSessionRequest_fieldAccessorTable
@@ -321,7 +311,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -329,18 +318,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_DeleteSessionRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.DeleteSessionRequest getDefaultInstanceForType() {
       return com.google.spanner.v1.DeleteSessionRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.DeleteSessionRequest build() {
       com.google.spanner.v1.DeleteSessionRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -349,7 +335,6 @@ public com.google.spanner.v1.DeleteSessionRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.DeleteSessionRequest buildPartial() {
       com.google.spanner.v1.DeleteSessionRequest result = new com.google.spanner.v1.DeleteSessionRequest(this);
       result.name_ = name_;
@@ -357,39 +342,32 @@ public com.google.spanner.v1.DeleteSessionRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.v1.DeleteSessionRequest) {
         return mergeFrom((com.google.spanner.v1.DeleteSessionRequest)other);
@@ -410,12 +388,10 @@ public Builder mergeFrom(com.google.spanner.v1.DeleteSessionRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -522,13 +498,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -550,12 +524,11 @@ public static com.google.spanner.v1.DeleteSessionRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteSessionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteSessionRequest(input, extensionRegistry);
+        return new DeleteSessionRequest(input, extensionRegistry);
     }
   };
 
@@ -568,7 +541,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.v1.DeleteSessionRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequest.java
index cde1cf05aae8..0e98592542e6 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequest.java
@@ -38,9 +38,6 @@ private ExecuteSqlRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private ExecuteSqlRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -119,13 +123,6 @@ private ExecuteSqlRequest(
             partitionToken_ = input.readBytes();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -144,7 +141,6 @@ private ExecuteSqlRequest(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -155,7 +151,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_ExecuteSqlRequest_fieldAccessorTable
@@ -646,7 +641,6 @@ public int getQueryModeValue() {
    * .google.spanner.v1.ExecuteSqlRequest.QueryMode query_mode = 7;
    */
   public com.google.spanner.v1.ExecuteSqlRequest.QueryMode getQueryMode() {
-    @SuppressWarnings("deprecation")
     com.google.spanner.v1.ExecuteSqlRequest.QueryMode result = com.google.spanner.v1.ExecuteSqlRequest.QueryMode.valueOf(queryMode_);
     return result == null ? com.google.spanner.v1.ExecuteSqlRequest.QueryMode.UNRECOGNIZED : result;
   }
@@ -668,7 +662,6 @@ public com.google.protobuf.ByteString getPartitionToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -678,7 +671,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getSessionBytes().isEmpty()) {
@@ -711,7 +703,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -898,7 +889,6 @@ public static com.google.spanner.v1.ExecuteSqlRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -906,7 +896,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.v1.ExecuteSqlRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -957,7 +946,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_ExecuteSqlRequest_fieldAccessorTable
@@ -980,7 +968,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       session_ = "";
@@ -1009,18 +996,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_ExecuteSqlRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.ExecuteSqlRequest getDefaultInstanceForType() {
       return com.google.spanner.v1.ExecuteSqlRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.ExecuteSqlRequest build() {
       com.google.spanner.v1.ExecuteSqlRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -1029,7 +1013,6 @@ public com.google.spanner.v1.ExecuteSqlRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.ExecuteSqlRequest buildPartial() {
       com.google.spanner.v1.ExecuteSqlRequest result = new com.google.spanner.v1.ExecuteSqlRequest(this);
       int from_bitField0_ = bitField0_;
@@ -1056,39 +1039,32 @@ public com.google.spanner.v1.ExecuteSqlRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.v1.ExecuteSqlRequest) {
         return mergeFrom((com.google.spanner.v1.ExecuteSqlRequest)other);
@@ -1130,12 +1106,10 @@ public Builder mergeFrom(com.google.spanner.v1.ExecuteSqlRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2024,7 +1998,6 @@ public Builder setQueryModeValue(int value) {
      * .google.spanner.v1.ExecuteSqlRequest.QueryMode query_mode = 7;
      */
     public com.google.spanner.v1.ExecuteSqlRequest.QueryMode getQueryMode() {
-      @SuppressWarnings("deprecation")
       com.google.spanner.v1.ExecuteSqlRequest.QueryMode result = com.google.spanner.v1.ExecuteSqlRequest.QueryMode.valueOf(queryMode_);
       return result == null ? com.google.spanner.v1.ExecuteSqlRequest.QueryMode.UNRECOGNIZED : result;
     }
@@ -2111,13 +2084,11 @@ public Builder clearPartitionToken() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2139,12 +2110,11 @@ public static com.google.spanner.v1.ExecuteSqlRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ExecuteSqlRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ExecuteSqlRequest(input, extensionRegistry);
+        return new ExecuteSqlRequest(input, extensionRegistry);
     }
   };
 
@@ -2157,7 +2127,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.v1.ExecuteSqlRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/GetSessionRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/GetSessionRequest.java
index 20c058b7f136..db787f7feac5 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/GetSessionRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/GetSessionRequest.java
@@ -33,9 +33,6 @@ private GetSessionRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetSessionRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetSessionRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetSessionRequest(
     return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_GetSessionRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_GetSessionRequest_fieldAccessorTable
@@ -128,7 +124,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -138,7 +133,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -147,7 +141,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -262,7 +255,6 @@ public static com.google.spanner.v1.GetSessionRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -270,7 +262,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.v1.GetSessionRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -298,7 +289,6 @@ public static final class Builder extends
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_GetSessionRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_GetSessionRequest_fieldAccessorTable
@@ -321,7 +311,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -329,18 +318,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_GetSessionRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.GetSessionRequest getDefaultInstanceForType() {
       return com.google.spanner.v1.GetSessionRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.GetSessionRequest build() {
       com.google.spanner.v1.GetSessionRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -349,7 +335,6 @@ public com.google.spanner.v1.GetSessionRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.GetSessionRequest buildPartial() {
       com.google.spanner.v1.GetSessionRequest result = new com.google.spanner.v1.GetSessionRequest(this);
       result.name_ = name_;
@@ -357,39 +342,32 @@ public com.google.spanner.v1.GetSessionRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.v1.GetSessionRequest) {
         return mergeFrom((com.google.spanner.v1.GetSessionRequest)other);
@@ -410,12 +388,10 @@ public Builder mergeFrom(com.google.spanner.v1.GetSessionRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -522,13 +498,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -550,12 +524,11 @@ public static com.google.spanner.v1.GetSessionRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetSessionRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetSessionRequest(input, extensionRegistry);
+        return new GetSessionRequest(input, extensionRegistry);
     }
   };
 
@@ -568,7 +541,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.v1.GetSessionRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeyRange.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeyRange.java
index 44463546b345..f7e84ecf6679 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeyRange.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeyRange.java
@@ -91,9 +91,6 @@ private KeyRange(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -105,6 +102,13 @@ private KeyRange(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.protobuf.ListValue.Builder subBuilder = null;
             if (startKeyTypeCase_ == 1) {
@@ -161,13 +165,6 @@ private KeyRange(
             endKeyTypeCase_ = 4;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -185,7 +182,6 @@ private KeyRange(
     return com.google.spanner.v1.KeysProto.internal_static_google_spanner_v1_KeyRange_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.v1.KeysProto.internal_static_google_spanner_v1_KeyRange_fieldAccessorTable
@@ -434,7 +430,6 @@ public com.google.protobuf.ListValueOrBuilder getEndOpenOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -444,7 +439,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (startKeyTypeCase_ == 1) {
@@ -462,7 +456,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -640,7 +633,6 @@ public static com.google.spanner.v1.KeyRange parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -648,7 +640,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.v1.KeyRange prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -735,7 +726,6 @@ public static final class Builder extends
       return com.google.spanner.v1.KeysProto.internal_static_google_spanner_v1_KeyRange_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.KeysProto.internal_static_google_spanner_v1_KeyRange_fieldAccessorTable
@@ -758,7 +748,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       startKeyTypeCase_ = 0;
@@ -768,18 +757,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.v1.KeysProto.internal_static_google_spanner_v1_KeyRange_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.KeyRange getDefaultInstanceForType() {
       return com.google.spanner.v1.KeyRange.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.KeyRange build() {
       com.google.spanner.v1.KeyRange result = buildPartial();
       if (!result.isInitialized()) {
@@ -788,7 +774,6 @@ public com.google.spanner.v1.KeyRange build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.KeyRange buildPartial() {
       com.google.spanner.v1.KeyRange result = new com.google.spanner.v1.KeyRange(this);
       if (startKeyTypeCase_ == 1) {
@@ -825,39 +810,32 @@ public com.google.spanner.v1.KeyRange buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.v1.KeyRange) {
         return mergeFrom((com.google.spanner.v1.KeyRange)other);
@@ -900,12 +878,10 @@ public Builder mergeFrom(com.google.spanner.v1.KeyRange other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1677,13 +1653,11 @@ public com.google.protobuf.ListValueOrBuilder getEndOpenOrBuilder() {
       onChanged();;
       return endOpenBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1705,12 +1679,11 @@ public static com.google.spanner.v1.KeyRange getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public KeyRange parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new KeyRange(input, extensionRegistry);
+        return new KeyRange(input, extensionRegistry);
     }
   };
 
@@ -1723,7 +1696,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.v1.KeyRange getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeySet.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeySet.java
index 9dbcb37da696..bb41e26e73f3 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeySet.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeySet.java
@@ -40,9 +40,6 @@ private KeySet(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -54,6 +51,13 @@ private KeySet(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               keys_ = new java.util.ArrayList();
@@ -77,13 +81,6 @@ private KeySet(
             all_ = input.readBool();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -107,7 +104,6 @@ private KeySet(
     return com.google.spanner.v1.KeysProto.internal_static_google_spanner_v1_KeySet_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.v1.KeysProto.internal_static_google_spanner_v1_KeySet_fieldAccessorTable
@@ -262,7 +258,6 @@ public boolean getAll() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -272,7 +267,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < keys_.size(); i++) {
@@ -287,7 +281,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -424,7 +417,6 @@ public static com.google.spanner.v1.KeySet parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -432,7 +424,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.v1.KeySet prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -465,7 +456,6 @@ public static final class Builder extends
       return com.google.spanner.v1.KeysProto.internal_static_google_spanner_v1_KeySet_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.KeysProto.internal_static_google_spanner_v1_KeySet_fieldAccessorTable
@@ -490,7 +480,6 @@ private void maybeForceBuilderInitialization() {
         getRangesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (keysBuilder_ == null) {
@@ -510,18 +499,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.v1.KeysProto.internal_static_google_spanner_v1_KeySet_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.KeySet getDefaultInstanceForType() {
       return com.google.spanner.v1.KeySet.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.KeySet build() {
       com.google.spanner.v1.KeySet result = buildPartial();
       if (!result.isInitialized()) {
@@ -530,7 +516,6 @@ public com.google.spanner.v1.KeySet build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.KeySet buildPartial() {
       com.google.spanner.v1.KeySet result = new com.google.spanner.v1.KeySet(this);
       int from_bitField0_ = bitField0_;
@@ -559,39 +544,32 @@ public com.google.spanner.v1.KeySet buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.v1.KeySet) {
         return mergeFrom((com.google.spanner.v1.KeySet)other);
@@ -663,12 +641,10 @@ public Builder mergeFrom(com.google.spanner.v1.KeySet other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1427,13 +1403,11 @@ public Builder clearAll() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1455,12 +1429,11 @@ public static com.google.spanner.v1.KeySet getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public KeySet parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new KeySet(input, extensionRegistry);
+        return new KeySet(input, extensionRegistry);
     }
   };
 
@@ -1473,7 +1446,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.v1.KeySet getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeysProto.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeysProto.java
index 69abe598b1fd..ed750411ee2e 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeysProto.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeysProto.java
@@ -42,7 +42,7 @@ public static void registerAllExtensions(
       " \001(\0132\032.google.protobuf.ListValueH\001\022.\n\010en" +
       "d_open\030\004 \001(\0132\032.google.protobuf.ListValue" +
       "H\001B\020\n\016start_key_typeB\016\n\014end_key_type\"l\n\006" +
-      "KeySet\022(\n\004keys\030\001 \003(\0132\032.google.protobuf.L" +
+      "KeySet\022(\n\004keys\030\001 \003(\0132\032.google.protobuf.L",
       "istValue\022+\n\006ranges\030\002 \003(\0132\033.google.spanne" +
       "r.v1.KeyRange\022\013\n\003all\030\003 \001(\010B\222\001\n\025com.googl" +
       "e.spanner.v1B\tKeysProtoP\001Z8google.golang" +
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsRequest.java
index 6ccd6b9e7f84..96abc593d82a 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsRequest.java
@@ -36,9 +36,6 @@ private ListSessionsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private ListSessionsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private ListSessionsRequest(
             filter_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private ListSessionsRequest(
     return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_ListSessionsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_ListSessionsRequest_fieldAccessorTable
@@ -262,7 +258,6 @@ public java.lang.String getFilter() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -272,7 +267,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getDatabaseBytes().isEmpty()) {
@@ -290,7 +284,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -427,7 +420,6 @@ public static com.google.spanner.v1.ListSessionsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -435,7 +427,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.v1.ListSessionsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -463,7 +454,6 @@ public static final class Builder extends
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_ListSessionsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_ListSessionsRequest_fieldAccessorTable
@@ -486,7 +476,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       database_ = "";
@@ -500,18 +489,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_ListSessionsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.ListSessionsRequest getDefaultInstanceForType() {
       return com.google.spanner.v1.ListSessionsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.ListSessionsRequest build() {
       com.google.spanner.v1.ListSessionsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -520,7 +506,6 @@ public com.google.spanner.v1.ListSessionsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.ListSessionsRequest buildPartial() {
       com.google.spanner.v1.ListSessionsRequest result = new com.google.spanner.v1.ListSessionsRequest(this);
       result.database_ = database_;
@@ -531,39 +516,32 @@ public com.google.spanner.v1.ListSessionsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.v1.ListSessionsRequest) {
         return mergeFrom((com.google.spanner.v1.ListSessionsRequest)other);
@@ -595,12 +573,10 @@ public Builder mergeFrom(com.google.spanner.v1.ListSessionsRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -966,13 +942,11 @@ public Builder setFilterBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -994,12 +968,11 @@ public static com.google.spanner.v1.ListSessionsRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListSessionsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListSessionsRequest(input, extensionRegistry);
+        return new ListSessionsRequest(input, extensionRegistry);
     }
   };
 
@@ -1012,7 +985,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.v1.ListSessionsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsResponse.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsResponse.java
index ca66b9cd5264..eb8175453ad5 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsResponse.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsResponse.java
@@ -34,9 +34,6 @@ private ListSessionsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListSessionsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               sessions_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListSessionsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListSessionsResponse(
     return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_ListSessionsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_ListSessionsResponse_fieldAccessorTable
@@ -201,7 +197,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -211,7 +206,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < sessions_.size(); i++) {
@@ -223,7 +217,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.spanner.v1.ListSessionsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.v1.ListSessionsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_ListSessionsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_ListSessionsResponse_fieldAccessorTable
@@ -408,7 +398,6 @@ private void maybeForceBuilderInitialization() {
         getSessionsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (sessionsBuilder_ == null) {
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_ListSessionsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.ListSessionsResponse getDefaultInstanceForType() {
       return com.google.spanner.v1.ListSessionsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.ListSessionsResponse build() {
       com.google.spanner.v1.ListSessionsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public com.google.spanner.v1.ListSessionsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.ListSessionsResponse buildPartial() {
       com.google.spanner.v1.ListSessionsResponse result = new com.google.spanner.v1.ListSessionsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -462,39 +447,32 @@ public com.google.spanner.v1.ListSessionsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.v1.ListSessionsResponse) {
         return mergeFrom((com.google.spanner.v1.ListSessionsResponse)other);
@@ -541,12 +519,10 @@ public Builder mergeFrom(com.google.spanner.v1.ListSessionsResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -976,13 +952,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1004,12 +978,11 @@ public static com.google.spanner.v1.ListSessionsResponse getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListSessionsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListSessionsResponse(input, extensionRegistry);
+        return new ListSessionsResponse(input, extensionRegistry);
     }
   };
 
@@ -1022,7 +995,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.v1.ListSessionsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Mutation.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Mutation.java
index dd0cb3e4d0fa..1fd97977fa35 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Mutation.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Mutation.java
@@ -34,9 +34,6 @@ private Mutation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private Mutation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.spanner.v1.Mutation.Write.Builder subBuilder = null;
             if (operationCase_ == 1) {
@@ -118,13 +122,6 @@ private Mutation(
             operationCase_ = 5;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -142,7 +139,6 @@ private Mutation(
     return com.google.spanner.v1.MutationProto.internal_static_google_spanner_v1_Mutation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.v1.MutationProto.internal_static_google_spanner_v1_Mutation_fieldAccessorTable
@@ -331,9 +327,6 @@ private Write(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -345,6 +338,13 @@ private Write(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -369,13 +369,6 @@ private Write(
                   input.readMessage(com.google.protobuf.ListValue.parser(), extensionRegistry));
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -399,7 +392,6 @@ private Write(
       return com.google.spanner.v1.MutationProto.internal_static_google_spanner_v1_Mutation_Write_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.MutationProto.internal_static_google_spanner_v1_Mutation_Write_fieldAccessorTable
@@ -598,7 +590,6 @@ public com.google.protobuf.ListValueOrBuilder getValuesOrBuilder(
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -608,7 +599,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getTableBytes().isEmpty()) {
@@ -623,7 +613,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -762,7 +751,6 @@ public static com.google.spanner.v1.Mutation.Write parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -770,7 +758,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.spanner.v1.Mutation.Write prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -799,7 +786,6 @@ public static final class Builder extends
         return com.google.spanner.v1.MutationProto.internal_static_google_spanner_v1_Mutation_Write_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.spanner.v1.MutationProto.internal_static_google_spanner_v1_Mutation_Write_fieldAccessorTable
@@ -823,7 +809,6 @@ private void maybeForceBuilderInitialization() {
           getValuesFieldBuilder();
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         table_ = "";
@@ -839,18 +824,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.spanner.v1.MutationProto.internal_static_google_spanner_v1_Mutation_Write_descriptor;
       }
 
-      @java.lang.Override
       public com.google.spanner.v1.Mutation.Write getDefaultInstanceForType() {
         return com.google.spanner.v1.Mutation.Write.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.spanner.v1.Mutation.Write build() {
         com.google.spanner.v1.Mutation.Write result = buildPartial();
         if (!result.isInitialized()) {
@@ -859,7 +841,6 @@ public com.google.spanner.v1.Mutation.Write build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.spanner.v1.Mutation.Write buildPartial() {
         com.google.spanner.v1.Mutation.Write result = new com.google.spanner.v1.Mutation.Write(this);
         int from_bitField0_ = bitField0_;
@@ -884,39 +865,32 @@ public com.google.spanner.v1.Mutation.Write buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.spanner.v1.Mutation.Write) {
           return mergeFrom((com.google.spanner.v1.Mutation.Write)other);
@@ -973,12 +947,10 @@ public Builder mergeFrom(com.google.spanner.v1.Mutation.Write other) {
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1681,13 +1653,11 @@ public com.google.protobuf.ListValue.Builder addValuesBuilder(
         }
         return valuesBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1709,12 +1679,11 @@ public static com.google.spanner.v1.Mutation.Write getDefaultInstance() {
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Write parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Write(input, extensionRegistry);
+          return new Write(input, extensionRegistry);
       }
     };
 
@@ -1727,7 +1696,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.Mutation.Write getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1817,9 +1785,6 @@ private Delete(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1831,6 +1796,13 @@ private Delete(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -1850,13 +1822,6 @@ private Delete(
 
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1874,7 +1839,6 @@ private Delete(
       return com.google.spanner.v1.MutationProto.internal_static_google_spanner_v1_Mutation_Delete_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.MutationProto.internal_static_google_spanner_v1_Mutation_Delete_fieldAccessorTable
@@ -1964,7 +1928,6 @@ public com.google.spanner.v1.KeySetOrBuilder getKeySetOrBuilder() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1974,7 +1937,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getTableBytes().isEmpty()) {
@@ -1986,7 +1948,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -2114,7 +2075,6 @@ public static com.google.spanner.v1.Mutation.Delete parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -2122,7 +2082,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.spanner.v1.Mutation.Delete prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -2150,7 +2109,6 @@ public static final class Builder extends
         return com.google.spanner.v1.MutationProto.internal_static_google_spanner_v1_Mutation_Delete_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.spanner.v1.MutationProto.internal_static_google_spanner_v1_Mutation_Delete_fieldAccessorTable
@@ -2173,7 +2131,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         table_ = "";
@@ -2187,18 +2144,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.spanner.v1.MutationProto.internal_static_google_spanner_v1_Mutation_Delete_descriptor;
       }
 
-      @java.lang.Override
       public com.google.spanner.v1.Mutation.Delete getDefaultInstanceForType() {
         return com.google.spanner.v1.Mutation.Delete.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.spanner.v1.Mutation.Delete build() {
         com.google.spanner.v1.Mutation.Delete result = buildPartial();
         if (!result.isInitialized()) {
@@ -2207,7 +2161,6 @@ public com.google.spanner.v1.Mutation.Delete build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.spanner.v1.Mutation.Delete buildPartial() {
         com.google.spanner.v1.Mutation.Delete result = new com.google.spanner.v1.Mutation.Delete(this);
         result.table_ = table_;
@@ -2220,39 +2173,32 @@ public com.google.spanner.v1.Mutation.Delete buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.spanner.v1.Mutation.Delete) {
           return mergeFrom((com.google.spanner.v1.Mutation.Delete)other);
@@ -2276,12 +2222,10 @@ public Builder mergeFrom(com.google.spanner.v1.Mutation.Delete other) {
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2559,13 +2503,11 @@ public com.google.spanner.v1.KeySetOrBuilder getKeySetOrBuilder() {
         }
         return keySetBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -2587,12 +2529,11 @@ public static com.google.spanner.v1.Mutation.Delete getDefaultInstance() {
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Delete parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Delete(input, extensionRegistry);
+          return new Delete(input, extensionRegistry);
       }
     };
 
@@ -2605,7 +2546,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.Mutation.Delete getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -2871,7 +2811,6 @@ public com.google.spanner.v1.Mutation.DeleteOrBuilder getDeleteOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -2881,7 +2820,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (operationCase_ == 1) {
@@ -2902,7 +2840,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -3081,7 +3018,6 @@ public static com.google.spanner.v1.Mutation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -3089,7 +3025,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.v1.Mutation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -3119,7 +3054,6 @@ public static final class Builder extends
       return com.google.spanner.v1.MutationProto.internal_static_google_spanner_v1_Mutation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.MutationProto.internal_static_google_spanner_v1_Mutation_fieldAccessorTable
@@ -3142,7 +3076,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       operationCase_ = 0;
@@ -3150,18 +3083,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.v1.MutationProto.internal_static_google_spanner_v1_Mutation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.Mutation getDefaultInstanceForType() {
       return com.google.spanner.v1.Mutation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.Mutation build() {
       com.google.spanner.v1.Mutation result = buildPartial();
       if (!result.isInitialized()) {
@@ -3170,7 +3100,6 @@ public com.google.spanner.v1.Mutation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.Mutation buildPartial() {
       com.google.spanner.v1.Mutation result = new com.google.spanner.v1.Mutation(this);
       if (operationCase_ == 1) {
@@ -3213,39 +3142,32 @@ public com.google.spanner.v1.Mutation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.v1.Mutation) {
         return mergeFrom((com.google.spanner.v1.Mutation)other);
@@ -3287,12 +3209,10 @@ public Builder mergeFrom(com.google.spanner.v1.Mutation other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4257,13 +4177,11 @@ public com.google.spanner.v1.Mutation.DeleteOrBuilder getDeleteOrBuilder() {
       onChanged();;
       return deleteBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -4285,12 +4203,11 @@ public static com.google.spanner.v1.Mutation getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Mutation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Mutation(input, extensionRegistry);
+        return new Mutation(input, extensionRegistry);
     }
   };
 
@@ -4303,7 +4220,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.v1.Mutation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/MutationProto.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/MutationProto.java
index f4f4520157e1..02bbed72b70f 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/MutationProto.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/MutationProto.java
@@ -47,7 +47,7 @@ public static void registerAllExtensions(
       "er.v1.Mutation.WriteH\000\022=\n\020insert_or_upda" +
       "te\030\003 \001(\0132!.google.spanner.v1.Mutation.Wr" +
       "iteH\000\0224\n\007replace\030\004 \001(\0132!.google.spanner." +
-      "v1.Mutation.WriteH\000\0224\n\006delete\030\005 \001(\0132\".go" +
+      "v1.Mutation.WriteH\000\0224\n\006delete\030\005 \001(\0132\".go",
       "ogle.spanner.v1.Mutation.DeleteH\000\032S\n\005Wri" +
       "te\022\r\n\005table\030\001 \001(\t\022\017\n\007columns\030\002 \003(\t\022*\n\006va" +
       "lues\030\003 \003(\0132\032.google.protobuf.ListValue\032C" +
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartialResultSet.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartialResultSet.java
index e83a63b201e1..2aa0dba01c97 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartialResultSet.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartialResultSet.java
@@ -37,9 +37,6 @@ private PartialResultSet(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private PartialResultSet(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.spanner.v1.ResultSetMetadata.Builder subBuilder = null;
             if (metadata_ != null) {
@@ -96,13 +100,6 @@ private PartialResultSet(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -123,7 +120,6 @@ private PartialResultSet(
     return com.google.spanner.v1.ResultSetProto.internal_static_google_spanner_v1_PartialResultSet_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.v1.ResultSetProto.internal_static_google_spanner_v1_PartialResultSet_fieldAccessorTable
@@ -588,7 +584,6 @@ public com.google.spanner.v1.ResultSetStatsOrBuilder getStatsOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -598,7 +593,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (metadata_ != null) {
@@ -619,7 +613,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -780,7 +773,6 @@ public static com.google.spanner.v1.PartialResultSet parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -788,7 +780,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.v1.PartialResultSet prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -818,7 +809,6 @@ public static final class Builder extends
       return com.google.spanner.v1.ResultSetProto.internal_static_google_spanner_v1_PartialResultSet_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.ResultSetProto.internal_static_google_spanner_v1_PartialResultSet_fieldAccessorTable
@@ -842,7 +832,6 @@ private void maybeForceBuilderInitialization() {
         getValuesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (metadataBuilder_ == null) {
@@ -870,18 +859,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.v1.ResultSetProto.internal_static_google_spanner_v1_PartialResultSet_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.PartialResultSet getDefaultInstanceForType() {
       return com.google.spanner.v1.PartialResultSet.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.PartialResultSet build() {
       com.google.spanner.v1.PartialResultSet result = buildPartial();
       if (!result.isInitialized()) {
@@ -890,7 +876,6 @@ public com.google.spanner.v1.PartialResultSet build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.PartialResultSet buildPartial() {
       com.google.spanner.v1.PartialResultSet result = new com.google.spanner.v1.PartialResultSet(this);
       int from_bitField0_ = bitField0_;
@@ -921,39 +906,32 @@ public com.google.spanner.v1.PartialResultSet buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.v1.PartialResultSet) {
         return mergeFrom((com.google.spanner.v1.PartialResultSet)other);
@@ -1008,12 +986,10 @@ public Builder mergeFrom(com.google.spanner.v1.PartialResultSet other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2827,13 +2803,11 @@ public com.google.spanner.v1.ResultSetStatsOrBuilder getStatsOrBuilder() {
       }
       return statsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2855,12 +2829,11 @@ public static com.google.spanner.v1.PartialResultSet getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PartialResultSet parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PartialResultSet(input, extensionRegistry);
+        return new PartialResultSet(input, extensionRegistry);
     }
   };
 
@@ -2873,7 +2846,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.v1.PartialResultSet getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Partition.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Partition.java
index 4fa3403df239..ff9c082f67c2 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Partition.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Partition.java
@@ -34,9 +34,6 @@ private Partition(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,11 +45,6 @@ private Partition(
           case 0:
             done = true;
             break;
-          case 10: {
-
-            partitionToken_ = input.readBytes();
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +52,11 @@ private Partition(
             }
             break;
           }
+          case 10: {
+
+            partitionToken_ = input.readBytes();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private Partition(
     return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_Partition_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_Partition_fieldAccessorTable
@@ -101,7 +97,6 @@ public com.google.protobuf.ByteString getPartitionToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -111,7 +106,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!partitionToken_.isEmpty()) {
@@ -120,7 +114,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -236,7 +229,6 @@ public static com.google.spanner.v1.Partition parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -244,7 +236,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.v1.Partition prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -273,7 +264,6 @@ public static final class Builder extends
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_Partition_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_Partition_fieldAccessorTable
@@ -296,7 +286,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       partitionToken_ = com.google.protobuf.ByteString.EMPTY;
@@ -304,18 +293,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_Partition_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.Partition getDefaultInstanceForType() {
       return com.google.spanner.v1.Partition.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.Partition build() {
       com.google.spanner.v1.Partition result = buildPartial();
       if (!result.isInitialized()) {
@@ -324,7 +310,6 @@ public com.google.spanner.v1.Partition build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.Partition buildPartial() {
       com.google.spanner.v1.Partition result = new com.google.spanner.v1.Partition(this);
       result.partitionToken_ = partitionToken_;
@@ -332,39 +317,32 @@ public com.google.spanner.v1.Partition buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.v1.Partition) {
         return mergeFrom((com.google.spanner.v1.Partition)other);
@@ -384,12 +362,10 @@ public Builder mergeFrom(com.google.spanner.v1.Partition other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -454,13 +430,11 @@ public Builder clearPartitionToken() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -482,12 +456,11 @@ public static com.google.spanner.v1.Partition getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Partition parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Partition(input, extensionRegistry);
+        return new Partition(input, extensionRegistry);
     }
   };
 
@@ -500,7 +473,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.v1.Partition getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionOptions.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionOptions.java
index 617b231ecf09..1760eaa2a208 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionOptions.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionOptions.java
@@ -35,9 +35,6 @@ private PartitionOptions(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private PartitionOptions(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
 
             partitionSizeBytes_ = input.readInt64();
@@ -59,13 +63,6 @@ private PartitionOptions(
             maxPartitions_ = input.readInt64();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private PartitionOptions(
     return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_PartitionOptions_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_PartitionOptions_fieldAccessorTable
@@ -128,7 +124,6 @@ public long getMaxPartitions() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -138,7 +133,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (partitionSizeBytes_ != 0L) {
@@ -150,7 +144,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -276,7 +269,6 @@ public static com.google.spanner.v1.PartitionOptions parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -284,7 +276,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.v1.PartitionOptions prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -313,7 +304,6 @@ public static final class Builder extends
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_PartitionOptions_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_PartitionOptions_fieldAccessorTable
@@ -336,7 +326,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       partitionSizeBytes_ = 0L;
@@ -346,18 +335,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_PartitionOptions_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.PartitionOptions getDefaultInstanceForType() {
       return com.google.spanner.v1.PartitionOptions.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.PartitionOptions build() {
       com.google.spanner.v1.PartitionOptions result = buildPartial();
       if (!result.isInitialized()) {
@@ -366,7 +352,6 @@ public com.google.spanner.v1.PartitionOptions build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.PartitionOptions buildPartial() {
       com.google.spanner.v1.PartitionOptions result = new com.google.spanner.v1.PartitionOptions(this);
       result.partitionSizeBytes_ = partitionSizeBytes_;
@@ -375,39 +360,32 @@ public com.google.spanner.v1.PartitionOptions buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.v1.PartitionOptions) {
         return mergeFrom((com.google.spanner.v1.PartitionOptions)other);
@@ -430,12 +408,10 @@ public Builder mergeFrom(com.google.spanner.v1.PartitionOptions other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -559,13 +535,11 @@ public Builder clearMaxPartitions() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -587,12 +561,11 @@ public static com.google.spanner.v1.PartitionOptions getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PartitionOptions parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PartitionOptions(input, extensionRegistry);
+        return new PartitionOptions(input, extensionRegistry);
     }
   };
 
@@ -605,7 +578,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.v1.PartitionOptions getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionQueryRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionQueryRequest.java
index 5f604fe8d20e..9796f848351b 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionQueryRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionQueryRequest.java
@@ -34,9 +34,6 @@ private PartitionQueryRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private PartitionQueryRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -112,13 +116,6 @@ private PartitionQueryRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -137,7 +134,6 @@ private PartitionQueryRequest(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -148,7 +144,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_PartitionQueryRequest_fieldAccessorTable
@@ -500,7 +495,6 @@ public com.google.spanner.v1.PartitionOptionsOrBuilder getPartitionOptionsOrBuil
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -510,7 +504,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getSessionBytes().isEmpty()) {
@@ -537,7 +530,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -714,7 +706,6 @@ public static com.google.spanner.v1.PartitionQueryRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -722,7 +713,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.v1.PartitionQueryRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -772,7 +762,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_PartitionQueryRequest_fieldAccessorTable
@@ -795,7 +784,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       session_ = "";
@@ -824,18 +812,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_PartitionQueryRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.PartitionQueryRequest getDefaultInstanceForType() {
       return com.google.spanner.v1.PartitionQueryRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.PartitionQueryRequest build() {
       com.google.spanner.v1.PartitionQueryRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -844,7 +829,6 @@ public com.google.spanner.v1.PartitionQueryRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.PartitionQueryRequest buildPartial() {
       com.google.spanner.v1.PartitionQueryRequest result = new com.google.spanner.v1.PartitionQueryRequest(this);
       int from_bitField0_ = bitField0_;
@@ -873,39 +857,32 @@ public com.google.spanner.v1.PartitionQueryRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.v1.PartitionQueryRequest) {
         return mergeFrom((com.google.spanner.v1.PartitionQueryRequest)other);
@@ -941,12 +918,10 @@ public Builder mergeFrom(com.google.spanner.v1.PartitionQueryRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1919,13 +1894,11 @@ public com.google.spanner.v1.PartitionOptionsOrBuilder getPartitionOptionsOrBuil
       }
       return partitionOptionsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1947,12 +1920,11 @@ public static com.google.spanner.v1.PartitionQueryRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PartitionQueryRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PartitionQueryRequest(input, extensionRegistry);
+        return new PartitionQueryRequest(input, extensionRegistry);
     }
   };
 
@@ -1965,7 +1937,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.v1.PartitionQueryRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionReadRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionReadRequest.java
index f313ec1597e8..b9f8db06824e 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionReadRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionReadRequest.java
@@ -36,9 +36,6 @@ private PartitionReadRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private PartitionReadRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -116,13 +120,6 @@ private PartitionReadRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -143,7 +140,6 @@ private PartitionReadRequest(
     return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_PartitionReadRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_PartitionReadRequest_fieldAccessorTable
@@ -449,7 +445,6 @@ public com.google.spanner.v1.PartitionOptionsOrBuilder getPartitionOptionsOrBuil
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -459,7 +454,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getSessionBytes().isEmpty()) {
@@ -486,7 +480,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -668,7 +661,6 @@ public static com.google.spanner.v1.PartitionReadRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -676,7 +668,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.v1.PartitionReadRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -704,7 +695,6 @@ public static final class Builder extends
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_PartitionReadRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_PartitionReadRequest_fieldAccessorTable
@@ -727,7 +717,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       session_ = "";
@@ -759,18 +748,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_PartitionReadRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.PartitionReadRequest getDefaultInstanceForType() {
       return com.google.spanner.v1.PartitionReadRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.PartitionReadRequest build() {
       com.google.spanner.v1.PartitionReadRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -779,7 +765,6 @@ public com.google.spanner.v1.PartitionReadRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.PartitionReadRequest buildPartial() {
       com.google.spanner.v1.PartitionReadRequest result = new com.google.spanner.v1.PartitionReadRequest(this);
       int from_bitField0_ = bitField0_;
@@ -812,39 +797,32 @@ public com.google.spanner.v1.PartitionReadRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.v1.PartitionReadRequest) {
         return mergeFrom((com.google.spanner.v1.PartitionReadRequest)other);
@@ -892,12 +870,10 @@ public Builder mergeFrom(com.google.spanner.v1.PartitionReadRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1845,13 +1821,11 @@ public com.google.spanner.v1.PartitionOptionsOrBuilder getPartitionOptionsOrBuil
       }
       return partitionOptionsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1873,12 +1847,11 @@ public static com.google.spanner.v1.PartitionReadRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PartitionReadRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PartitionReadRequest(input, extensionRegistry);
+        return new PartitionReadRequest(input, extensionRegistry);
     }
   };
 
@@ -1891,7 +1864,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.v1.PartitionReadRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionResponse.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionResponse.java
index 32915b1297e5..c3f0de0e8ec1 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionResponse.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionResponse.java
@@ -34,9 +34,6 @@ private PartitionResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private PartitionResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               partitions_ = new java.util.ArrayList();
@@ -70,13 +74,6 @@ private PartitionResponse(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private PartitionResponse(
     return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_PartitionResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_PartitionResponse_fieldAccessorTable
@@ -195,7 +191,6 @@ public com.google.spanner.v1.TransactionOrBuilder getTransactionOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -205,7 +200,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < partitions_.size(); i++) {
@@ -217,7 +211,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.spanner.v1.PartitionResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.v1.PartitionResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -385,7 +376,6 @@ public static final class Builder extends
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_PartitionResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_PartitionResponse_fieldAccessorTable
@@ -409,7 +399,6 @@ private void maybeForceBuilderInitialization() {
         getPartitionsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (partitionsBuilder_ == null) {
@@ -427,18 +416,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_PartitionResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.PartitionResponse getDefaultInstanceForType() {
       return com.google.spanner.v1.PartitionResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.PartitionResponse build() {
       com.google.spanner.v1.PartitionResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -447,7 +433,6 @@ public com.google.spanner.v1.PartitionResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.PartitionResponse buildPartial() {
       com.google.spanner.v1.PartitionResponse result = new com.google.spanner.v1.PartitionResponse(this);
       int from_bitField0_ = bitField0_;
@@ -471,39 +456,32 @@ public com.google.spanner.v1.PartitionResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.v1.PartitionResponse) {
         return mergeFrom((com.google.spanner.v1.PartitionResponse)other);
@@ -549,12 +527,10 @@ public Builder mergeFrom(com.google.spanner.v1.PartitionResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1038,13 +1014,11 @@ public com.google.spanner.v1.TransactionOrBuilder getTransactionOrBuilder() {
       }
       return transactionBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1066,12 +1040,11 @@ public static com.google.spanner.v1.PartitionResponse getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PartitionResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PartitionResponse(input, extensionRegistry);
+        return new PartitionResponse(input, extensionRegistry);
     }
   };
 
@@ -1084,7 +1057,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.v1.PartitionResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PlanNode.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PlanNode.java
index f55b657d3e13..b3de4d36d0f4 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PlanNode.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PlanNode.java
@@ -36,9 +36,6 @@ private PlanNode(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private PlanNode(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
 
             index_ = input.readInt32();
@@ -115,13 +119,6 @@ private PlanNode(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -142,7 +139,6 @@ private PlanNode(
     return com.google.spanner.v1.QueryPlanProto.internal_static_google_spanner_v1_PlanNode_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.v1.QueryPlanProto.internal_static_google_spanner_v1_PlanNode_fieldAccessorTable
@@ -398,9 +394,6 @@ private ChildLink(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -412,6 +405,13 @@ private ChildLink(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 8: {
 
               childIndex_ = input.readInt32();
@@ -429,13 +429,6 @@ private ChildLink(
               variable_ = s;
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -453,7 +446,6 @@ private ChildLink(
       return com.google.spanner.v1.QueryPlanProto.internal_static_google_spanner_v1_PlanNode_ChildLink_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.QueryPlanProto.internal_static_google_spanner_v1_PlanNode_ChildLink_fieldAccessorTable
@@ -579,7 +571,6 @@ public java.lang.String getVariable() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -589,7 +580,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (childIndex_ != 0) {
@@ -604,7 +594,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -734,7 +723,6 @@ public static com.google.spanner.v1.PlanNode.ChildLink parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -742,7 +730,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.spanner.v1.PlanNode.ChildLink prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -771,7 +758,6 @@ public static final class Builder extends
         return com.google.spanner.v1.QueryPlanProto.internal_static_google_spanner_v1_PlanNode_ChildLink_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.spanner.v1.QueryPlanProto.internal_static_google_spanner_v1_PlanNode_ChildLink_fieldAccessorTable
@@ -794,7 +780,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         childIndex_ = 0;
@@ -806,18 +791,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.spanner.v1.QueryPlanProto.internal_static_google_spanner_v1_PlanNode_ChildLink_descriptor;
       }
 
-      @java.lang.Override
       public com.google.spanner.v1.PlanNode.ChildLink getDefaultInstanceForType() {
         return com.google.spanner.v1.PlanNode.ChildLink.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.spanner.v1.PlanNode.ChildLink build() {
         com.google.spanner.v1.PlanNode.ChildLink result = buildPartial();
         if (!result.isInitialized()) {
@@ -826,7 +808,6 @@ public com.google.spanner.v1.PlanNode.ChildLink build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.spanner.v1.PlanNode.ChildLink buildPartial() {
         com.google.spanner.v1.PlanNode.ChildLink result = new com.google.spanner.v1.PlanNode.ChildLink(this);
         result.childIndex_ = childIndex_;
@@ -836,39 +817,32 @@ public com.google.spanner.v1.PlanNode.ChildLink buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.spanner.v1.PlanNode.ChildLink) {
           return mergeFrom((com.google.spanner.v1.PlanNode.ChildLink)other);
@@ -896,12 +870,10 @@ public Builder mergeFrom(com.google.spanner.v1.PlanNode.ChildLink other) {
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1185,13 +1157,11 @@ public Builder setVariableBytes(
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1213,12 +1183,11 @@ public static com.google.spanner.v1.PlanNode.ChildLink getDefaultInstance() {
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public ChildLink parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ChildLink(input, extensionRegistry);
+          return new ChildLink(input, extensionRegistry);
       }
     };
 
@@ -1231,7 +1200,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.PlanNode.ChildLink getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1365,9 +1333,6 @@ private ShortRepresentation(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1379,6 +1344,13 @@ private ShortRepresentation(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -1398,13 +1370,6 @@ private ShortRepresentation(
                   subqueries__.getKey(), subqueries__.getValue());
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1423,7 +1388,6 @@ private ShortRepresentation(
     }
 
     @SuppressWarnings({"rawtypes"})
-    @java.lang.Override
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
@@ -1434,7 +1398,6 @@ protected com.google.protobuf.MapField internalGetMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.QueryPlanProto.internal_static_google_spanner_v1_PlanNode_ShortRepresentation_fieldAccessorTable
@@ -1594,7 +1557,6 @@ public int getSubqueriesOrThrow(
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1604,7 +1566,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getDescriptionBytes().isEmpty()) {
@@ -1619,7 +1580,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -1750,7 +1710,6 @@ public static com.google.spanner.v1.PlanNode.ShortRepresentation parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -1758,7 +1717,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.spanner.v1.PlanNode.ShortRepresentation prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -1809,7 +1767,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
                 "Invalid map field number: " + number);
         }
       }
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.spanner.v1.QueryPlanProto.internal_static_google_spanner_v1_PlanNode_ShortRepresentation_fieldAccessorTable
@@ -1832,7 +1789,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         description_ = "";
@@ -1841,18 +1797,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.spanner.v1.QueryPlanProto.internal_static_google_spanner_v1_PlanNode_ShortRepresentation_descriptor;
       }
 
-      @java.lang.Override
       public com.google.spanner.v1.PlanNode.ShortRepresentation getDefaultInstanceForType() {
         return com.google.spanner.v1.PlanNode.ShortRepresentation.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.spanner.v1.PlanNode.ShortRepresentation build() {
         com.google.spanner.v1.PlanNode.ShortRepresentation result = buildPartial();
         if (!result.isInitialized()) {
@@ -1861,7 +1814,6 @@ public com.google.spanner.v1.PlanNode.ShortRepresentation build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.spanner.v1.PlanNode.ShortRepresentation buildPartial() {
         com.google.spanner.v1.PlanNode.ShortRepresentation result = new com.google.spanner.v1.PlanNode.ShortRepresentation(this);
         int from_bitField0_ = bitField0_;
@@ -1874,39 +1826,32 @@ public com.google.spanner.v1.PlanNode.ShortRepresentation buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.spanner.v1.PlanNode.ShortRepresentation) {
           return mergeFrom((com.google.spanner.v1.PlanNode.ShortRepresentation)other);
@@ -1929,12 +1874,10 @@ public Builder mergeFrom(com.google.spanner.v1.PlanNode.ShortRepresentation othe
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2221,13 +2164,11 @@ public Builder putAllSubqueries(
             .putAll(values);
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -2249,12 +2190,11 @@ public static com.google.spanner.v1.PlanNode.ShortRepresentation getDefaultInsta
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public ShortRepresentation parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ShortRepresentation(input, extensionRegistry);
+          return new ShortRepresentation(input, extensionRegistry);
       }
     };
 
@@ -2267,7 +2207,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.PlanNode.ShortRepresentation getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -2316,7 +2255,6 @@ public int getKindValue() {
    * .google.spanner.v1.PlanNode.Kind kind = 2;
    */
   public com.google.spanner.v1.PlanNode.Kind getKind() {
-    @SuppressWarnings("deprecation")
     com.google.spanner.v1.PlanNode.Kind result = com.google.spanner.v1.PlanNode.Kind.valueOf(kind_);
     return result == null ? com.google.spanner.v1.PlanNode.Kind.UNRECOGNIZED : result;
   }
@@ -2545,7 +2483,6 @@ public com.google.protobuf.StructOrBuilder getExecutionStatsOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -2555,7 +2492,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (index_ != 0) {
@@ -2582,7 +2518,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -2761,7 +2696,6 @@ public static com.google.spanner.v1.PlanNode parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -2769,7 +2703,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.v1.PlanNode prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -2797,7 +2730,6 @@ public static final class Builder extends
       return com.google.spanner.v1.QueryPlanProto.internal_static_google_spanner_v1_PlanNode_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.QueryPlanProto.internal_static_google_spanner_v1_PlanNode_fieldAccessorTable
@@ -2821,7 +2753,6 @@ private void maybeForceBuilderInitialization() {
         getChildLinksFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       index_ = 0;
@@ -2857,18 +2788,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.v1.QueryPlanProto.internal_static_google_spanner_v1_PlanNode_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.PlanNode getDefaultInstanceForType() {
       return com.google.spanner.v1.PlanNode.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.PlanNode build() {
       com.google.spanner.v1.PlanNode result = buildPartial();
       if (!result.isInitialized()) {
@@ -2877,7 +2805,6 @@ public com.google.spanner.v1.PlanNode build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.PlanNode buildPartial() {
       com.google.spanner.v1.PlanNode result = new com.google.spanner.v1.PlanNode(this);
       int from_bitField0_ = bitField0_;
@@ -2914,39 +2841,32 @@ public com.google.spanner.v1.PlanNode buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.v1.PlanNode) {
         return mergeFrom((com.google.spanner.v1.PlanNode)other);
@@ -3008,12 +2928,10 @@ public Builder mergeFrom(com.google.spanner.v1.PlanNode other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3114,7 +3032,6 @@ public Builder setKindValue(int value) {
      * .google.spanner.v1.PlanNode.Kind kind = 2;
      */
     public com.google.spanner.v1.PlanNode.Kind getKind() {
-      @SuppressWarnings("deprecation")
       com.google.spanner.v1.PlanNode.Kind result = com.google.spanner.v1.PlanNode.Kind.valueOf(kind_);
       return result == null ? com.google.spanner.v1.PlanNode.Kind.UNRECOGNIZED : result;
     }
@@ -4096,13 +4013,11 @@ public com.google.protobuf.StructOrBuilder getExecutionStatsOrBuilder() {
       }
       return executionStatsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -4124,12 +4039,11 @@ public static com.google.spanner.v1.PlanNode getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PlanNode parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PlanNode(input, extensionRegistry);
+        return new PlanNode(input, extensionRegistry);
     }
   };
 
@@ -4142,7 +4056,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.v1.PlanNode getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlan.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlan.java
index 1a1e67a8292f..56fd9b3baee5 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlan.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlan.java
@@ -33,9 +33,6 @@ private QueryPlan(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private QueryPlan(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               planNodes_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private QueryPlan(
                 input.readMessage(com.google.spanner.v1.PlanNode.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private QueryPlan(
     return com.google.spanner.v1.QueryPlanProto.internal_static_google_spanner_v1_QueryPlan_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.v1.QueryPlanProto.internal_static_google_spanner_v1_QueryPlan_fieldAccessorTable
@@ -157,7 +153,6 @@ public com.google.spanner.v1.PlanNodeOrBuilder getPlanNodesOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -167,7 +162,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < planNodes_.size(); i++) {
@@ -176,7 +170,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -294,7 +287,6 @@ public static com.google.spanner.v1.QueryPlan parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -302,7 +294,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.v1.QueryPlan prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -330,7 +321,6 @@ public static final class Builder extends
       return com.google.spanner.v1.QueryPlanProto.internal_static_google_spanner_v1_QueryPlan_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.QueryPlanProto.internal_static_google_spanner_v1_QueryPlan_fieldAccessorTable
@@ -354,7 +344,6 @@ private void maybeForceBuilderInitialization() {
         getPlanNodesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (planNodesBuilder_ == null) {
@@ -366,18 +355,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.v1.QueryPlanProto.internal_static_google_spanner_v1_QueryPlan_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.QueryPlan getDefaultInstanceForType() {
       return com.google.spanner.v1.QueryPlan.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.QueryPlan build() {
       com.google.spanner.v1.QueryPlan result = buildPartial();
       if (!result.isInitialized()) {
@@ -386,7 +372,6 @@ public com.google.spanner.v1.QueryPlan build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.QueryPlan buildPartial() {
       com.google.spanner.v1.QueryPlan result = new com.google.spanner.v1.QueryPlan(this);
       int from_bitField0_ = bitField0_;
@@ -403,39 +388,32 @@ public com.google.spanner.v1.QueryPlan buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.v1.QueryPlan) {
         return mergeFrom((com.google.spanner.v1.QueryPlan)other);
@@ -478,12 +456,10 @@ public Builder mergeFrom(com.google.spanner.v1.QueryPlan other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -850,13 +826,11 @@ public com.google.spanner.v1.PlanNode.Builder addPlanNodesBuilder(
       }
       return planNodesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -878,12 +852,11 @@ public static com.google.spanner.v1.QueryPlan getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public QueryPlan parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new QueryPlan(input, extensionRegistry);
+        return new QueryPlan(input, extensionRegistry);
     }
   };
 
@@ -896,7 +869,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.v1.QueryPlan getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlanProto.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlanProto.java
index 464479925fe3..6acef748bb78 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlanProto.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlanProto.java
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "gle.spanner.v1.PlanNode.ChildLink\022M\n\024sho" +
       "rt_representation\030\005 \001(\0132/.google.spanner" +
       ".v1.PlanNode.ShortRepresentation\022)\n\010meta" +
-      "data\030\006 \001(\0132\027.google.protobuf.Struct\0220\n\017e" +
+      "data\030\006 \001(\0132\027.google.protobuf.Struct\0220\n\017e",
       "xecution_stats\030\007 \001(\0132\027.google.protobuf.S" +
       "truct\032@\n\tChildLink\022\023\n\013child_index\030\001 \001(\005\022" +
       "\014\n\004type\030\002 \001(\t\022\020\n\010variable\030\003 \001(\t\032\262\001\n\023Shor" +
@@ -67,7 +67,7 @@ public static void registerAllExtensions(
       "y\0321\n\017SubqueriesEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005val" +
       "ue\030\002 \001(\005:\0028\001\"8\n\004Kind\022\024\n\020KIND_UNSPECIFIED" +
       "\020\000\022\016\n\nRELATIONAL\020\001\022\n\n\006SCALAR\020\002\"<\n\tQueryP" +
-      "lan\022/\n\nplan_nodes\030\001 \003(\0132\033.google.spanner" +
+      "lan\022/\n\nplan_nodes\030\001 \003(\0132\033.google.spanner",
       ".v1.PlanNodeB\227\001\n\025com.google.spanner.v1B\016" +
       "QueryPlanProtoP\001Z8google.golang.org/genp" +
       "roto/googleapis/spanner/v1;spanner\252\002\027Goo" +
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ReadRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ReadRequest.java
index e224575e2997..46b017d100b3 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ReadRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ReadRequest.java
@@ -40,9 +40,6 @@ private ReadRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -54,6 +51,13 @@ private ReadRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -122,13 +126,6 @@ private ReadRequest(
             partitionToken_ = input.readBytes();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -149,7 +146,6 @@ private ReadRequest(
     return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_ReadRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_ReadRequest_fieldAccessorTable
@@ -483,7 +479,6 @@ public com.google.protobuf.ByteString getPartitionToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -493,7 +488,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getSessionBytes().isEmpty()) {
@@ -526,7 +520,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -720,7 +713,6 @@ public static com.google.spanner.v1.ReadRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -728,7 +720,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.v1.ReadRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -757,7 +748,6 @@ public static final class Builder extends
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_ReadRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_ReadRequest_fieldAccessorTable
@@ -780,7 +770,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       session_ = "";
@@ -812,18 +801,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_ReadRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.ReadRequest getDefaultInstanceForType() {
       return com.google.spanner.v1.ReadRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.ReadRequest build() {
       com.google.spanner.v1.ReadRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -832,7 +818,6 @@ public com.google.spanner.v1.ReadRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.ReadRequest buildPartial() {
       com.google.spanner.v1.ReadRequest result = new com.google.spanner.v1.ReadRequest(this);
       int from_bitField0_ = bitField0_;
@@ -863,39 +848,32 @@ public com.google.spanner.v1.ReadRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.v1.ReadRequest) {
         return mergeFrom((com.google.spanner.v1.ReadRequest)other);
@@ -949,12 +927,10 @@ public Builder mergeFrom(com.google.spanner.v1.ReadRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1935,13 +1911,11 @@ public Builder clearPartitionToken() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1963,12 +1937,11 @@ public static com.google.spanner.v1.ReadRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ReadRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReadRequest(input, extensionRegistry);
+        return new ReadRequest(input, extensionRegistry);
     }
   };
 
@@ -1981,7 +1954,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.v1.ReadRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSet.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSet.java
index 72bcc7826be7..eaeaaf441080 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSet.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSet.java
@@ -34,9 +34,6 @@ private ResultSet(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ResultSet(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.spanner.v1.ResultSetMetadata.Builder subBuilder = null;
             if (metadata_ != null) {
@@ -83,13 +87,6 @@ private ResultSet(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -110,7 +107,6 @@ private ResultSet(
     return com.google.spanner.v1.ResultSetProto.internal_static_google_spanner_v1_ResultSet_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.v1.ResultSetProto.internal_static_google_spanner_v1_ResultSet_fieldAccessorTable
@@ -272,7 +268,6 @@ public com.google.spanner.v1.ResultSetStatsOrBuilder getStatsOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -282,7 +277,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (metadata_ != null) {
@@ -297,7 +291,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -441,7 +434,6 @@ public static com.google.spanner.v1.ResultSet parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -449,7 +441,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.v1.ResultSet prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -478,7 +469,6 @@ public static final class Builder extends
       return com.google.spanner.v1.ResultSetProto.internal_static_google_spanner_v1_ResultSet_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.ResultSetProto.internal_static_google_spanner_v1_ResultSet_fieldAccessorTable
@@ -502,7 +492,6 @@ private void maybeForceBuilderInitialization() {
         getRowsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (metadataBuilder_ == null) {
@@ -526,18 +515,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.v1.ResultSetProto.internal_static_google_spanner_v1_ResultSet_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.ResultSet getDefaultInstanceForType() {
       return com.google.spanner.v1.ResultSet.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.ResultSet build() {
       com.google.spanner.v1.ResultSet result = buildPartial();
       if (!result.isInitialized()) {
@@ -546,7 +532,6 @@ public com.google.spanner.v1.ResultSet build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.ResultSet buildPartial() {
       com.google.spanner.v1.ResultSet result = new com.google.spanner.v1.ResultSet(this);
       int from_bitField0_ = bitField0_;
@@ -575,39 +560,32 @@ public com.google.spanner.v1.ResultSet buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.v1.ResultSet) {
         return mergeFrom((com.google.spanner.v1.ResultSet)other);
@@ -656,12 +634,10 @@ public Builder mergeFrom(com.google.spanner.v1.ResultSet other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1406,13 +1382,11 @@ public com.google.spanner.v1.ResultSetStatsOrBuilder getStatsOrBuilder() {
       }
       return statsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1434,12 +1408,11 @@ public static com.google.spanner.v1.ResultSet getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ResultSet parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ResultSet(input, extensionRegistry);
+        return new ResultSet(input, extensionRegistry);
     }
   };
 
@@ -1452,7 +1425,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.v1.ResultSet getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetMetadata.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetMetadata.java
index 5fa63d137e0e..88d7a5ad477d 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetMetadata.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetMetadata.java
@@ -32,9 +32,6 @@ private ResultSetMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private ResultSetMetadata(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.spanner.v1.StructType.Builder subBuilder = null;
             if (rowType_ != null) {
@@ -72,13 +76,6 @@ private ResultSetMetadata(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private ResultSetMetadata(
     return com.google.spanner.v1.ResultSetProto.internal_static_google_spanner_v1_ResultSetMetadata_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.v1.ResultSetProto.internal_static_google_spanner_v1_ResultSetMetadata_fieldAccessorTable
@@ -192,7 +188,6 @@ public com.google.spanner.v1.TransactionOrBuilder getTransactionOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -202,7 +197,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (rowType_ != null) {
@@ -214,7 +208,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.spanner.v1.ResultSetMetadata parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.v1.ResultSetMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return com.google.spanner.v1.ResultSetProto.internal_static_google_spanner_v1_ResultSetMetadata_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.ResultSetProto.internal_static_google_spanner_v1_ResultSetMetadata_fieldAccessorTable
@@ -407,7 +397,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (rowTypeBuilder_ == null) {
@@ -425,18 +414,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.v1.ResultSetProto.internal_static_google_spanner_v1_ResultSetMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.ResultSetMetadata getDefaultInstanceForType() {
       return com.google.spanner.v1.ResultSetMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.ResultSetMetadata build() {
       com.google.spanner.v1.ResultSetMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -445,7 +431,6 @@ public com.google.spanner.v1.ResultSetMetadata build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.ResultSetMetadata buildPartial() {
       com.google.spanner.v1.ResultSetMetadata result = new com.google.spanner.v1.ResultSetMetadata(this);
       if (rowTypeBuilder_ == null) {
@@ -462,39 +447,32 @@ public com.google.spanner.v1.ResultSetMetadata buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.v1.ResultSetMetadata) {
         return mergeFrom((com.google.spanner.v1.ResultSetMetadata)other);
@@ -517,12 +495,10 @@ public Builder mergeFrom(com.google.spanner.v1.ResultSetMetadata other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -909,13 +885,11 @@ public com.google.spanner.v1.TransactionOrBuilder getTransactionOrBuilder() {
       }
       return transactionBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -937,12 +911,11 @@ public static com.google.spanner.v1.ResultSetMetadata getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ResultSetMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ResultSetMetadata(input, extensionRegistry);
+        return new ResultSetMetadata(input, extensionRegistry);
     }
   };
 
@@ -955,7 +928,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.v1.ResultSetMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetProto.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetProto.java
index 03323009f4bc..7adc5fe6dd9a 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetProto.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetProto.java
@@ -52,7 +52,7 @@ public static void registerAllExtensions(
       "data\030\001 \001(\0132$.google.spanner.v1.ResultSet" +
       "Metadata\022(\n\004rows\030\002 \003(\0132\032.google.protobuf" +
       ".ListValue\0220\n\005stats\030\003 \001(\0132!.google.spann" +
-      "er.v1.ResultSetStats\"\321\001\n\020PartialResultSe" +
+      "er.v1.ResultSetStats\"\321\001\n\020PartialResultSe",
       "t\0226\n\010metadata\030\001 \001(\0132$.google.spanner.v1." +
       "ResultSetMetadata\022&\n\006values\030\002 \003(\0132\026.goog" +
       "le.protobuf.Value\022\025\n\rchunked_value\030\003 \001(\010" +
@@ -62,7 +62,7 @@ public static void registerAllExtensions(
       ".spanner.v1.StructType\0223\n\013transaction\030\002 " +
       "\001(\0132\036.google.spanner.v1.Transaction\"p\n\016R" +
       "esultSetStats\0220\n\nquery_plan\030\001 \001(\0132\034.goog" +
-      "le.spanner.v1.QueryPlan\022,\n\013query_stats\030\002" +
+      "le.spanner.v1.QueryPlan\022,\n\013query_stats\030\002",
       " \001(\0132\027.google.protobuf.StructB\232\001\n\025com.go" +
       "ogle.spanner.v1B\016ResultSetProtoP\001Z8googl" +
       "e.golang.org/genproto/googleapis/spanner" +
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetStats.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetStats.java
index c4f2438a32a3..b84fecbacef7 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetStats.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetStats.java
@@ -32,9 +32,6 @@ private ResultSetStats(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private ResultSetStats(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.spanner.v1.QueryPlan.Builder subBuilder = null;
             if (queryPlan_ != null) {
@@ -72,13 +76,6 @@ private ResultSetStats(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private ResultSetStats(
     return com.google.spanner.v1.ResultSetProto.internal_static_google_spanner_v1_ResultSetStats_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.v1.ResultSetProto.internal_static_google_spanner_v1_ResultSetStats_fieldAccessorTable
@@ -192,7 +188,6 @@ public com.google.protobuf.StructOrBuilder getQueryStatsOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -202,7 +197,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (queryPlan_ != null) {
@@ -214,7 +208,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.spanner.v1.ResultSetStats parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.v1.ResultSetStats prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return com.google.spanner.v1.ResultSetProto.internal_static_google_spanner_v1_ResultSetStats_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.ResultSetProto.internal_static_google_spanner_v1_ResultSetStats_fieldAccessorTable
@@ -407,7 +397,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (queryPlanBuilder_ == null) {
@@ -425,18 +414,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.v1.ResultSetProto.internal_static_google_spanner_v1_ResultSetStats_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.ResultSetStats getDefaultInstanceForType() {
       return com.google.spanner.v1.ResultSetStats.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.ResultSetStats build() {
       com.google.spanner.v1.ResultSetStats result = buildPartial();
       if (!result.isInitialized()) {
@@ -445,7 +431,6 @@ public com.google.spanner.v1.ResultSetStats build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.ResultSetStats buildPartial() {
       com.google.spanner.v1.ResultSetStats result = new com.google.spanner.v1.ResultSetStats(this);
       if (queryPlanBuilder_ == null) {
@@ -462,39 +447,32 @@ public com.google.spanner.v1.ResultSetStats buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.v1.ResultSetStats) {
         return mergeFrom((com.google.spanner.v1.ResultSetStats)other);
@@ -517,12 +495,10 @@ public Builder mergeFrom(com.google.spanner.v1.ResultSetStats other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -909,13 +885,11 @@ public com.google.protobuf.StructOrBuilder getQueryStatsOrBuilder() {
       }
       return queryStatsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -937,12 +911,11 @@ public static com.google.spanner.v1.ResultSetStats getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ResultSetStats parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ResultSetStats(input, extensionRegistry);
+        return new ResultSetStats(input, extensionRegistry);
     }
   };
 
@@ -955,7 +928,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.v1.ResultSetStats getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RollbackRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RollbackRequest.java
index a834ef5227f5..739f293cb6bf 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RollbackRequest.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RollbackRequest.java
@@ -34,9 +34,6 @@ private RollbackRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private RollbackRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -59,13 +63,6 @@ private RollbackRequest(
             transactionId_ = input.readBytes();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private RollbackRequest(
     return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_RollbackRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_RollbackRequest_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.protobuf.ByteString getTransactionId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getSessionBytes().isEmpty()) {
@@ -169,7 +163,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -292,7 +285,6 @@ public static com.google.spanner.v1.RollbackRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -300,7 +292,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.v1.RollbackRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -328,7 +319,6 @@ public static final class Builder extends
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_RollbackRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_RollbackRequest_fieldAccessorTable
@@ -351,7 +341,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       session_ = "";
@@ -361,18 +350,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_RollbackRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.RollbackRequest getDefaultInstanceForType() {
       return com.google.spanner.v1.RollbackRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.RollbackRequest build() {
       com.google.spanner.v1.RollbackRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -381,7 +367,6 @@ public com.google.spanner.v1.RollbackRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.RollbackRequest buildPartial() {
       com.google.spanner.v1.RollbackRequest result = new com.google.spanner.v1.RollbackRequest(this);
       result.session_ = session_;
@@ -390,39 +375,32 @@ public com.google.spanner.v1.RollbackRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.v1.RollbackRequest) {
         return mergeFrom((com.google.spanner.v1.RollbackRequest)other);
@@ -446,12 +424,10 @@ public Builder mergeFrom(com.google.spanner.v1.RollbackRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -599,13 +575,11 @@ public Builder clearTransactionId() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -627,12 +601,11 @@ public static com.google.spanner.v1.RollbackRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RollbackRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RollbackRequest(input, extensionRegistry);
+        return new RollbackRequest(input, extensionRegistry);
     }
   };
 
@@ -645,7 +618,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.v1.RollbackRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Session.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Session.java
index 0f2663395c50..51d0f7c48301 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Session.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Session.java
@@ -33,9 +33,6 @@ private Session(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private Session(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -92,13 +96,6 @@ private Session(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -117,7 +114,6 @@ private Session(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -128,7 +124,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_Session_fieldAccessorTable
@@ -367,7 +362,6 @@ public com.google.protobuf.TimestampOrBuilder getApproximateLastUseTimeOrBuilder
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -377,7 +371,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -398,7 +391,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -555,7 +547,6 @@ public static com.google.spanner.v1.Session parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -563,7 +554,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.v1.Session prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -613,7 +603,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_Session_fieldAccessorTable
@@ -636,7 +625,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -657,18 +645,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.v1.SpannerProto.internal_static_google_spanner_v1_Session_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.Session getDefaultInstanceForType() {
       return com.google.spanner.v1.Session.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.Session build() {
       com.google.spanner.v1.Session result = buildPartial();
       if (!result.isInitialized()) {
@@ -677,7 +662,6 @@ public com.google.spanner.v1.Session build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.Session buildPartial() {
       com.google.spanner.v1.Session result = new com.google.spanner.v1.Session(this);
       int from_bitField0_ = bitField0_;
@@ -700,39 +684,32 @@ public com.google.spanner.v1.Session buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.v1.Session) {
         return mergeFrom((com.google.spanner.v1.Session)other);
@@ -761,12 +738,10 @@ public Builder mergeFrom(com.google.spanner.v1.Session other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1387,13 +1362,11 @@ public com.google.protobuf.TimestampOrBuilder getApproximateLastUseTimeOrBuilder
       }
       return approximateLastUseTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1415,12 +1388,11 @@ public static com.google.spanner.v1.Session getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Session parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Session(input, extensionRegistry);
+        return new Session(input, extensionRegistry);
     }
   };
 
@@ -1433,7 +1405,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.v1.Session getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/SpannerProto.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/SpannerProto.java
index 2f3ca6d3e93f..b5557d4ceda6 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/SpannerProto.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/SpannerProto.java
@@ -132,7 +132,7 @@ public static void registerAllExtensions(
       "google/spanner/v1/result_set.proto\032#goog" +
       "le/spanner/v1/transaction.proto\032\034google/" +
       "spanner/v1/type.proto\"U\n\024CreateSessionRe" +
-      "quest\022\020\n\010database\030\001 \001(\t\022+\n\007session\030\002 \001(\013" +
+      "quest\022\020\n\010database\030\001 \001(\t\022+\n\007session\030\002 \001(\013",
       "2\032.google.spanner.v1.Session\"\356\001\n\007Session" +
       "\022\014\n\004name\030\001 \001(\t\0226\n\006labels\030\002 \003(\0132&.google." +
       "spanner.v1.Session.LabelsEntry\022/\n\013create" +
@@ -142,7 +142,7 @@ public static void registerAllExtensions(
       "\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"!\n\021GetSess" +
       "ionRequest\022\014\n\004name\030\001 \001(\t\"^\n\023ListSessions" +
       "Request\022\020\n\010database\030\001 \001(\t\022\021\n\tpage_size\030\002" +
-      " \001(\005\022\022\n\npage_token\030\003 \001(\t\022\016\n\006filter\030\004 \001(\t" +
+      " \001(\005\022\022\n\npage_token\030\003 \001(\t\022\016\n\006filter\030\004 \001(\t",
       "\"]\n\024ListSessionsResponse\022,\n\010sessions\030\001 \003" +
       "(\0132\032.google.spanner.v1.Session\022\027\n\017next_p" +
       "age_token\030\002 \001(\t\"$\n\024DeleteSessionRequest\022" +
@@ -152,7 +152,7 @@ public static void registerAllExtensions(
       "\030\003 \001(\t\022\'\n\006params\030\004 \001(\0132\027.google.protobuf" +
       ".Struct\022I\n\013param_types\030\005 \003(\01324.google.sp" +
       "anner.v1.ExecuteSqlRequest.ParamTypesEnt" +
-      "ry\022\024\n\014resume_token\030\006 \001(\014\022B\n\nquery_mode\030\007" +
+      "ry\022\024\n\014resume_token\030\006 \001(\014\022B\n\nquery_mode\030\007",
       " \001(\0162..google.spanner.v1.ExecuteSqlReque" +
       "st.QueryMode\022\027\n\017partition_token\030\010 \001(\014\032J\n" +
       "\017ParamTypesEntry\022\013\n\003key\030\001 \001(\t\022&\n\005value\030\002" +
@@ -162,7 +162,7 @@ public static void registerAllExtensions(
       "bytes\030\001 \001(\003\022\026\n\016max_partitions\030\002 \001(\003\"\366\002\n\025" +
       "PartitionQueryRequest\022\017\n\007session\030\001 \001(\t\022;" +
       "\n\013transaction\030\002 \001(\0132&.google.spanner.v1." +
-      "TransactionSelector\022\013\n\003sql\030\003 \001(\t\022\'\n\006para" +
+      "TransactionSelector\022\013\n\003sql\030\003 \001(\t\022\'\n\006para",
       "ms\030\004 \001(\0132\027.google.protobuf.Struct\022M\n\013par" +
       "am_types\030\005 \003(\01328.google.spanner.v1.Parti" +
       "tionQueryRequest.ParamTypesEntry\022>\n\021part" +
@@ -172,7 +172,7 @@ public static void registerAllExtensions(
       ".v1.Type:\0028\001\"\377\001\n\024PartitionReadRequest\022\017\n" +
       "\007session\030\001 \001(\t\022;\n\013transaction\030\002 \001(\0132&.go" +
       "ogle.spanner.v1.TransactionSelector\022\r\n\005t" +
-      "able\030\003 \001(\t\022\r\n\005index\030\004 \001(\t\022\017\n\007columns\030\005 \003" +
+      "able\030\003 \001(\t\022\r\n\005index\030\004 \001(\t\022\017\n\007columns\030\005 \003",
       "(\t\022*\n\007key_set\030\006 \001(\0132\031.google.spanner.v1." +
       "KeySet\022>\n\021partition_options\030\t \001(\0132#.goog" +
       "le.spanner.v1.PartitionOptions\"$\n\tPartit" +
@@ -182,7 +182,7 @@ public static void registerAllExtensions(
       "2\036.google.spanner.v1.Transaction\"\364\001\n\013Rea" +
       "dRequest\022\017\n\007session\030\001 \001(\t\022;\n\013transaction" +
       "\030\002 \001(\0132&.google.spanner.v1.TransactionSe" +
-      "lector\022\r\n\005table\030\003 \001(\t\022\r\n\005index\030\004 \001(\t\022\017\n\007" +
+      "lector\022\r\n\005table\030\003 \001(\t\022\r\n\005index\030\004 \001(\t\022\017\n\007",
       "columns\030\005 \003(\t\022*\n\007key_set\030\006 \001(\0132\031.google." +
       "spanner.v1.KeySet\022\r\n\005limit\030\010 \001(\003\022\024\n\014resu" +
       "me_token\030\t \001(\014\022\027\n\017partition_token\030\n \001(\014\"" +
@@ -192,7 +192,7 @@ public static void registerAllExtensions(
       "\007session\030\001 \001(\t\022\030\n\016transaction_id\030\002 \001(\014H\000" +
       "\022G\n\026single_use_transaction\030\003 \001(\0132%.googl" +
       "e.spanner.v1.TransactionOptionsH\000\022.\n\tmut" +
-      "ations\030\004 \003(\0132\033.google.spanner.v1.Mutatio" +
+      "ations\030\004 \003(\0132\033.google.spanner.v1.Mutatio",
       "nB\r\n\013transaction\"F\n\016CommitResponse\0224\n\020co" +
       "mmit_timestamp\030\001 \001(\0132\032.google.protobuf.T" +
       "imestamp\":\n\017RollbackRequest\022\017\n\007session\030\001" +
@@ -202,7 +202,7 @@ public static void registerAllExtensions(
       "Session\"E\202\323\344\223\002?\":/v1/{database=projects/" +
       "*/instances/*/databases/*}/sessions:\001*\022\220" +
       "\001\n\nGetSession\022$.google.spanner.v1.GetSes" +
-      "sionRequest\032\032.google.spanner.v1.Session\"" +
+      "sionRequest\032\032.google.spanner.v1.Session\"",
       "@\202\323\344\223\002:\0228/v1/{name=projects/*/instances/" +
       "*/databases/*/sessions/*}\022\243\001\n\014ListSessio" +
       "ns\022&.google.spanner.v1.ListSessionsReque" +
@@ -212,7 +212,7 @@ public static void registerAllExtensions(
       "teSession\022\'.google.spanner.v1.DeleteSess" +
       "ionRequest\032\026.google.protobuf.Empty\"@\202\323\344\223" +
       "\002:*8/v1/{name=projects/*/instances/*/dat" +
-      "abases/*/sessions/*}\022\243\001\n\nExecuteSql\022$.go" +
+      "abases/*/sessions/*}\022\243\001\n\nExecuteSql\022$.go",
       "ogle.spanner.v1.ExecuteSqlRequest\032\034.goog" +
       "le.spanner.v1.ResultSet\"Q\202\323\344\223\002K\"F/v1/{se" +
       "ssion=projects/*/instances/*/databases/*" +
@@ -222,7 +222,7 @@ public static void registerAllExtensions(
       "ltSet\"Z\202\323\344\223\002T\"O/v1/{session=projects/*/i" +
       "nstances/*/databases/*/sessions/*}:execu" +
       "teStreamingSql:\001*0\001\022\221\001\n\004Read\022\036.google.sp" +
-      "anner.v1.ReadRequest\032\034.google.spanner.v1" +
+      "anner.v1.ReadRequest\032\034.google.spanner.v1",
       ".ResultSet\"K\202\323\344\223\002E\"@/v1/{session=project" +
       "s/*/instances/*/databases/*/sessions/*}:" +
       "read:\001*\022\254\001\n\rStreamingRead\022\036.google.spann" +
@@ -232,7 +232,7 @@ public static void registerAllExtensions(
       "/*}:streamingRead:\001*0\001\022\267\001\n\020BeginTransact" +
       "ion\022*.google.spanner.v1.BeginTransaction" +
       "Request\032\036.google.spanner.v1.Transaction\"" +
-      "W\202\323\344\223\002Q\"L/v1/{session=projects/*/instanc" +
+      "W\202\323\344\223\002Q\"L/v1/{session=projects/*/instanc",
       "es/*/databases/*/sessions/*}:beginTransa" +
       "ction:\001*\022\234\001\n\006Commit\022 .google.spanner.v1." +
       "CommitRequest\032!.google.spanner.v1.Commit" +
@@ -242,7 +242,7 @@ public static void registerAllExtensions(
       ".RollbackRequest\032\026.google.protobuf.Empty" +
       "\"O\202\323\344\223\002I\"D/v1/{session=projects/*/instan" +
       "ces/*/databases/*/sessions/*}:rollback:\001" +
-      "*\022\267\001\n\016PartitionQuery\022(.google.spanner.v1" +
+      "*\022\267\001\n\016PartitionQuery\022(.google.spanner.v1",
       ".PartitionQueryRequest\032$.google.spanner." +
       "v1.PartitionResponse\"U\202\323\344\223\002O\"J/v1/{sessi" +
       "on=projects/*/instances/*/databases/*/se" +
@@ -252,7 +252,7 @@ public static void registerAllExtensions(
       "onse\"T\202\323\344\223\002N\"I/v1/{session=projects/*/in" +
       "stances/*/databases/*/sessions/*}:partit" +
       "ionRead:\001*B\225\001\n\025com.google.spanner.v1B\014Sp" +
-      "annerProtoP\001Z8google.golang.org/genproto" +
+      "annerProtoP\001Z8google.golang.org/genproto",
       "/googleapis/spanner/v1;spanner\252\002\027Google." +
       "Cloud.Spanner.V1\312\002\027Google\\Cloud\\Spanner\\" +
       "V1b\006proto3"
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/StructType.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/StructType.java
index 4f10920bbd63..5015086195c6 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/StructType.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/StructType.java
@@ -33,9 +33,6 @@ private StructType(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private StructType(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               fields_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private StructType(
                 input.readMessage(com.google.spanner.v1.StructType.Field.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private StructType(
     return com.google.spanner.v1.TypeProto.internal_static_google_spanner_v1_StructType_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.v1.TypeProto.internal_static_google_spanner_v1_StructType_fieldAccessorTable
@@ -180,9 +176,6 @@ private Field(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -194,6 +187,13 @@ private Field(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -213,13 +213,6 @@ private Field(
 
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -237,7 +230,6 @@ private Field(
       return com.google.spanner.v1.TypeProto.internal_static_google_spanner_v1_StructType_Field_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.TypeProto.internal_static_google_spanner_v1_StructType_Field_fieldAccessorTable
@@ -333,7 +325,6 @@ public com.google.spanner.v1.TypeOrBuilder getTypeOrBuilder() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -343,7 +334,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getNameBytes().isEmpty()) {
@@ -355,7 +345,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -483,7 +472,6 @@ public static com.google.spanner.v1.StructType.Field parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -491,7 +479,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.spanner.v1.StructType.Field prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -519,7 +506,6 @@ public static final class Builder extends
         return com.google.spanner.v1.TypeProto.internal_static_google_spanner_v1_StructType_Field_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.spanner.v1.TypeProto.internal_static_google_spanner_v1_StructType_Field_fieldAccessorTable
@@ -542,7 +528,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         name_ = "";
@@ -556,18 +541,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.spanner.v1.TypeProto.internal_static_google_spanner_v1_StructType_Field_descriptor;
       }
 
-      @java.lang.Override
       public com.google.spanner.v1.StructType.Field getDefaultInstanceForType() {
         return com.google.spanner.v1.StructType.Field.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.spanner.v1.StructType.Field build() {
         com.google.spanner.v1.StructType.Field result = buildPartial();
         if (!result.isInitialized()) {
@@ -576,7 +558,6 @@ public com.google.spanner.v1.StructType.Field build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.spanner.v1.StructType.Field buildPartial() {
         com.google.spanner.v1.StructType.Field result = new com.google.spanner.v1.StructType.Field(this);
         result.name_ = name_;
@@ -589,39 +570,32 @@ public com.google.spanner.v1.StructType.Field buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.spanner.v1.StructType.Field) {
           return mergeFrom((com.google.spanner.v1.StructType.Field)other);
@@ -645,12 +619,10 @@ public Builder mergeFrom(com.google.spanner.v1.StructType.Field other) {
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -940,13 +912,11 @@ public com.google.spanner.v1.TypeOrBuilder getTypeOrBuilder() {
         }
         return typeBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -968,12 +938,11 @@ public static com.google.spanner.v1.StructType.Field getDefaultInstance() {
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Field parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Field(input, extensionRegistry);
+          return new Field(input, extensionRegistry);
       }
     };
 
@@ -986,7 +955,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.StructType.Field getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1074,7 +1042,6 @@ public com.google.spanner.v1.StructType.FieldOrBuilder getFieldsOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1084,7 +1051,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < fields_.size(); i++) {
@@ -1093,7 +1059,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1211,7 +1176,6 @@ public static com.google.spanner.v1.StructType parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1219,7 +1183,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.v1.StructType prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1247,7 +1210,6 @@ public static final class Builder extends
       return com.google.spanner.v1.TypeProto.internal_static_google_spanner_v1_StructType_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.TypeProto.internal_static_google_spanner_v1_StructType_fieldAccessorTable
@@ -1271,7 +1233,6 @@ private void maybeForceBuilderInitialization() {
         getFieldsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (fieldsBuilder_ == null) {
@@ -1283,18 +1244,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.v1.TypeProto.internal_static_google_spanner_v1_StructType_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.StructType getDefaultInstanceForType() {
       return com.google.spanner.v1.StructType.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.StructType build() {
       com.google.spanner.v1.StructType result = buildPartial();
       if (!result.isInitialized()) {
@@ -1303,7 +1261,6 @@ public com.google.spanner.v1.StructType build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.StructType buildPartial() {
       com.google.spanner.v1.StructType result = new com.google.spanner.v1.StructType(this);
       int from_bitField0_ = bitField0_;
@@ -1320,39 +1277,32 @@ public com.google.spanner.v1.StructType buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.v1.StructType) {
         return mergeFrom((com.google.spanner.v1.StructType)other);
@@ -1395,12 +1345,10 @@ public Builder mergeFrom(com.google.spanner.v1.StructType other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1821,13 +1769,11 @@ public com.google.spanner.v1.StructType.Field.Builder addFieldsBuilder(
       }
       return fieldsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1849,12 +1795,11 @@ public static com.google.spanner.v1.StructType getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public StructType parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StructType(input, extensionRegistry);
+        return new StructType(input, extensionRegistry);
     }
   };
 
@@ -1867,7 +1812,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.v1.StructType getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Transaction.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Transaction.java
index 8761f58bf7d6..11117a914895 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Transaction.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Transaction.java
@@ -33,9 +33,6 @@ private Transaction(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private Transaction(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
 
             id_ = input.readBytes();
@@ -65,13 +69,6 @@ private Transaction(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -89,7 +86,6 @@ private Transaction(
     return com.google.spanner.v1.TransactionProto.internal_static_google_spanner_v1_Transaction_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.v1.TransactionProto.internal_static_google_spanner_v1_Transaction_fieldAccessorTable
@@ -162,7 +158,6 @@ public com.google.protobuf.TimestampOrBuilder getReadTimestampOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -172,7 +167,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!id_.isEmpty()) {
@@ -184,7 +178,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -313,7 +306,6 @@ public static com.google.spanner.v1.Transaction parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -321,7 +313,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.v1.Transaction prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -349,7 +340,6 @@ public static final class Builder extends
       return com.google.spanner.v1.TransactionProto.internal_static_google_spanner_v1_Transaction_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.TransactionProto.internal_static_google_spanner_v1_Transaction_fieldAccessorTable
@@ -372,7 +362,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       id_ = com.google.protobuf.ByteString.EMPTY;
@@ -386,18 +375,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.v1.TransactionProto.internal_static_google_spanner_v1_Transaction_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.Transaction getDefaultInstanceForType() {
       return com.google.spanner.v1.Transaction.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.Transaction build() {
       com.google.spanner.v1.Transaction result = buildPartial();
       if (!result.isInitialized()) {
@@ -406,7 +392,6 @@ public com.google.spanner.v1.Transaction build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.Transaction buildPartial() {
       com.google.spanner.v1.Transaction result = new com.google.spanner.v1.Transaction(this);
       result.id_ = id_;
@@ -419,39 +404,32 @@ public com.google.spanner.v1.Transaction buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.v1.Transaction) {
         return mergeFrom((com.google.spanner.v1.Transaction)other);
@@ -474,12 +452,10 @@ public Builder mergeFrom(com.google.spanner.v1.Transaction other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -745,13 +721,11 @@ public com.google.protobuf.TimestampOrBuilder getReadTimestampOrBuilder() {
       }
       return readTimestampBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -773,12 +747,11 @@ public static com.google.spanner.v1.Transaction getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Transaction parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Transaction(input, extensionRegistry);
+        return new Transaction(input, extensionRegistry);
     }
   };
 
@@ -791,7 +764,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.v1.Transaction getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionOptions.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionOptions.java
index 9712d6bd06a5..154f28eb87aa 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionOptions.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionOptions.java
@@ -199,9 +199,6 @@ private TransactionOptions(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -213,6 +210,13 @@ private TransactionOptions(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.spanner.v1.TransactionOptions.ReadWrite.Builder subBuilder = null;
             if (modeCase_ == 1) {
@@ -241,13 +245,6 @@ private TransactionOptions(
             modeCase_ = 2;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -265,7 +262,6 @@ private TransactionOptions(
     return com.google.spanner.v1.TransactionProto.internal_static_google_spanner_v1_TransactionOptions_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.v1.TransactionProto.internal_static_google_spanner_v1_TransactionOptions_fieldAccessorTable
@@ -307,9 +303,6 @@ private ReadWrite(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
       try {
@@ -344,7 +337,6 @@ private ReadWrite(
       return com.google.spanner.v1.TransactionProto.internal_static_google_spanner_v1_TransactionOptions_ReadWrite_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.TransactionProto.internal_static_google_spanner_v1_TransactionOptions_ReadWrite_fieldAccessorTable
@@ -353,7 +345,6 @@ private ReadWrite(
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -363,13 +354,11 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -477,7 +466,6 @@ public static com.google.spanner.v1.TransactionOptions.ReadWrite parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -485,7 +473,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.spanner.v1.TransactionOptions.ReadWrite prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -514,7 +501,6 @@ public static final class Builder extends
         return com.google.spanner.v1.TransactionProto.internal_static_google_spanner_v1_TransactionOptions_ReadWrite_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.spanner.v1.TransactionProto.internal_static_google_spanner_v1_TransactionOptions_ReadWrite_fieldAccessorTable
@@ -537,24 +523,20 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.spanner.v1.TransactionProto.internal_static_google_spanner_v1_TransactionOptions_ReadWrite_descriptor;
       }
 
-      @java.lang.Override
       public com.google.spanner.v1.TransactionOptions.ReadWrite getDefaultInstanceForType() {
         return com.google.spanner.v1.TransactionOptions.ReadWrite.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.spanner.v1.TransactionOptions.ReadWrite build() {
         com.google.spanner.v1.TransactionOptions.ReadWrite result = buildPartial();
         if (!result.isInitialized()) {
@@ -563,46 +545,38 @@ public com.google.spanner.v1.TransactionOptions.ReadWrite build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.spanner.v1.TransactionOptions.ReadWrite buildPartial() {
         com.google.spanner.v1.TransactionOptions.ReadWrite result = new com.google.spanner.v1.TransactionOptions.ReadWrite(this);
         onBuilt();
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.spanner.v1.TransactionOptions.ReadWrite) {
           return mergeFrom((com.google.spanner.v1.TransactionOptions.ReadWrite)other);
@@ -619,12 +593,10 @@ public Builder mergeFrom(com.google.spanner.v1.TransactionOptions.ReadWrite othe
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -642,13 +614,11 @@ public Builder mergeFrom(
         }
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -670,12 +640,11 @@ public static com.google.spanner.v1.TransactionOptions.ReadWrite getDefaultInsta
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public ReadWrite parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ReadWrite(input, extensionRegistry);
+          return new ReadWrite(input, extensionRegistry);
       }
     };
 
@@ -688,7 +657,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.TransactionOptions.ReadWrite getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -950,9 +918,6 @@ private ReadOnly(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -964,6 +929,13 @@ private ReadOnly(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 8: {
               timestampBoundCase_ = 1;
               timestampBound_ = input.readBool();
@@ -1030,13 +1002,6 @@ private ReadOnly(
               returnReadTimestamp_ = input.readBool();
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1054,7 +1019,6 @@ private ReadOnly(
       return com.google.spanner.v1.TransactionProto.internal_static_google_spanner_v1_TransactionOptions_ReadOnly_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.TransactionProto.internal_static_google_spanner_v1_TransactionOptions_ReadOnly_fieldAccessorTable
@@ -1388,7 +1352,6 @@ public boolean getReturnReadTimestamp() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1398,7 +1361,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (timestampBoundCase_ == 1) {
@@ -1423,7 +1385,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -1613,7 +1574,6 @@ public static com.google.spanner.v1.TransactionOptions.ReadOnly parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -1621,7 +1581,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.spanner.v1.TransactionOptions.ReadOnly prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -1649,7 +1608,6 @@ public static final class Builder extends
         return com.google.spanner.v1.TransactionProto.internal_static_google_spanner_v1_TransactionOptions_ReadOnly_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.spanner.v1.TransactionProto.internal_static_google_spanner_v1_TransactionOptions_ReadOnly_fieldAccessorTable
@@ -1672,7 +1630,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         returnReadTimestamp_ = false;
@@ -1682,18 +1639,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.spanner.v1.TransactionProto.internal_static_google_spanner_v1_TransactionOptions_ReadOnly_descriptor;
       }
 
-      @java.lang.Override
       public com.google.spanner.v1.TransactionOptions.ReadOnly getDefaultInstanceForType() {
         return com.google.spanner.v1.TransactionOptions.ReadOnly.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.spanner.v1.TransactionOptions.ReadOnly build() {
         com.google.spanner.v1.TransactionOptions.ReadOnly result = buildPartial();
         if (!result.isInitialized()) {
@@ -1702,7 +1656,6 @@ public com.google.spanner.v1.TransactionOptions.ReadOnly build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.spanner.v1.TransactionOptions.ReadOnly buildPartial() {
         com.google.spanner.v1.TransactionOptions.ReadOnly result = new com.google.spanner.v1.TransactionOptions.ReadOnly(this);
         if (timestampBoundCase_ == 1) {
@@ -1742,39 +1695,32 @@ public com.google.spanner.v1.TransactionOptions.ReadOnly buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.spanner.v1.TransactionOptions.ReadOnly) {
           return mergeFrom((com.google.spanner.v1.TransactionOptions.ReadOnly)other);
@@ -1819,12 +1765,10 @@ public Builder mergeFrom(com.google.spanner.v1.TransactionOptions.ReadOnly other
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2928,13 +2872,11 @@ public Builder clearReturnReadTimestamp() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -2956,12 +2898,11 @@ public static com.google.spanner.v1.TransactionOptions.ReadOnly getDefaultInstan
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public ReadOnly parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ReadOnly(input, extensionRegistry);
+          return new ReadOnly(input, extensionRegistry);
       }
     };
 
@@ -2974,7 +2915,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.TransactionOptions.ReadOnly getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -3114,7 +3054,6 @@ public com.google.spanner.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyOrB
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -3124,7 +3063,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (modeCase_ == 1) {
@@ -3136,7 +3074,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -3279,7 +3216,6 @@ public static com.google.spanner.v1.TransactionOptions parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -3287,7 +3223,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.v1.TransactionOptions prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -3482,7 +3417,6 @@ public static final class Builder extends
       return com.google.spanner.v1.TransactionProto.internal_static_google_spanner_v1_TransactionOptions_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.TransactionProto.internal_static_google_spanner_v1_TransactionOptions_fieldAccessorTable
@@ -3505,7 +3439,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       modeCase_ = 0;
@@ -3513,18 +3446,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.v1.TransactionProto.internal_static_google_spanner_v1_TransactionOptions_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.TransactionOptions getDefaultInstanceForType() {
       return com.google.spanner.v1.TransactionOptions.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.TransactionOptions build() {
       com.google.spanner.v1.TransactionOptions result = buildPartial();
       if (!result.isInitialized()) {
@@ -3533,7 +3463,6 @@ public com.google.spanner.v1.TransactionOptions build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.TransactionOptions buildPartial() {
       com.google.spanner.v1.TransactionOptions result = new com.google.spanner.v1.TransactionOptions(this);
       if (modeCase_ == 1) {
@@ -3555,39 +3484,32 @@ public com.google.spanner.v1.TransactionOptions buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.v1.TransactionOptions) {
         return mergeFrom((com.google.spanner.v1.TransactionOptions)other);
@@ -3617,12 +3539,10 @@ public Builder mergeFrom(com.google.spanner.v1.TransactionOptions other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4053,13 +3973,11 @@ public com.google.spanner.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyOrB
       onChanged();;
       return readOnlyBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -4081,12 +3999,11 @@ public static com.google.spanner.v1.TransactionOptions getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TransactionOptions parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TransactionOptions(input, extensionRegistry);
+        return new TransactionOptions(input, extensionRegistry);
     }
   };
 
@@ -4099,7 +4016,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.v1.TransactionOptions getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionProto.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionProto.java
index 7b6500bb2cbb..564f783cae68 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionProto.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionProto.java
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "iteH\000\022C\n\tread_only\030\002 \001(\0132..google.spanne" +
       "r.v1.TransactionOptions.ReadOnlyH\000\032\013\n\tRe" +
       "adWrite\032\250\002\n\010ReadOnly\022\020\n\006strong\030\001 \001(\010H\000\0228" +
-      "\n\022min_read_timestamp\030\002 \001(\0132\032.google.prot" +
+      "\n\022min_read_timestamp\030\002 \001(\0132\032.google.prot",
       "obuf.TimestampH\000\0222\n\rmax_staleness\030\003 \001(\0132" +
       "\031.google.protobuf.DurationH\000\0224\n\016read_tim" +
       "estamp\030\004 \001(\0132\032.google.protobuf.Timestamp" +
@@ -67,7 +67,7 @@ public static void registerAllExtensions(
       "ansaction\022\n\n\002id\030\001 \001(\014\0222\n\016read_timestamp\030" +
       "\002 \001(\0132\032.google.protobuf.Timestamp\"\244\001\n\023Tr" +
       "ansactionSelector\022;\n\nsingle_use\030\001 \001(\0132%." +
-      "google.spanner.v1.TransactionOptionsH\000\022\014" +
+      "google.spanner.v1.TransactionOptionsH\000\022\014",
       "\n\002id\030\002 \001(\014H\000\0226\n\005begin\030\003 \001(\0132%.google.spa" +
       "nner.v1.TransactionOptionsH\000B\n\n\010selector" +
       "B\231\001\n\025com.google.spanner.v1B\020TransactionP" +
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionSelector.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionSelector.java
index 2eb3e209cead..def26a6861b5 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionSelector.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionSelector.java
@@ -35,9 +35,6 @@ private TransactionSelector(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private TransactionSelector(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.spanner.v1.TransactionOptions.Builder subBuilder = null;
             if (selectorCase_ == 1) {
@@ -82,13 +86,6 @@ private TransactionSelector(
             selectorCase_ = 3;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -106,7 +103,6 @@ private TransactionSelector(
     return com.google.spanner.v1.TransactionProto.internal_static_google_spanner_v1_TransactionSelector_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.v1.TransactionProto.internal_static_google_spanner_v1_TransactionSelector_fieldAccessorTable
@@ -258,7 +254,6 @@ public com.google.spanner.v1.TransactionOptionsOrBuilder getBeginOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -268,7 +263,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (selectorCase_ == 1) {
@@ -284,7 +278,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -440,7 +433,6 @@ public static com.google.spanner.v1.TransactionSelector parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -448,7 +440,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.v1.TransactionSelector prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -479,7 +470,6 @@ public static final class Builder extends
       return com.google.spanner.v1.TransactionProto.internal_static_google_spanner_v1_TransactionSelector_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.TransactionProto.internal_static_google_spanner_v1_TransactionSelector_fieldAccessorTable
@@ -502,7 +492,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       selectorCase_ = 0;
@@ -510,18 +499,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.v1.TransactionProto.internal_static_google_spanner_v1_TransactionSelector_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.TransactionSelector getDefaultInstanceForType() {
       return com.google.spanner.v1.TransactionSelector.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.TransactionSelector build() {
       com.google.spanner.v1.TransactionSelector result = buildPartial();
       if (!result.isInitialized()) {
@@ -530,7 +516,6 @@ public com.google.spanner.v1.TransactionSelector build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.TransactionSelector buildPartial() {
       com.google.spanner.v1.TransactionSelector result = new com.google.spanner.v1.TransactionSelector(this);
       if (selectorCase_ == 1) {
@@ -555,39 +540,32 @@ public com.google.spanner.v1.TransactionSelector buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.v1.TransactionSelector) {
         return mergeFrom((com.google.spanner.v1.TransactionSelector)other);
@@ -621,12 +599,10 @@ public Builder mergeFrom(com.google.spanner.v1.TransactionSelector other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1084,13 +1060,11 @@ public com.google.spanner.v1.TransactionOptionsOrBuilder getBeginOrBuilder() {
       onChanged();;
       return beginBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1112,12 +1086,11 @@ public static com.google.spanner.v1.TransactionSelector getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TransactionSelector parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TransactionSelector(input, extensionRegistry);
+        return new TransactionSelector(input, extensionRegistry);
     }
   };
 
@@ -1130,7 +1103,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.v1.TransactionSelector getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Type.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Type.java
index 8beb3b1810e9..809503aa0a61 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Type.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Type.java
@@ -34,9 +34,6 @@ private Type(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private Type(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -80,13 +84,6 @@ private Type(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private Type(
     return com.google.spanner.v1.TypeProto.internal_static_google_spanner_v1_Type_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.spanner.v1.TypeProto.internal_static_google_spanner_v1_Type_fieldAccessorTable
@@ -132,7 +128,6 @@ public int getCodeValue() {
    * .google.spanner.v1.TypeCode code = 1;
    */
   public com.google.spanner.v1.TypeCode getCode() {
-    @SuppressWarnings("deprecation")
     com.google.spanner.v1.TypeCode result = com.google.spanner.v1.TypeCode.valueOf(code_);
     return result == null ? com.google.spanner.v1.TypeCode.UNRECOGNIZED : result;
   }
@@ -210,7 +205,6 @@ public com.google.spanner.v1.StructTypeOrBuilder getStructTypeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -220,7 +214,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (code_ != com.google.spanner.v1.TypeCode.TYPE_CODE_UNSPECIFIED.getNumber()) {
@@ -235,7 +228,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -376,7 +368,6 @@ public static com.google.spanner.v1.Type parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -384,7 +375,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.spanner.v1.Type prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -413,7 +403,6 @@ public static final class Builder extends
       return com.google.spanner.v1.TypeProto.internal_static_google_spanner_v1_Type_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.spanner.v1.TypeProto.internal_static_google_spanner_v1_Type_fieldAccessorTable
@@ -436,7 +425,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       code_ = 0;
@@ -456,18 +444,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.spanner.v1.TypeProto.internal_static_google_spanner_v1_Type_descriptor;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.Type getDefaultInstanceForType() {
       return com.google.spanner.v1.Type.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.Type build() {
       com.google.spanner.v1.Type result = buildPartial();
       if (!result.isInitialized()) {
@@ -476,7 +461,6 @@ public com.google.spanner.v1.Type build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.spanner.v1.Type buildPartial() {
       com.google.spanner.v1.Type result = new com.google.spanner.v1.Type(this);
       result.code_ = code_;
@@ -494,39 +478,32 @@ public com.google.spanner.v1.Type buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.spanner.v1.Type) {
         return mergeFrom((com.google.spanner.v1.Type)other);
@@ -552,12 +529,10 @@ public Builder mergeFrom(com.google.spanner.v1.Type other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -607,7 +582,6 @@ public Builder setCodeValue(int value) {
      * .google.spanner.v1.TypeCode code = 1;
      */
     public com.google.spanner.v1.TypeCode getCode() {
-      @SuppressWarnings("deprecation")
       com.google.spanner.v1.TypeCode result = com.google.spanner.v1.TypeCode.valueOf(code_);
       return result == null ? com.google.spanner.v1.TypeCode.UNRECOGNIZED : result;
     }
@@ -964,13 +938,11 @@ public com.google.spanner.v1.StructTypeOrBuilder getStructTypeOrBuilder() {
       }
       return structTypeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -992,12 +964,11 @@ public static com.google.spanner.v1.Type getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Type parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Type(input, extensionRegistry);
+        return new Type(input, extensionRegistry);
     }
   };
 
@@ -1010,7 +981,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.spanner.v1.Type getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeProto.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeProto.java
index 8125a0200c6b..111633f69b26 100644
--- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeProto.java
+++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TypeProto.java
@@ -47,7 +47,7 @@ public static void registerAllExtensions(
       "StructType\0223\n\006fields\030\001 \003(\0132#.google.span" +
       "ner.v1.StructType.Field\032<\n\005Field\022\014\n\004name" +
       "\030\001 \001(\t\022%\n\004type\030\002 \001(\0132\027.google.spanner.v1" +
-      ".Type*\216\001\n\010TypeCode\022\031\n\025TYPE_CODE_UNSPECIF" +
+      ".Type*\216\001\n\010TypeCode\022\031\n\025TYPE_CODE_UNSPECIF",
       "IED\020\000\022\010\n\004BOOL\020\001\022\t\n\005INT64\020\002\022\013\n\007FLOAT64\020\003\022" +
       "\r\n\tTIMESTAMP\020\004\022\010\n\004DATE\020\005\022\n\n\006STRING\020\006\022\t\n\005" +
       "BYTES\020\007\022\t\n\005ARRAY\020\010\022\n\n\006STRUCT\020\tB\222\001\n\025com.g" +
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeMetadata.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeMetadata.java
index a2e0b6a8fe1a..5b3dc9c8c8e8 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeMetadata.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeMetadata.java
@@ -35,9 +35,6 @@ private LongRunningRecognizeMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private LongRunningRecognizeMetadata(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
 
             progressPercent_ = input.readInt32();
@@ -80,13 +84,6 @@ private LongRunningRecognizeMetadata(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private LongRunningRecognizeMetadata(
     return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_LongRunningRecognizeMetadata_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_LongRunningRecognizeMetadata_fieldAccessorTable
@@ -193,7 +189,6 @@ public com.google.protobuf.TimestampOrBuilder getLastUpdateTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -203,7 +198,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (progressPercent_ != 0) {
@@ -218,7 +212,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -360,7 +353,6 @@ public static com.google.cloud.speech.v1.LongRunningRecognizeMetadata parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -368,7 +360,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.speech.v1.LongRunningRecognizeMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -398,7 +389,6 @@ public static final class Builder extends
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_LongRunningRecognizeMetadata_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_LongRunningRecognizeMetadata_fieldAccessorTable
@@ -421,7 +411,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       progressPercent_ = 0;
@@ -441,18 +430,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_LongRunningRecognizeMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.LongRunningRecognizeMetadata getDefaultInstanceForType() {
       return com.google.cloud.speech.v1.LongRunningRecognizeMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.LongRunningRecognizeMetadata build() {
       com.google.cloud.speech.v1.LongRunningRecognizeMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -461,7 +447,6 @@ public com.google.cloud.speech.v1.LongRunningRecognizeMetadata build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.LongRunningRecognizeMetadata buildPartial() {
       com.google.cloud.speech.v1.LongRunningRecognizeMetadata result = new com.google.cloud.speech.v1.LongRunningRecognizeMetadata(this);
       result.progressPercent_ = progressPercent_;
@@ -479,39 +464,32 @@ public com.google.cloud.speech.v1.LongRunningRecognizeMetadata buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.speech.v1.LongRunningRecognizeMetadata) {
         return mergeFrom((com.google.cloud.speech.v1.LongRunningRecognizeMetadata)other);
@@ -537,12 +515,10 @@ public Builder mergeFrom(com.google.cloud.speech.v1.LongRunningRecognizeMetadata
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -907,13 +883,11 @@ public com.google.protobuf.TimestampOrBuilder getLastUpdateTimeOrBuilder() {
       }
       return lastUpdateTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -935,12 +909,11 @@ public static com.google.cloud.speech.v1.LongRunningRecognizeMetadata getDefault
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LongRunningRecognizeMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LongRunningRecognizeMetadata(input, extensionRegistry);
+        return new LongRunningRecognizeMetadata(input, extensionRegistry);
     }
   };
 
@@ -953,7 +926,6 @@ public com.google.protobuf.Parser getParserForType
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.speech.v1.LongRunningRecognizeMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeRequest.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeRequest.java
index d87c7ea56f84..98ddf30fc438 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeRequest.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeRequest.java
@@ -33,9 +33,6 @@ private LongRunningRecognizeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private LongRunningRecognizeRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.speech.v1.RecognitionConfig.Builder subBuilder = null;
             if (config_ != null) {
@@ -73,13 +77,6 @@ private LongRunningRecognizeRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private LongRunningRecognizeRequest(
     return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_LongRunningRecognizeRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_LongRunningRecognizeRequest_fieldAccessorTable
@@ -175,7 +171,6 @@ public com.google.cloud.speech.v1.RecognitionAudioOrBuilder getAudioOrBuilder()
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -185,7 +180,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (config_ != null) {
@@ -197,7 +191,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -331,7 +324,6 @@ public static com.google.cloud.speech.v1.LongRunningRecognizeRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -339,7 +331,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.speech.v1.LongRunningRecognizeRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -368,7 +359,6 @@ public static final class Builder extends
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_LongRunningRecognizeRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_LongRunningRecognizeRequest_fieldAccessorTable
@@ -391,7 +381,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (configBuilder_ == null) {
@@ -409,18 +398,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_LongRunningRecognizeRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.LongRunningRecognizeRequest getDefaultInstanceForType() {
       return com.google.cloud.speech.v1.LongRunningRecognizeRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.LongRunningRecognizeRequest build() {
       com.google.cloud.speech.v1.LongRunningRecognizeRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -429,7 +415,6 @@ public com.google.cloud.speech.v1.LongRunningRecognizeRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.LongRunningRecognizeRequest buildPartial() {
       com.google.cloud.speech.v1.LongRunningRecognizeRequest result = new com.google.cloud.speech.v1.LongRunningRecognizeRequest(this);
       if (configBuilder_ == null) {
@@ -446,39 +431,32 @@ public com.google.cloud.speech.v1.LongRunningRecognizeRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.speech.v1.LongRunningRecognizeRequest) {
         return mergeFrom((com.google.cloud.speech.v1.LongRunningRecognizeRequest)other);
@@ -501,12 +479,10 @@ public Builder mergeFrom(com.google.cloud.speech.v1.LongRunningRecognizeRequest
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -839,13 +815,11 @@ public com.google.cloud.speech.v1.RecognitionAudioOrBuilder getAudioOrBuilder()
       }
       return audioBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -867,12 +841,11 @@ public static com.google.cloud.speech.v1.LongRunningRecognizeRequest getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LongRunningRecognizeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LongRunningRecognizeRequest(input, extensionRegistry);
+        return new LongRunningRecognizeRequest(input, extensionRegistry);
     }
   };
 
@@ -885,7 +858,6 @@ public com.google.protobuf.Parser getParserForType(
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.speech.v1.LongRunningRecognizeRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeResponse.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeResponse.java
index 53ac2e72c48e..a99838570d3a 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeResponse.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeResponse.java
@@ -37,9 +37,6 @@ private LongRunningRecognizeResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private LongRunningRecognizeResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               results_ = new java.util.ArrayList();
@@ -60,13 +64,6 @@ private LongRunningRecognizeResponse(
                 input.readMessage(com.google.cloud.speech.v1.SpeechRecognitionResult.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -87,7 +84,6 @@ private LongRunningRecognizeResponse(
     return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_LongRunningRecognizeResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_LongRunningRecognizeResponse_fieldAccessorTable
@@ -99,7 +95,7 @@ private LongRunningRecognizeResponse(
   private java.util.List results_;
   /**
    * 
-   * *Output-only* Sequential list of transcription results corresponding to
+   * Output only. Sequential list of transcription results corresponding to
    * sequential portions of audio.
    * 

    *
@@ -110,7 +106,7 @@ public java.util.List getRes
   }
   /**
    * 
-   * *Output-only* Sequential list of transcription results corresponding to
+   * Output only. Sequential list of transcription results corresponding to
    * sequential portions of audio.
    * 

    *
@@ -122,7 +118,7 @@ public java.util.List getRes
   }
   /**
    * 
-   * *Output-only* Sequential list of transcription results corresponding to
+   * Output only. Sequential list of transcription results corresponding to
    * sequential portions of audio.
    * 

    *
@@ -133,7 +129,7 @@ public int getResultsCount() {
   }
   /**
    * 
-   * *Output-only* Sequential list of transcription results corresponding to
+   * Output only. Sequential list of transcription results corresponding to
    * sequential portions of audio.
    * 

    *
@@ -144,7 +140,7 @@ public com.google.cloud.speech.v1.SpeechRecognitionResult getResults(int index)
   }
   /**
    * 
-   * *Output-only* Sequential list of transcription results corresponding to
+   * Output only. Sequential list of transcription results corresponding to
    * sequential portions of audio.
    * 

    *
@@ -156,7 +152,6 @@ public com.google.cloud.speech.v1.SpeechRecognitionResultOrBuilder getResultsOrB
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -166,7 +161,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < results_.size(); i++) {
@@ -175,7 +169,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -293,7 +286,6 @@ public static com.google.cloud.speech.v1.LongRunningRecognizeResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -301,7 +293,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.speech.v1.LongRunningRecognizeResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -333,7 +324,6 @@ public static final class Builder extends
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_LongRunningRecognizeResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_LongRunningRecognizeResponse_fieldAccessorTable
@@ -357,7 +347,6 @@ private void maybeForceBuilderInitialization() {
         getResultsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (resultsBuilder_ == null) {
@@ -369,18 +358,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_LongRunningRecognizeResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.LongRunningRecognizeResponse getDefaultInstanceForType() {
       return com.google.cloud.speech.v1.LongRunningRecognizeResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.LongRunningRecognizeResponse build() {
       com.google.cloud.speech.v1.LongRunningRecognizeResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -389,7 +375,6 @@ public com.google.cloud.speech.v1.LongRunningRecognizeResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.LongRunningRecognizeResponse buildPartial() {
       com.google.cloud.speech.v1.LongRunningRecognizeResponse result = new com.google.cloud.speech.v1.LongRunningRecognizeResponse(this);
       int from_bitField0_ = bitField0_;
@@ -406,39 +391,32 @@ public com.google.cloud.speech.v1.LongRunningRecognizeResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.speech.v1.LongRunningRecognizeResponse) {
         return mergeFrom((com.google.cloud.speech.v1.LongRunningRecognizeResponse)other);
@@ -481,12 +459,10 @@ public Builder mergeFrom(com.google.cloud.speech.v1.LongRunningRecognizeResponse
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -520,7 +496,7 @@ private void ensureResultsIsMutable() {
 
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -535,7 +511,7 @@ public java.util.List getRes
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -550,7 +526,7 @@ public int getResultsCount() {
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -565,7 +541,7 @@ public com.google.cloud.speech.v1.SpeechRecognitionResult getResults(int index)
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -587,7 +563,7 @@ public Builder setResults(
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -606,7 +582,7 @@ public Builder setResults(
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -627,7 +603,7 @@ public Builder addResults(com.google.cloud.speech.v1.SpeechRecognitionResult val
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -649,7 +625,7 @@ public Builder addResults(
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -668,7 +644,7 @@ public Builder addResults(
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -687,7 +663,7 @@ public Builder addResults(
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -707,7 +683,7 @@ public Builder addAllResults(
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -725,7 +701,7 @@ public Builder clearResults() {
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -743,7 +719,7 @@ public Builder removeResults(int index) {
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -755,7 +731,7 @@ public com.google.cloud.speech.v1.SpeechRecognitionResult.Builder getResultsBuil
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -770,7 +746,7 @@ public com.google.cloud.speech.v1.SpeechRecognitionResultOrBuilder getResultsOrB
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -786,7 +762,7 @@ public com.google.cloud.speech.v1.SpeechRecognitionResultOrBuilder getResultsOrB
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -798,7 +774,7 @@ public com.google.cloud.speech.v1.SpeechRecognitionResult.Builder addResultsBuil
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -811,7 +787,7 @@ public com.google.cloud.speech.v1.SpeechRecognitionResult.Builder addResultsBuil
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -835,13 +811,11 @@ public com.google.cloud.speech.v1.SpeechRecognitionResult.Builder addResultsBuil
       }
       return resultsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -863,12 +837,11 @@ public static com.google.cloud.speech.v1.LongRunningRecognizeResponse getDefault
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LongRunningRecognizeResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LongRunningRecognizeResponse(input, extensionRegistry);
+        return new LongRunningRecognizeResponse(input, extensionRegistry);
     }
   };
 
@@ -881,7 +854,6 @@ public com.google.protobuf.Parser getParserForType
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.speech.v1.LongRunningRecognizeResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeResponseOrBuilder.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeResponseOrBuilder.java
index fe350f0d301c..8461a31914a2 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeResponseOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/LongRunningRecognizeResponseOrBuilder.java
@@ -9,7 +9,7 @@ public interface LongRunningRecognizeResponseOrBuilder extends
 
   /**
    * 
-   * *Output-only* Sequential list of transcription results corresponding to
+   * Output only. Sequential list of transcription results corresponding to
    * sequential portions of audio.
    * 

    *
@@ -19,7 +19,7 @@ public interface LongRunningRecognizeResponseOrBuilder extends
       getResultsList();
   /**
    * 
-   * *Output-only* Sequential list of transcription results corresponding to
+   * Output only. Sequential list of transcription results corresponding to
    * sequential portions of audio.
    * 

    *
@@ -28,7 +28,7 @@ public interface LongRunningRecognizeResponseOrBuilder extends
   com.google.cloud.speech.v1.SpeechRecognitionResult getResults(int index);
   /**
    * 
-   * *Output-only* Sequential list of transcription results corresponding to
+   * Output only. Sequential list of transcription results corresponding to
    * sequential portions of audio.
    * 

    *
@@ -37,7 +37,7 @@ public interface LongRunningRecognizeResponseOrBuilder extends
   int getResultsCount();
   /**
    * 
-   * *Output-only* Sequential list of transcription results corresponding to
+   * Output only. Sequential list of transcription results corresponding to
    * sequential portions of audio.
    * 

    *
@@ -47,7 +47,7 @@ public interface LongRunningRecognizeResponseOrBuilder extends
       getResultsOrBuilderList();
   /**
    * 
-   * *Output-only* Sequential list of transcription results corresponding to
+   * Output only. Sequential list of transcription results corresponding to
    * sequential portions of audio.
    * 

    *
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionAudio.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionAudio.java
index fe8d0297742e..67ff3e38427e 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionAudio.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionAudio.java
@@ -8,7 +8,7 @@
  * Contains audio data in the encoding specified in the `RecognitionConfig`.
  * Either `content` or `uri` must be supplied. Supplying both or neither
  * returns [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT]. See
- * [audio limits](https://cloud.google.com/speech/limits#content).
+ * [content limits](/speech-to-text/quotas#content).
  * 
  *
  * Protobuf type {@code google.cloud.speech.v1.RecognitionAudio}
@@ -35,9 +35,6 @@ private RecognitionAudio(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private RecognitionAudio(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             audioSourceCase_ = 1;
             audioSource_ = input.readBytes();
@@ -60,13 +64,6 @@ private RecognitionAudio(
             audioSource_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private RecognitionAudio(
     return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_RecognitionAudio_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_RecognitionAudio_fieldAccessorTable
@@ -151,7 +147,8 @@ public com.google.protobuf.ByteString getContent() {
   /**
    * 
    * URI that points to a file that contains audio data bytes as specified in
-   * `RecognitionConfig`. Currently, only Google Cloud Storage URIs are
+   * `RecognitionConfig`. The file must not be compressed (for example, gzip).
+   * Currently, only Google Cloud Storage URIs are
    * supported, which must be specified in the following format:
    * `gs://bucket_name/object_name` (other URI formats return
    * [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT]). For more information, see
@@ -180,7 +177,8 @@ public java.lang.String getUri() {
   /**
    * 
    * URI that points to a file that contains audio data bytes as specified in
-   * `RecognitionConfig`. Currently, only Google Cloud Storage URIs are
+   * `RecognitionConfig`. The file must not be compressed (for example, gzip).
+   * Currently, only Google Cloud Storage URIs are
    * supported, which must be specified in the following format:
    * `gs://bucket_name/object_name` (other URI formats return
    * [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT]). For more information, see
@@ -209,7 +207,6 @@ public java.lang.String getUri() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -219,7 +216,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (audioSourceCase_ == 1) {
@@ -232,7 +228,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -375,7 +370,6 @@ public static com.google.cloud.speech.v1.RecognitionAudio parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -383,7 +377,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.speech.v1.RecognitionAudio prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -400,7 +393,7 @@ protected Builder newBuilderForType(
    * Contains audio data in the encoding specified in the `RecognitionConfig`.
    * Either `content` or `uri` must be supplied. Supplying both or neither
    * returns [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT]. See
-   * [audio limits](https://cloud.google.com/speech/limits#content).
+   * [content limits](/speech-to-text/quotas#content).
    * 

    *
    * Protobuf type {@code google.cloud.speech.v1.RecognitionAudio}
@@ -414,7 +407,6 @@ public static final class Builder extends
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_RecognitionAudio_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_RecognitionAudio_fieldAccessorTable
@@ -437,7 +429,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       audioSourceCase_ = 0;
@@ -445,18 +436,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_RecognitionAudio_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.RecognitionAudio getDefaultInstanceForType() {
       return com.google.cloud.speech.v1.RecognitionAudio.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.RecognitionAudio build() {
       com.google.cloud.speech.v1.RecognitionAudio result = buildPartial();
       if (!result.isInitialized()) {
@@ -465,7 +453,6 @@ public com.google.cloud.speech.v1.RecognitionAudio build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.RecognitionAudio buildPartial() {
       com.google.cloud.speech.v1.RecognitionAudio result = new com.google.cloud.speech.v1.RecognitionAudio(this);
       if (audioSourceCase_ == 1) {
@@ -479,39 +466,32 @@ public com.google.cloud.speech.v1.RecognitionAudio buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.speech.v1.RecognitionAudio) {
         return mergeFrom((com.google.cloud.speech.v1.RecognitionAudio)other);
@@ -543,12 +523,10 @@ public Builder mergeFrom(com.google.cloud.speech.v1.RecognitionAudio other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -636,7 +614,8 @@ public Builder clearContent() {
     /**
      * 
      * URI that points to a file that contains audio data bytes as specified in
-     * `RecognitionConfig`. Currently, only Google Cloud Storage URIs are
+     * `RecognitionConfig`. The file must not be compressed (for example, gzip).
+     * Currently, only Google Cloud Storage URIs are
      * supported, which must be specified in the following format:
      * `gs://bucket_name/object_name` (other URI formats return
      * [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT]). For more information, see
@@ -665,7 +644,8 @@ public java.lang.String getUri() {
     /**
      * 
      * URI that points to a file that contains audio data bytes as specified in
-     * `RecognitionConfig`. Currently, only Google Cloud Storage URIs are
+     * `RecognitionConfig`. The file must not be compressed (for example, gzip).
+     * Currently, only Google Cloud Storage URIs are
      * supported, which must be specified in the following format:
      * `gs://bucket_name/object_name` (other URI formats return
      * [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT]). For more information, see
@@ -695,7 +675,8 @@ public java.lang.String getUri() {
     /**
      * 
      * URI that points to a file that contains audio data bytes as specified in
-     * `RecognitionConfig`. Currently, only Google Cloud Storage URIs are
+     * `RecognitionConfig`. The file must not be compressed (for example, gzip).
+     * Currently, only Google Cloud Storage URIs are
      * supported, which must be specified in the following format:
      * `gs://bucket_name/object_name` (other URI formats return
      * [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT]). For more information, see
@@ -717,7 +698,8 @@ public Builder setUri(
     /**
      * 
      * URI that points to a file that contains audio data bytes as specified in
-     * `RecognitionConfig`. Currently, only Google Cloud Storage URIs are
+     * `RecognitionConfig`. The file must not be compressed (for example, gzip).
+     * Currently, only Google Cloud Storage URIs are
      * supported, which must be specified in the following format:
      * `gs://bucket_name/object_name` (other URI formats return
      * [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT]). For more information, see
@@ -737,7 +719,8 @@ public Builder clearUri() {
     /**
      * 
      * URI that points to a file that contains audio data bytes as specified in
-     * `RecognitionConfig`. Currently, only Google Cloud Storage URIs are
+     * `RecognitionConfig`. The file must not be compressed (for example, gzip).
+     * Currently, only Google Cloud Storage URIs are
      * supported, which must be specified in the following format:
      * `gs://bucket_name/object_name` (other URI formats return
      * [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT]). For more information, see
@@ -757,13 +740,11 @@ public Builder setUriBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -785,12 +766,11 @@ public static com.google.cloud.speech.v1.RecognitionAudio getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RecognitionAudio parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RecognitionAudio(input, extensionRegistry);
+        return new RecognitionAudio(input, extensionRegistry);
     }
   };
 
@@ -803,7 +783,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.speech.v1.RecognitionAudio getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionAudioOrBuilder.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionAudioOrBuilder.java
index 998214d33464..1ac83eda51e7 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionAudioOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionAudioOrBuilder.java
@@ -21,7 +21,8 @@ public interface RecognitionAudioOrBuilder extends
   /**
    * 
    * URI that points to a file that contains audio data bytes as specified in
-   * `RecognitionConfig`. Currently, only Google Cloud Storage URIs are
+   * `RecognitionConfig`. The file must not be compressed (for example, gzip).
+   * Currently, only Google Cloud Storage URIs are
    * supported, which must be specified in the following format:
    * `gs://bucket_name/object_name` (other URI formats return
    * [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT]). For more information, see
@@ -34,7 +35,8 @@ public interface RecognitionAudioOrBuilder extends
   /**
    * 
    * URI that points to a file that contains audio data bytes as specified in
-   * `RecognitionConfig`. Currently, only Google Cloud Storage URIs are
+   * `RecognitionConfig`. The file must not be compressed (for example, gzip).
+   * Currently, only Google Cloud Storage URIs are
    * supported, which must be specified in the following format:
    * `gs://bucket_name/object_name` (other URI formats return
    * [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT]). For more information, see
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionConfig.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionConfig.java
index ac1f4a929810..047fdeb8f594 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionConfig.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionConfig.java
@@ -28,6 +28,9 @@ private RecognitionConfig() {
     profanityFilter_ = false;
     speechContexts_ = java.util.Collections.emptyList();
     enableWordTimeOffsets_ = false;
+    enableAutomaticPunctuation_ = false;
+    model_ = "";
+    useEnhanced_ = false;
   }
 
   @java.lang.Override
@@ -40,9 +43,6 @@ private RecognitionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -54,6 +54,13 @@ private RecognitionConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -95,11 +102,20 @@ private RecognitionConfig(
             enableWordTimeOffsets_ = input.readBool();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
+          case 88: {
+
+            enableAutomaticPunctuation_ = input.readBool();
+            break;
+          }
+          case 106: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            model_ = s;
+            break;
+          }
+          case 112: {
+
+            useEnhanced_ = input.readBool();
             break;
           }
         }
@@ -122,7 +138,6 @@ private RecognitionConfig(
     return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_RecognitionConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_RecognitionConfig_fieldAccessorTable
@@ -132,15 +147,23 @@ private RecognitionConfig(
 
   /**
    * 
-   * Audio encoding of the data sent in the audio message. All encodings support
-   * only 1 channel (mono) audio. Only `FLAC` and `WAV` include a header that
-   * describes the bytes of audio that follow the header. The other encodings
-   * are raw audio bytes with no header.
+   * The encoding of the audio data sent in the request.
+   * All encodings support only 1 channel (mono) audio.
    * For best results, the audio source should be captured and transmitted using
-   * a lossless encoding (`FLAC` or `LINEAR16`). Recognition accuracy may be
-   * reduced if lossy codecs, which include the other codecs listed in
-   * this section, are used to capture or transmit the audio, particularly if
-   * background noise is present.
+   * a lossless encoding (`FLAC` or `LINEAR16`). The accuracy of the speech
+   * recognition can be reduced if lossy codecs are used to capture or transmit
+   * audio, particularly if background noise is present. Lossy codecs include
+   * `MULAW`, `AMR`, `AMR_WB`, `OGG_OPUS`, and `SPEEX_WITH_HEADER_BYTE`.
+   * The `FLAC` and `WAV` audio file formats include a header that describes the
+   * included audio content. You can request recognition for `WAV` files that
+   * contain either `LINEAR16` or `MULAW` encoded audio.
+   * If you send `FLAC` or `WAV` audio file format in
+   * your request, you do not need to specify an `AudioEncoding`; the audio
+   * encoding format is determined from the file header. If you specify
+   * an `AudioEncoding` when you send  send `FLAC` or `WAV` audio, the
+   * encoding configuration must match the encoding described in the audio
+   * header; otherwise the request returns an
+   * [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT] error code.
    * 

    *
    * Protobuf enum {@code google.cloud.speech.v1.RecognitionConfig.AudioEncoding}
@@ -149,7 +172,7 @@ public enum AudioEncoding
       implements com.google.protobuf.ProtocolMessageEnum {
     /**
      * 
-     * Not specified. Will return result [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT].
+     * Not specified.
      * 

      *
      * ENCODING_UNSPECIFIED = 0;
@@ -165,7 +188,7 @@ public enum AudioEncoding
     LINEAR16(1),
     /**
      * 
-     * [`FLAC`](https://xiph.org/flac/documentation.html) (Free Lossless Audio
+     * `FLAC` (Free Lossless Audio
      * Codec) is the recommended encoding because it is
      * lossless--therefore recognition is not compromised--and
      * requires only about half the bandwidth of `LINEAR16`. `FLAC` stream
@@ -204,7 +227,7 @@ public enum AudioEncoding
      * 
      * Opus encoded audio frames in Ogg container
      * ([OggOpus](https://wiki.xiph.org/OggOpus)).
-     * `sample_rate_hertz` must be 16000.
+     * `sample_rate_hertz` must be one of 8000, 12000, 16000, 24000, or 48000.
      * 

      *
      * OGG_OPUS = 6;
@@ -235,7 +258,7 @@ public enum AudioEncoding
 
     /**
      * 
-     * Not specified. Will return result [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT].
+     * Not specified.
      * 

      *
      * ENCODING_UNSPECIFIED = 0;
@@ -251,7 +274,7 @@ public enum AudioEncoding
     public static final int LINEAR16_VALUE = 1;
     /**
      * 
-     * [`FLAC`](https://xiph.org/flac/documentation.html) (Free Lossless Audio
+     * `FLAC` (Free Lossless Audio
      * Codec) is the recommended encoding because it is
      * lossless--therefore recognition is not compromised--and
      * requires only about half the bandwidth of `LINEAR16`. `FLAC` stream
@@ -290,7 +313,7 @@ public enum AudioEncoding
      * 
      * Opus encoded audio frames in Ogg container
      * ([OggOpus](https://wiki.xiph.org/OggOpus)).
-     * `sample_rate_hertz` must be 16000.
+     * `sample_rate_hertz` must be one of 8000, 12000, 16000, 24000, or 48000.
      * 

      *
      * OGG_OPUS = 6;
@@ -401,7 +424,9 @@ private AudioEncoding(int value) {
   private int encoding_;
   /**
    * 
-   * *Required* Encoding of audio data sent in all `RecognitionAudio` messages.
+   * Encoding of audio data sent in all `RecognitionAudio` messages.
+   * This field is optional for `FLAC` and `WAV` audio files and required
+   * for all other audio formats. For details, see [AudioEncoding][google.cloud.speech.v1.RecognitionConfig.AudioEncoding].
    * 

    *
    * .google.cloud.speech.v1.RecognitionConfig.AudioEncoding encoding = 1;
@@ -411,13 +436,14 @@ public int getEncodingValue() {
   }
   /**
    * 
-   * *Required* Encoding of audio data sent in all `RecognitionAudio` messages.
+   * Encoding of audio data sent in all `RecognitionAudio` messages.
+   * This field is optional for `FLAC` and `WAV` audio files and required
+   * for all other audio formats. For details, see [AudioEncoding][google.cloud.speech.v1.RecognitionConfig.AudioEncoding].
    * 

    *
    * .google.cloud.speech.v1.RecognitionConfig.AudioEncoding encoding = 1;
    */
   public com.google.cloud.speech.v1.RecognitionConfig.AudioEncoding getEncoding() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.speech.v1.RecognitionConfig.AudioEncoding result = com.google.cloud.speech.v1.RecognitionConfig.AudioEncoding.valueOf(encoding_);
     return result == null ? com.google.cloud.speech.v1.RecognitionConfig.AudioEncoding.UNRECOGNIZED : result;
   }
@@ -426,11 +452,13 @@ public com.google.cloud.speech.v1.RecognitionConfig.AudioEncoding getEncoding()
   private int sampleRateHertz_;
   /**
    * 
-   * *Required* Sample rate in Hertz of the audio data sent in all
+   * Sample rate in Hertz of the audio data sent in all
    * `RecognitionAudio` messages. Valid values are: 8000-48000.
    * 16000 is optimal. For best results, set the sampling rate of the audio
    * source to 16000 Hz. If that's not possible, use the native sample rate of
    * the audio source (instead of re-sampling).
+   * This field is optional for `FLAC` and `WAV` audio files and required
+   * for all other audio formats. For details, see [AudioEncoding][google.cloud.speech.v1.RecognitionConfig.AudioEncoding].
    * 

    *
    * int32 sample_rate_hertz = 2;
@@ -446,7 +474,7 @@ public int getSampleRateHertz() {
    * *Required* The language of the supplied audio as a
    * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag.
    * Example: "en-US".
-   * See [Language Support](https://cloud.google.com/speech/docs/languages)
+   * See [Language Support](/speech-to-text/docs/languages)
    * for a list of the currently supported language codes.
    * 

    *
@@ -469,7 +497,7 @@ public java.lang.String getLanguageCode() {
    * *Required* The language of the supplied audio as a
    * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag.
    * Example: "en-US".
-   * See [Language Support](https://cloud.google.com/speech/docs/languages)
+   * See [Language Support](/speech-to-text/docs/languages)
    * for a list of the currently supported language codes.
    * 

    *
@@ -527,7 +555,9 @@ public boolean getProfanityFilter() {
   private java.util.List speechContexts_;
   /**
    * 
-   * *Optional* A means to provide context to assist the speech recognition.
+   * *Optional* array of [SpeechContext][google.cloud.speech.v1.SpeechContext].
+   * A means to provide context to assist the speech recognition. For more
+   * information, see [Phrase Hints](/speech-to-text/docs/basics#phrase-hints).
    * 

    *
    * repeated .google.cloud.speech.v1.SpeechContext speech_contexts = 6;
@@ -537,7 +567,9 @@ public java.util.List getSpeechContext
   }
   /**
    * 
-   * *Optional* A means to provide context to assist the speech recognition.
+   * *Optional* array of [SpeechContext][google.cloud.speech.v1.SpeechContext].
+   * A means to provide context to assist the speech recognition. For more
+   * information, see [Phrase Hints](/speech-to-text/docs/basics#phrase-hints).
    * 

    *
    * repeated .google.cloud.speech.v1.SpeechContext speech_contexts = 6;
@@ -548,7 +580,9 @@ public java.util.List getSpeechContext
   }
   /**
    * 
-   * *Optional* A means to provide context to assist the speech recognition.
+   * *Optional* array of [SpeechContext][google.cloud.speech.v1.SpeechContext].
+   * A means to provide context to assist the speech recognition. For more
+   * information, see [Phrase Hints](/speech-to-text/docs/basics#phrase-hints).
    * 

    *
    * repeated .google.cloud.speech.v1.SpeechContext speech_contexts = 6;
@@ -558,7 +592,9 @@ public int getSpeechContextsCount() {
   }
   /**
    * 
-   * *Optional* A means to provide context to assist the speech recognition.
+   * *Optional* array of [SpeechContext][google.cloud.speech.v1.SpeechContext].
+   * A means to provide context to assist the speech recognition. For more
+   * information, see [Phrase Hints](/speech-to-text/docs/basics#phrase-hints).
    * 

    *
    * repeated .google.cloud.speech.v1.SpeechContext speech_contexts = 6;
@@ -568,7 +604,9 @@ public com.google.cloud.speech.v1.SpeechContext getSpeechContexts(int index) {
   }
   /**
    * 
-   * *Optional* A means to provide context to assist the speech recognition.
+   * *Optional* array of [SpeechContext][google.cloud.speech.v1.SpeechContext].
+   * A means to provide context to assist the speech recognition. For more
+   * information, see [Phrase Hints](/speech-to-text/docs/basics#phrase-hints).
    * 

    *
    * repeated .google.cloud.speech.v1.SpeechContext speech_contexts = 6;
@@ -594,8 +632,152 @@ public boolean getEnableWordTimeOffsets() {
     return enableWordTimeOffsets_;
   }
 
+  public static final int ENABLE_AUTOMATIC_PUNCTUATION_FIELD_NUMBER = 11;
+  private boolean enableAutomaticPunctuation_;
+  /**
+   * 
+   * *Optional* If 'true', adds punctuation to recognition result hypotheses.
+   * This feature is only available in select languages. Setting this for
+   * requests in other languages has no effect at all.
+   * The default 'false' value does not add punctuation to result hypotheses.
+   * Note: This is currently offered as an experimental service, complimentary
+   * to all users. In the future this may be exclusively available as a
+   * premium feature.
+   * 

+   *
+   * bool enable_automatic_punctuation = 11;
+   */
+  public boolean getEnableAutomaticPunctuation() {
+    return enableAutomaticPunctuation_;
+  }
+
+  public static final int MODEL_FIELD_NUMBER = 13;
+  private volatile java.lang.Object model_;
+  /**
+   * 
+   * *Optional* Which model to select for the given request. Select the model
+   * best suited to your domain to get best results. If a model is not
+   * explicitly specified, then we auto-select a model based on the parameters
+   * in the RecognitionConfig.
+   * <table>
+   *   <tr>
+   *     <td><b>Model</b></td>
+   *     <td><b>Description</b></td>
+   *   </tr>
+   *   <tr>
+   *     <td><code>command_and_search</code></td>
+   *     <td>Best for short queries such as voice commands or voice search.</td>
+   *   </tr>
+   *   <tr>
+   *     <td><code>phone_call</code></td>
+   *     <td>Best for audio that originated from a phone call (typically
+   *     recorded at an 8khz sampling rate).</td>
+   *   </tr>
+   *   <tr>
+   *     <td><code>video</code></td>
+   *     <td>Best for audio that originated from from video or includes multiple
+   *         speakers. Ideally the audio is recorded at a 16khz or greater
+   *         sampling rate. This is a premium model that costs more than the
+   *         standard rate.</td>
+   *   </tr>
+   *   <tr>
+   *     <td><code>default</code></td>
+   *     <td>Best for audio that is not one of the specific audio models.
+   *         For example, long-form audio. Ideally the audio is high-fidelity,
+   *         recorded at a 16khz or greater sampling rate.</td>
+   *   </tr>
+   * </table>
+   * 

+   *
+   * string model = 13;
+   */
+  public java.lang.String getModel() {
+    java.lang.Object ref = model_;
+    if (ref instanceof java.lang.String) {
+      return (java.lang.String) ref;
+    } else {
+      com.google.protobuf.ByteString bs = 
+          (com.google.protobuf.ByteString) ref;
+      java.lang.String s = bs.toStringUtf8();
+      model_ = s;
+      return s;
+    }
+  }
+  /**
+   * 
+   * *Optional* Which model to select for the given request. Select the model
+   * best suited to your domain to get best results. If a model is not
+   * explicitly specified, then we auto-select a model based on the parameters
+   * in the RecognitionConfig.
+   * <table>
+   *   <tr>
+   *     <td><b>Model</b></td>
+   *     <td><b>Description</b></td>
+   *   </tr>
+   *   <tr>
+   *     <td><code>command_and_search</code></td>
+   *     <td>Best for short queries such as voice commands or voice search.</td>
+   *   </tr>
+   *   <tr>
+   *     <td><code>phone_call</code></td>
+   *     <td>Best for audio that originated from a phone call (typically
+   *     recorded at an 8khz sampling rate).</td>
+   *   </tr>
+   *   <tr>
+   *     <td><code>video</code></td>
+   *     <td>Best for audio that originated from from video or includes multiple
+   *         speakers. Ideally the audio is recorded at a 16khz or greater
+   *         sampling rate. This is a premium model that costs more than the
+   *         standard rate.</td>
+   *   </tr>
+   *   <tr>
+   *     <td><code>default</code></td>
+   *     <td>Best for audio that is not one of the specific audio models.
+   *         For example, long-form audio. Ideally the audio is high-fidelity,
+   *         recorded at a 16khz or greater sampling rate.</td>
+   *   </tr>
+   * </table>
+   * 

+   *
+   * string model = 13;
+   */
+  public com.google.protobuf.ByteString
+      getModelBytes() {
+    java.lang.Object ref = model_;
+    if (ref instanceof java.lang.String) {
+      com.google.protobuf.ByteString b = 
+          com.google.protobuf.ByteString.copyFromUtf8(
+              (java.lang.String) ref);
+      model_ = b;
+      return b;
+    } else {
+      return (com.google.protobuf.ByteString) ref;
+    }
+  }
+
+  public static final int USE_ENHANCED_FIELD_NUMBER = 14;
+  private boolean useEnhanced_;
+  /**
+   * 
+   * *Optional* Set to true to use an enhanced model for speech recognition.
+   * You must also set the `model` field to a valid, enhanced model. If
+   * `use_enhanced` is set to true and the `model` field is not set, then
+   * `use_enhanced` is ignored. If `use_enhanced` is true and an enhanced
+   * version of the specified model does not exist, then the speech is
+   * recognized using the standard version of the specified model.
+   * Enhanced speech models require that you opt-in to data logging using
+   * instructions in the [documentation](/speech-to-text/enable-data-logging).
+   * If you set `use_enhanced` to true and you have not enabled audio logging,
+   * then you will receive an error.
+   * 

+   *
+   * bool use_enhanced = 14;
+   */
+  public boolean getUseEnhanced() {
+    return useEnhanced_;
+  }
+
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -605,7 +787,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (encoding_ != com.google.cloud.speech.v1.RecognitionConfig.AudioEncoding.ENCODING_UNSPECIFIED.getNumber()) {
@@ -629,10 +810,18 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     if (enableWordTimeOffsets_ != false) {
       output.writeBool(8, enableWordTimeOffsets_);
     }
+    if (enableAutomaticPunctuation_ != false) {
+      output.writeBool(11, enableAutomaticPunctuation_);
+    }
+    if (!getModelBytes().isEmpty()) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 13, model_);
+    }
+    if (useEnhanced_ != false) {
+      output.writeBool(14, useEnhanced_);
+    }
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -665,6 +854,17 @@ public int getSerializedSize() {
       size += com.google.protobuf.CodedOutputStream
         .computeBoolSize(8, enableWordTimeOffsets_);
     }
+    if (enableAutomaticPunctuation_ != false) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeBoolSize(11, enableAutomaticPunctuation_);
+    }
+    if (!getModelBytes().isEmpty()) {
+      size += com.google.protobuf.GeneratedMessageV3.computeStringSize(13, model_);
+    }
+    if (useEnhanced_ != false) {
+      size += com.google.protobuf.CodedOutputStream
+        .computeBoolSize(14, useEnhanced_);
+    }
     size += unknownFields.getSerializedSize();
     memoizedSize = size;
     return size;
@@ -694,6 +894,12 @@ public boolean equals(final java.lang.Object obj) {
         .equals(other.getSpeechContextsList());
     result = result && (getEnableWordTimeOffsets()
         == other.getEnableWordTimeOffsets());
+    result = result && (getEnableAutomaticPunctuation()
+        == other.getEnableAutomaticPunctuation());
+    result = result && getModel()
+        .equals(other.getModel());
+    result = result && (getUseEnhanced()
+        == other.getUseEnhanced());
     result = result && unknownFields.equals(other.unknownFields);
     return result;
   }
@@ -723,6 +929,14 @@ public int hashCode() {
     hash = (37 * hash) + ENABLE_WORD_TIME_OFFSETS_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
         getEnableWordTimeOffsets());
+    hash = (37 * hash) + ENABLE_AUTOMATIC_PUNCTUATION_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+        getEnableAutomaticPunctuation());
+    hash = (37 * hash) + MODEL_FIELD_NUMBER;
+    hash = (53 * hash) + getModel().hashCode();
+    hash = (37 * hash) + USE_ENHANCED_FIELD_NUMBER;
+    hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(
+        getUseEnhanced());
     hash = (29 * hash) + unknownFields.hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -798,7 +1012,6 @@ public static com.google.cloud.speech.v1.RecognitionConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -806,7 +1019,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.speech.v1.RecognitionConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -835,7 +1047,6 @@ public static final class Builder extends
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_RecognitionConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_RecognitionConfig_fieldAccessorTable
@@ -859,7 +1070,6 @@ private void maybeForceBuilderInitialization() {
         getSpeechContextsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       encoding_ = 0;
@@ -880,21 +1090,24 @@ public Builder clear() {
       }
       enableWordTimeOffsets_ = false;
 
+      enableAutomaticPunctuation_ = false;
+
+      model_ = "";
+
+      useEnhanced_ = false;
+
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_RecognitionConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.RecognitionConfig getDefaultInstanceForType() {
       return com.google.cloud.speech.v1.RecognitionConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.RecognitionConfig build() {
       com.google.cloud.speech.v1.RecognitionConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -903,7 +1116,6 @@ public com.google.cloud.speech.v1.RecognitionConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.RecognitionConfig buildPartial() {
       com.google.cloud.speech.v1.RecognitionConfig result = new com.google.cloud.speech.v1.RecognitionConfig(this);
       int from_bitField0_ = bitField0_;
@@ -923,44 +1135,40 @@ public com.google.cloud.speech.v1.RecognitionConfig buildPartial() {
         result.speechContexts_ = speechContextsBuilder_.build();
       }
       result.enableWordTimeOffsets_ = enableWordTimeOffsets_;
+      result.enableAutomaticPunctuation_ = enableAutomaticPunctuation_;
+      result.model_ = model_;
+      result.useEnhanced_ = useEnhanced_;
       result.bitField0_ = to_bitField0_;
       onBuilt();
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.speech.v1.RecognitionConfig) {
         return mergeFrom((com.google.cloud.speech.v1.RecognitionConfig)other);
@@ -1017,17 +1225,25 @@ public Builder mergeFrom(com.google.cloud.speech.v1.RecognitionConfig other) {
       if (other.getEnableWordTimeOffsets() != false) {
         setEnableWordTimeOffsets(other.getEnableWordTimeOffsets());
       }
+      if (other.getEnableAutomaticPunctuation() != false) {
+        setEnableAutomaticPunctuation(other.getEnableAutomaticPunctuation());
+      }
+      if (!other.getModel().isEmpty()) {
+        model_ = other.model_;
+        onChanged();
+      }
+      if (other.getUseEnhanced() != false) {
+        setUseEnhanced(other.getUseEnhanced());
+      }
       this.mergeUnknownFields(other.unknownFields);
       onChanged();
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1050,7 +1266,9 @@ public Builder mergeFrom(
     private int encoding_ = 0;
     /**
      * 
-     * *Required* Encoding of audio data sent in all `RecognitionAudio` messages.
+     * Encoding of audio data sent in all `RecognitionAudio` messages.
+     * This field is optional for `FLAC` and `WAV` audio files and required
+     * for all other audio formats. For details, see [AudioEncoding][google.cloud.speech.v1.RecognitionConfig.AudioEncoding].
      * 

      *
      * .google.cloud.speech.v1.RecognitionConfig.AudioEncoding encoding = 1;
@@ -1060,7 +1278,9 @@ public int getEncodingValue() {
     }
     /**
      * 
-     * *Required* Encoding of audio data sent in all `RecognitionAudio` messages.
+     * Encoding of audio data sent in all `RecognitionAudio` messages.
+     * This field is optional for `FLAC` and `WAV` audio files and required
+     * for all other audio formats. For details, see [AudioEncoding][google.cloud.speech.v1.RecognitionConfig.AudioEncoding].
      * 

      *
      * .google.cloud.speech.v1.RecognitionConfig.AudioEncoding encoding = 1;
@@ -1072,19 +1292,22 @@ public Builder setEncodingValue(int value) {
     }
     /**
      * 
-     * *Required* Encoding of audio data sent in all `RecognitionAudio` messages.
+     * Encoding of audio data sent in all `RecognitionAudio` messages.
+     * This field is optional for `FLAC` and `WAV` audio files and required
+     * for all other audio formats. For details, see [AudioEncoding][google.cloud.speech.v1.RecognitionConfig.AudioEncoding].
      * 

      *
      * .google.cloud.speech.v1.RecognitionConfig.AudioEncoding encoding = 1;
      */
     public com.google.cloud.speech.v1.RecognitionConfig.AudioEncoding getEncoding() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.speech.v1.RecognitionConfig.AudioEncoding result = com.google.cloud.speech.v1.RecognitionConfig.AudioEncoding.valueOf(encoding_);
       return result == null ? com.google.cloud.speech.v1.RecognitionConfig.AudioEncoding.UNRECOGNIZED : result;
     }
     /**
      * 
-     * *Required* Encoding of audio data sent in all `RecognitionAudio` messages.
+     * Encoding of audio data sent in all `RecognitionAudio` messages.
+     * This field is optional for `FLAC` and `WAV` audio files and required
+     * for all other audio formats. For details, see [AudioEncoding][google.cloud.speech.v1.RecognitionConfig.AudioEncoding].
      * 

      *
      * .google.cloud.speech.v1.RecognitionConfig.AudioEncoding encoding = 1;
@@ -1100,7 +1323,9 @@ public Builder setEncoding(com.google.cloud.speech.v1.RecognitionConfig.AudioEnc
     }
     /**
      * 
-     * *Required* Encoding of audio data sent in all `RecognitionAudio` messages.
+     * Encoding of audio data sent in all `RecognitionAudio` messages.
+     * This field is optional for `FLAC` and `WAV` audio files and required
+     * for all other audio formats. For details, see [AudioEncoding][google.cloud.speech.v1.RecognitionConfig.AudioEncoding].
      * 

      *
      * .google.cloud.speech.v1.RecognitionConfig.AudioEncoding encoding = 1;
@@ -1115,11 +1340,13 @@ public Builder clearEncoding() {
     private int sampleRateHertz_ ;
     /**
      * 
-     * *Required* Sample rate in Hertz of the audio data sent in all
+     * Sample rate in Hertz of the audio data sent in all
      * `RecognitionAudio` messages. Valid values are: 8000-48000.
      * 16000 is optimal. For best results, set the sampling rate of the audio
      * source to 16000 Hz. If that's not possible, use the native sample rate of
      * the audio source (instead of re-sampling).
+     * This field is optional for `FLAC` and `WAV` audio files and required
+     * for all other audio formats. For details, see [AudioEncoding][google.cloud.speech.v1.RecognitionConfig.AudioEncoding].
      * 

      *
      * int32 sample_rate_hertz = 2;
@@ -1129,11 +1356,13 @@ public int getSampleRateHertz() {
     }
     /**
      * 
-     * *Required* Sample rate in Hertz of the audio data sent in all
+     * Sample rate in Hertz of the audio data sent in all
      * `RecognitionAudio` messages. Valid values are: 8000-48000.
      * 16000 is optimal. For best results, set the sampling rate of the audio
      * source to 16000 Hz. If that's not possible, use the native sample rate of
      * the audio source (instead of re-sampling).
+     * This field is optional for `FLAC` and `WAV` audio files and required
+     * for all other audio formats. For details, see [AudioEncoding][google.cloud.speech.v1.RecognitionConfig.AudioEncoding].
      * 

      *
      * int32 sample_rate_hertz = 2;
@@ -1146,11 +1375,13 @@ public Builder setSampleRateHertz(int value) {
     }
     /**
      * 
-     * *Required* Sample rate in Hertz of the audio data sent in all
+     * Sample rate in Hertz of the audio data sent in all
      * `RecognitionAudio` messages. Valid values are: 8000-48000.
      * 16000 is optimal. For best results, set the sampling rate of the audio
      * source to 16000 Hz. If that's not possible, use the native sample rate of
      * the audio source (instead of re-sampling).
+     * This field is optional for `FLAC` and `WAV` audio files and required
+     * for all other audio formats. For details, see [AudioEncoding][google.cloud.speech.v1.RecognitionConfig.AudioEncoding].
      * 

      *
      * int32 sample_rate_hertz = 2;
@@ -1168,7 +1399,7 @@ public Builder clearSampleRateHertz() {
      * *Required* The language of the supplied audio as a
      * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag.
      * Example: "en-US".
-     * See [Language Support](https://cloud.google.com/speech/docs/languages)
+     * See [Language Support](/speech-to-text/docs/languages)
      * for a list of the currently supported language codes.
      * 

      *
@@ -1191,7 +1422,7 @@ public java.lang.String getLanguageCode() {
      * *Required* The language of the supplied audio as a
      * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag.
      * Example: "en-US".
-     * See [Language Support](https://cloud.google.com/speech/docs/languages)
+     * See [Language Support](/speech-to-text/docs/languages)
      * for a list of the currently supported language codes.
      * 

      *
@@ -1215,7 +1446,7 @@ public java.lang.String getLanguageCode() {
      * *Required* The language of the supplied audio as a
      * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag.
      * Example: "en-US".
-     * See [Language Support](https://cloud.google.com/speech/docs/languages)
+     * See [Language Support](/speech-to-text/docs/languages)
      * for a list of the currently supported language codes.
      * 

      *
@@ -1236,7 +1467,7 @@ public Builder setLanguageCode(
      * *Required* The language of the supplied audio as a
      * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag.
      * Example: "en-US".
-     * See [Language Support](https://cloud.google.com/speech/docs/languages)
+     * See [Language Support](/speech-to-text/docs/languages)
      * for a list of the currently supported language codes.
      * 

      *
@@ -1253,7 +1484,7 @@ public Builder clearLanguageCode() {
      * *Required* The language of the supplied audio as a
      * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag.
      * Example: "en-US".
-     * See [Language Support](https://cloud.google.com/speech/docs/languages)
+     * See [Language Support](/speech-to-text/docs/languages)
      * for a list of the currently supported language codes.
      * 

      *
@@ -1385,7 +1616,9 @@ private void ensureSpeechContextsIsMutable() {
 
     /**
      * 
-     * *Optional* A means to provide context to assist the speech recognition.
+     * *Optional* array of [SpeechContext][google.cloud.speech.v1.SpeechContext].
+     * A means to provide context to assist the speech recognition. For more
+     * information, see [Phrase Hints](/speech-to-text/docs/basics#phrase-hints).
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechContext speech_contexts = 6;
@@ -1399,7 +1632,9 @@ public java.util.List getSpeechContext
     }
     /**
      * 
-     * *Optional* A means to provide context to assist the speech recognition.
+     * *Optional* array of [SpeechContext][google.cloud.speech.v1.SpeechContext].
+     * A means to provide context to assist the speech recognition. For more
+     * information, see [Phrase Hints](/speech-to-text/docs/basics#phrase-hints).
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechContext speech_contexts = 6;
@@ -1413,7 +1648,9 @@ public int getSpeechContextsCount() {
     }
     /**
      * 
-     * *Optional* A means to provide context to assist the speech recognition.
+     * *Optional* array of [SpeechContext][google.cloud.speech.v1.SpeechContext].
+     * A means to provide context to assist the speech recognition. For more
+     * information, see [Phrase Hints](/speech-to-text/docs/basics#phrase-hints).
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechContext speech_contexts = 6;
@@ -1427,7 +1664,9 @@ public com.google.cloud.speech.v1.SpeechContext getSpeechContexts(int index) {
     }
     /**
      * 
-     * *Optional* A means to provide context to assist the speech recognition.
+     * *Optional* array of [SpeechContext][google.cloud.speech.v1.SpeechContext].
+     * A means to provide context to assist the speech recognition. For more
+     * information, see [Phrase Hints](/speech-to-text/docs/basics#phrase-hints).
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechContext speech_contexts = 6;
@@ -1448,7 +1687,9 @@ public Builder setSpeechContexts(
     }
     /**
      * 
-     * *Optional* A means to provide context to assist the speech recognition.
+     * *Optional* array of [SpeechContext][google.cloud.speech.v1.SpeechContext].
+     * A means to provide context to assist the speech recognition. For more
+     * information, see [Phrase Hints](/speech-to-text/docs/basics#phrase-hints).
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechContext speech_contexts = 6;
@@ -1466,7 +1707,9 @@ public Builder setSpeechContexts(
     }
     /**
      * 
-     * *Optional* A means to provide context to assist the speech recognition.
+     * *Optional* array of [SpeechContext][google.cloud.speech.v1.SpeechContext].
+     * A means to provide context to assist the speech recognition. For more
+     * information, see [Phrase Hints](/speech-to-text/docs/basics#phrase-hints).
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechContext speech_contexts = 6;
@@ -1486,7 +1729,9 @@ public Builder addSpeechContexts(com.google.cloud.speech.v1.SpeechContext value)
     }
     /**
      * 
-     * *Optional* A means to provide context to assist the speech recognition.
+     * *Optional* array of [SpeechContext][google.cloud.speech.v1.SpeechContext].
+     * A means to provide context to assist the speech recognition. For more
+     * information, see [Phrase Hints](/speech-to-text/docs/basics#phrase-hints).
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechContext speech_contexts = 6;
@@ -1507,7 +1752,9 @@ public Builder addSpeechContexts(
     }
     /**
      * 
-     * *Optional* A means to provide context to assist the speech recognition.
+     * *Optional* array of [SpeechContext][google.cloud.speech.v1.SpeechContext].
+     * A means to provide context to assist the speech recognition. For more
+     * information, see [Phrase Hints](/speech-to-text/docs/basics#phrase-hints).
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechContext speech_contexts = 6;
@@ -1525,7 +1772,9 @@ public Builder addSpeechContexts(
     }
     /**
      * 
-     * *Optional* A means to provide context to assist the speech recognition.
+     * *Optional* array of [SpeechContext][google.cloud.speech.v1.SpeechContext].
+     * A means to provide context to assist the speech recognition. For more
+     * information, see [Phrase Hints](/speech-to-text/docs/basics#phrase-hints).
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechContext speech_contexts = 6;
@@ -1543,7 +1792,9 @@ public Builder addSpeechContexts(
     }
     /**
      * 
-     * *Optional* A means to provide context to assist the speech recognition.
+     * *Optional* array of [SpeechContext][google.cloud.speech.v1.SpeechContext].
+     * A means to provide context to assist the speech recognition. For more
+     * information, see [Phrase Hints](/speech-to-text/docs/basics#phrase-hints).
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechContext speech_contexts = 6;
@@ -1562,7 +1813,9 @@ public Builder addAllSpeechContexts(
     }
     /**
      * 
-     * *Optional* A means to provide context to assist the speech recognition.
+     * *Optional* array of [SpeechContext][google.cloud.speech.v1.SpeechContext].
+     * A means to provide context to assist the speech recognition. For more
+     * information, see [Phrase Hints](/speech-to-text/docs/basics#phrase-hints).
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechContext speech_contexts = 6;
@@ -1579,7 +1832,9 @@ public Builder clearSpeechContexts() {
     }
     /**
      * 
-     * *Optional* A means to provide context to assist the speech recognition.
+     * *Optional* array of [SpeechContext][google.cloud.speech.v1.SpeechContext].
+     * A means to provide context to assist the speech recognition. For more
+     * information, see [Phrase Hints](/speech-to-text/docs/basics#phrase-hints).
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechContext speech_contexts = 6;
@@ -1596,7 +1851,9 @@ public Builder removeSpeechContexts(int index) {
     }
     /**
      * 
-     * *Optional* A means to provide context to assist the speech recognition.
+     * *Optional* array of [SpeechContext][google.cloud.speech.v1.SpeechContext].
+     * A means to provide context to assist the speech recognition. For more
+     * information, see [Phrase Hints](/speech-to-text/docs/basics#phrase-hints).
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechContext speech_contexts = 6;
@@ -1607,7 +1864,9 @@ public com.google.cloud.speech.v1.SpeechContext.Builder getSpeechContextsBuilder
     }
     /**
      * 
-     * *Optional* A means to provide context to assist the speech recognition.
+     * *Optional* array of [SpeechContext][google.cloud.speech.v1.SpeechContext].
+     * A means to provide context to assist the speech recognition. For more
+     * information, see [Phrase Hints](/speech-to-text/docs/basics#phrase-hints).
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechContext speech_contexts = 6;
@@ -1621,7 +1880,9 @@ public com.google.cloud.speech.v1.SpeechContextOrBuilder getSpeechContextsOrBuil
     }
     /**
      * 
-     * *Optional* A means to provide context to assist the speech recognition.
+     * *Optional* array of [SpeechContext][google.cloud.speech.v1.SpeechContext].
+     * A means to provide context to assist the speech recognition. For more
+     * information, see [Phrase Hints](/speech-to-text/docs/basics#phrase-hints).
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechContext speech_contexts = 6;
@@ -1636,7 +1897,9 @@ public com.google.cloud.speech.v1.SpeechContextOrBuilder getSpeechContextsOrBuil
     }
     /**
      * 
-     * *Optional* A means to provide context to assist the speech recognition.
+     * *Optional* array of [SpeechContext][google.cloud.speech.v1.SpeechContext].
+     * A means to provide context to assist the speech recognition. For more
+     * information, see [Phrase Hints](/speech-to-text/docs/basics#phrase-hints).
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechContext speech_contexts = 6;
@@ -1647,7 +1910,9 @@ public com.google.cloud.speech.v1.SpeechContext.Builder addSpeechContextsBuilder
     }
     /**
      * 
-     * *Optional* A means to provide context to assist the speech recognition.
+     * *Optional* array of [SpeechContext][google.cloud.speech.v1.SpeechContext].
+     * A means to provide context to assist the speech recognition. For more
+     * information, see [Phrase Hints](/speech-to-text/docs/basics#phrase-hints).
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechContext speech_contexts = 6;
@@ -1659,7 +1924,9 @@ public com.google.cloud.speech.v1.SpeechContext.Builder addSpeechContextsBuilder
     }
     /**
      * 
-     * *Optional* A means to provide context to assist the speech recognition.
+     * *Optional* array of [SpeechContext][google.cloud.speech.v1.SpeechContext].
+     * A means to provide context to assist the speech recognition. For more
+     * information, see [Phrase Hints](/speech-to-text/docs/basics#phrase-hints).
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechContext speech_contexts = 6;
@@ -1729,13 +1996,376 @@ public Builder clearEnableWordTimeOffsets() {
       onChanged();
       return this;
     }
-    @java.lang.Override
+
+    private boolean enableAutomaticPunctuation_ ;
+    /**
+     * 
+     * *Optional* If 'true', adds punctuation to recognition result hypotheses.
+     * This feature is only available in select languages. Setting this for
+     * requests in other languages has no effect at all.
+     * The default 'false' value does not add punctuation to result hypotheses.
+     * Note: This is currently offered as an experimental service, complimentary
+     * to all users. In the future this may be exclusively available as a
+     * premium feature.
+     * 

+     *
+     * bool enable_automatic_punctuation = 11;
+     */
+    public boolean getEnableAutomaticPunctuation() {
+      return enableAutomaticPunctuation_;
+    }
+    /**
+     * 
+     * *Optional* If 'true', adds punctuation to recognition result hypotheses.
+     * This feature is only available in select languages. Setting this for
+     * requests in other languages has no effect at all.
+     * The default 'false' value does not add punctuation to result hypotheses.
+     * Note: This is currently offered as an experimental service, complimentary
+     * to all users. In the future this may be exclusively available as a
+     * premium feature.
+     * 

+     *
+     * bool enable_automatic_punctuation = 11;
+     */
+    public Builder setEnableAutomaticPunctuation(boolean value) {
+      
+      enableAutomaticPunctuation_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * *Optional* If 'true', adds punctuation to recognition result hypotheses.
+     * This feature is only available in select languages. Setting this for
+     * requests in other languages has no effect at all.
+     * The default 'false' value does not add punctuation to result hypotheses.
+     * Note: This is currently offered as an experimental service, complimentary
+     * to all users. In the future this may be exclusively available as a
+     * premium feature.
+     * 

+     *
+     * bool enable_automatic_punctuation = 11;
+     */
+    public Builder clearEnableAutomaticPunctuation() {
+      
+      enableAutomaticPunctuation_ = false;
+      onChanged();
+      return this;
+    }
+
+    private java.lang.Object model_ = "";
+    /**
+     * 
+     * *Optional* Which model to select for the given request. Select the model
+     * best suited to your domain to get best results. If a model is not
+     * explicitly specified, then we auto-select a model based on the parameters
+     * in the RecognitionConfig.
+     * <table>
+     *   <tr>
+     *     <td><b>Model</b></td>
+     *     <td><b>Description</b></td>
+     *   </tr>
+     *   <tr>
+     *     <td><code>command_and_search</code></td>
+     *     <td>Best for short queries such as voice commands or voice search.</td>
+     *   </tr>
+     *   <tr>
+     *     <td><code>phone_call</code></td>
+     *     <td>Best for audio that originated from a phone call (typically
+     *     recorded at an 8khz sampling rate).</td>
+     *   </tr>
+     *   <tr>
+     *     <td><code>video</code></td>
+     *     <td>Best for audio that originated from from video or includes multiple
+     *         speakers. Ideally the audio is recorded at a 16khz or greater
+     *         sampling rate. This is a premium model that costs more than the
+     *         standard rate.</td>
+     *   </tr>
+     *   <tr>
+     *     <td><code>default</code></td>
+     *     <td>Best for audio that is not one of the specific audio models.
+     *         For example, long-form audio. Ideally the audio is high-fidelity,
+     *         recorded at a 16khz or greater sampling rate.</td>
+     *   </tr>
+     * </table>
+     * 

+     *
+     * string model = 13;
+     */
+    public java.lang.String getModel() {
+      java.lang.Object ref = model_;
+      if (!(ref instanceof java.lang.String)) {
+        com.google.protobuf.ByteString bs =
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        model_ = s;
+        return s;
+      } else {
+        return (java.lang.String) ref;
+      }
+    }
+    /**
+     * 
+     * *Optional* Which model to select for the given request. Select the model
+     * best suited to your domain to get best results. If a model is not
+     * explicitly specified, then we auto-select a model based on the parameters
+     * in the RecognitionConfig.
+     * <table>
+     *   <tr>
+     *     <td><b>Model</b></td>
+     *     <td><b>Description</b></td>
+     *   </tr>
+     *   <tr>
+     *     <td><code>command_and_search</code></td>
+     *     <td>Best for short queries such as voice commands or voice search.</td>
+     *   </tr>
+     *   <tr>
+     *     <td><code>phone_call</code></td>
+     *     <td>Best for audio that originated from a phone call (typically
+     *     recorded at an 8khz sampling rate).</td>
+     *   </tr>
+     *   <tr>
+     *     <td><code>video</code></td>
+     *     <td>Best for audio that originated from from video or includes multiple
+     *         speakers. Ideally the audio is recorded at a 16khz or greater
+     *         sampling rate. This is a premium model that costs more than the
+     *         standard rate.</td>
+     *   </tr>
+     *   <tr>
+     *     <td><code>default</code></td>
+     *     <td>Best for audio that is not one of the specific audio models.
+     *         For example, long-form audio. Ideally the audio is high-fidelity,
+     *         recorded at a 16khz or greater sampling rate.</td>
+     *   </tr>
+     * </table>
+     * 

+     *
+     * string model = 13;
+     */
+    public com.google.protobuf.ByteString
+        getModelBytes() {
+      java.lang.Object ref = model_;
+      if (ref instanceof String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        model_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+    /**
+     * 
+     * *Optional* Which model to select for the given request. Select the model
+     * best suited to your domain to get best results. If a model is not
+     * explicitly specified, then we auto-select a model based on the parameters
+     * in the RecognitionConfig.
+     * <table>
+     *   <tr>
+     *     <td><b>Model</b></td>
+     *     <td><b>Description</b></td>
+     *   </tr>
+     *   <tr>
+     *     <td><code>command_and_search</code></td>
+     *     <td>Best for short queries such as voice commands or voice search.</td>
+     *   </tr>
+     *   <tr>
+     *     <td><code>phone_call</code></td>
+     *     <td>Best for audio that originated from a phone call (typically
+     *     recorded at an 8khz sampling rate).</td>
+     *   </tr>
+     *   <tr>
+     *     <td><code>video</code></td>
+     *     <td>Best for audio that originated from from video or includes multiple
+     *         speakers. Ideally the audio is recorded at a 16khz or greater
+     *         sampling rate. This is a premium model that costs more than the
+     *         standard rate.</td>
+     *   </tr>
+     *   <tr>
+     *     <td><code>default</code></td>
+     *     <td>Best for audio that is not one of the specific audio models.
+     *         For example, long-form audio. Ideally the audio is high-fidelity,
+     *         recorded at a 16khz or greater sampling rate.</td>
+     *   </tr>
+     * </table>
+     * 

+     *
+     * string model = 13;
+     */
+    public Builder setModel(
+        java.lang.String value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  
+      model_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * *Optional* Which model to select for the given request. Select the model
+     * best suited to your domain to get best results. If a model is not
+     * explicitly specified, then we auto-select a model based on the parameters
+     * in the RecognitionConfig.
+     * <table>
+     *   <tr>
+     *     <td><b>Model</b></td>
+     *     <td><b>Description</b></td>
+     *   </tr>
+     *   <tr>
+     *     <td><code>command_and_search</code></td>
+     *     <td>Best for short queries such as voice commands or voice search.</td>
+     *   </tr>
+     *   <tr>
+     *     <td><code>phone_call</code></td>
+     *     <td>Best for audio that originated from a phone call (typically
+     *     recorded at an 8khz sampling rate).</td>
+     *   </tr>
+     *   <tr>
+     *     <td><code>video</code></td>
+     *     <td>Best for audio that originated from from video or includes multiple
+     *         speakers. Ideally the audio is recorded at a 16khz or greater
+     *         sampling rate. This is a premium model that costs more than the
+     *         standard rate.</td>
+     *   </tr>
+     *   <tr>
+     *     <td><code>default</code></td>
+     *     <td>Best for audio that is not one of the specific audio models.
+     *         For example, long-form audio. Ideally the audio is high-fidelity,
+     *         recorded at a 16khz or greater sampling rate.</td>
+     *   </tr>
+     * </table>
+     * 

+     *
+     * string model = 13;
+     */
+    public Builder clearModel() {
+      
+      model_ = getDefaultInstance().getModel();
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * *Optional* Which model to select for the given request. Select the model
+     * best suited to your domain to get best results. If a model is not
+     * explicitly specified, then we auto-select a model based on the parameters
+     * in the RecognitionConfig.
+     * <table>
+     *   <tr>
+     *     <td><b>Model</b></td>
+     *     <td><b>Description</b></td>
+     *   </tr>
+     *   <tr>
+     *     <td><code>command_and_search</code></td>
+     *     <td>Best for short queries such as voice commands or voice search.</td>
+     *   </tr>
+     *   <tr>
+     *     <td><code>phone_call</code></td>
+     *     <td>Best for audio that originated from a phone call (typically
+     *     recorded at an 8khz sampling rate).</td>
+     *   </tr>
+     *   <tr>
+     *     <td><code>video</code></td>
+     *     <td>Best for audio that originated from from video or includes multiple
+     *         speakers. Ideally the audio is recorded at a 16khz or greater
+     *         sampling rate. This is a premium model that costs more than the
+     *         standard rate.</td>
+     *   </tr>
+     *   <tr>
+     *     <td><code>default</code></td>
+     *     <td>Best for audio that is not one of the specific audio models.
+     *         For example, long-form audio. Ideally the audio is high-fidelity,
+     *         recorded at a 16khz or greater sampling rate.</td>
+     *   </tr>
+     * </table>
+     * 

+     *
+     * string model = 13;
+     */
+    public Builder setModelBytes(
+        com.google.protobuf.ByteString value) {
+      if (value == null) {
+    throw new NullPointerException();
+  }
+  checkByteStringIsUtf8(value);
+      
+      model_ = value;
+      onChanged();
+      return this;
+    }
+
+    private boolean useEnhanced_ ;
+    /**
+     * 
+     * *Optional* Set to true to use an enhanced model for speech recognition.
+     * You must also set the `model` field to a valid, enhanced model. If
+     * `use_enhanced` is set to true and the `model` field is not set, then
+     * `use_enhanced` is ignored. If `use_enhanced` is true and an enhanced
+     * version of the specified model does not exist, then the speech is
+     * recognized using the standard version of the specified model.
+     * Enhanced speech models require that you opt-in to data logging using
+     * instructions in the [documentation](/speech-to-text/enable-data-logging).
+     * If you set `use_enhanced` to true and you have not enabled audio logging,
+     * then you will receive an error.
+     * 

+     *
+     * bool use_enhanced = 14;
+     */
+    public boolean getUseEnhanced() {
+      return useEnhanced_;
+    }
+    /**
+     * 
+     * *Optional* Set to true to use an enhanced model for speech recognition.
+     * You must also set the `model` field to a valid, enhanced model. If
+     * `use_enhanced` is set to true and the `model` field is not set, then
+     * `use_enhanced` is ignored. If `use_enhanced` is true and an enhanced
+     * version of the specified model does not exist, then the speech is
+     * recognized using the standard version of the specified model.
+     * Enhanced speech models require that you opt-in to data logging using
+     * instructions in the [documentation](/speech-to-text/enable-data-logging).
+     * If you set `use_enhanced` to true and you have not enabled audio logging,
+     * then you will receive an error.
+     * 

+     *
+     * bool use_enhanced = 14;
+     */
+    public Builder setUseEnhanced(boolean value) {
+      
+      useEnhanced_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     * 
+     * *Optional* Set to true to use an enhanced model for speech recognition.
+     * You must also set the `model` field to a valid, enhanced model. If
+     * `use_enhanced` is set to true and the `model` field is not set, then
+     * `use_enhanced` is ignored. If `use_enhanced` is true and an enhanced
+     * version of the specified model does not exist, then the speech is
+     * recognized using the standard version of the specified model.
+     * Enhanced speech models require that you opt-in to data logging using
+     * instructions in the [documentation](/speech-to-text/enable-data-logging).
+     * If you set `use_enhanced` to true and you have not enabled audio logging,
+     * then you will receive an error.
+     * 

+     *
+     * bool use_enhanced = 14;
+     */
+    public Builder clearUseEnhanced() {
+      
+      useEnhanced_ = false;
+      onChanged();
+      return this;
+    }
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1757,12 +2387,11 @@ public static com.google.cloud.speech.v1.RecognitionConfig getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RecognitionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RecognitionConfig(input, extensionRegistry);
+        return new RecognitionConfig(input, extensionRegistry);
     }
   };
 
@@ -1775,7 +2404,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.speech.v1.RecognitionConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionConfigOrBuilder.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionConfigOrBuilder.java
index c4f4e25e2237..29429948b5c5 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionConfigOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognitionConfigOrBuilder.java
@@ -9,7 +9,9 @@ public interface RecognitionConfigOrBuilder extends
 
   /**
    * 
-   * *Required* Encoding of audio data sent in all `RecognitionAudio` messages.
+   * Encoding of audio data sent in all `RecognitionAudio` messages.
+   * This field is optional for `FLAC` and `WAV` audio files and required
+   * for all other audio formats. For details, see [AudioEncoding][google.cloud.speech.v1.RecognitionConfig.AudioEncoding].
    * 

    *
    * .google.cloud.speech.v1.RecognitionConfig.AudioEncoding encoding = 1;
@@ -17,7 +19,9 @@ public interface RecognitionConfigOrBuilder extends
   int getEncodingValue();
   /**
    * 
-   * *Required* Encoding of audio data sent in all `RecognitionAudio` messages.
+   * Encoding of audio data sent in all `RecognitionAudio` messages.
+   * This field is optional for `FLAC` and `WAV` audio files and required
+   * for all other audio formats. For details, see [AudioEncoding][google.cloud.speech.v1.RecognitionConfig.AudioEncoding].
    * 

    *
    * .google.cloud.speech.v1.RecognitionConfig.AudioEncoding encoding = 1;
@@ -26,11 +30,13 @@ public interface RecognitionConfigOrBuilder extends
 
   /**
    * 
-   * *Required* Sample rate in Hertz of the audio data sent in all
+   * Sample rate in Hertz of the audio data sent in all
    * `RecognitionAudio` messages. Valid values are: 8000-48000.
    * 16000 is optimal. For best results, set the sampling rate of the audio
    * source to 16000 Hz. If that's not possible, use the native sample rate of
    * the audio source (instead of re-sampling).
+   * This field is optional for `FLAC` and `WAV` audio files and required
+   * for all other audio formats. For details, see [AudioEncoding][google.cloud.speech.v1.RecognitionConfig.AudioEncoding].
    * 

    *
    * int32 sample_rate_hertz = 2;
@@ -42,7 +48,7 @@ public interface RecognitionConfigOrBuilder extends
    * *Required* The language of the supplied audio as a
    * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag.
    * Example: "en-US".
-   * See [Language Support](https://cloud.google.com/speech/docs/languages)
+   * See [Language Support](/speech-to-text/docs/languages)
    * for a list of the currently supported language codes.
    * 

    *
@@ -54,7 +60,7 @@ public interface RecognitionConfigOrBuilder extends
    * *Required* The language of the supplied audio as a
    * [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag.
    * Example: "en-US".
-   * See [Language Support](https://cloud.google.com/speech/docs/languages)
+   * See [Language Support](/speech-to-text/docs/languages)
    * for a list of the currently supported language codes.
    * 

    *
@@ -91,7 +97,9 @@ public interface RecognitionConfigOrBuilder extends
 
   /**
    * 
-   * *Optional* A means to provide context to assist the speech recognition.
+   * *Optional* array of [SpeechContext][google.cloud.speech.v1.SpeechContext].
+   * A means to provide context to assist the speech recognition. For more
+   * information, see [Phrase Hints](/speech-to-text/docs/basics#phrase-hints).
    * 

    *
    * repeated .google.cloud.speech.v1.SpeechContext speech_contexts = 6;
@@ -100,7 +108,9 @@ public interface RecognitionConfigOrBuilder extends
       getSpeechContextsList();
   /**
    * 
-   * *Optional* A means to provide context to assist the speech recognition.
+   * *Optional* array of [SpeechContext][google.cloud.speech.v1.SpeechContext].
+   * A means to provide context to assist the speech recognition. For more
+   * information, see [Phrase Hints](/speech-to-text/docs/basics#phrase-hints).
    * 

    *
    * repeated .google.cloud.speech.v1.SpeechContext speech_contexts = 6;
@@ -108,7 +118,9 @@ public interface RecognitionConfigOrBuilder extends
   com.google.cloud.speech.v1.SpeechContext getSpeechContexts(int index);
   /**
    * 
-   * *Optional* A means to provide context to assist the speech recognition.
+   * *Optional* array of [SpeechContext][google.cloud.speech.v1.SpeechContext].
+   * A means to provide context to assist the speech recognition. For more
+   * information, see [Phrase Hints](/speech-to-text/docs/basics#phrase-hints).
    * 

    *
    * repeated .google.cloud.speech.v1.SpeechContext speech_contexts = 6;
@@ -116,7 +128,9 @@ public interface RecognitionConfigOrBuilder extends
   int getSpeechContextsCount();
   /**
    * 
-   * *Optional* A means to provide context to assist the speech recognition.
+   * *Optional* array of [SpeechContext][google.cloud.speech.v1.SpeechContext].
+   * A means to provide context to assist the speech recognition. For more
+   * information, see [Phrase Hints](/speech-to-text/docs/basics#phrase-hints).
    * 

    *
    * repeated .google.cloud.speech.v1.SpeechContext speech_contexts = 6;
@@ -125,7 +139,9 @@ public interface RecognitionConfigOrBuilder extends
       getSpeechContextsOrBuilderList();
   /**
    * 
-   * *Optional* A means to provide context to assist the speech recognition.
+   * *Optional* array of [SpeechContext][google.cloud.speech.v1.SpeechContext].
+   * A means to provide context to assist the speech recognition. For more
+   * information, see [Phrase Hints](/speech-to-text/docs/basics#phrase-hints).
    * 

    *
    * repeated .google.cloud.speech.v1.SpeechContext speech_contexts = 6;
@@ -144,4 +160,117 @@ com.google.cloud.speech.v1.SpeechContextOrBuilder getSpeechContextsOrBuilder(
    * bool enable_word_time_offsets = 8;
    */
   boolean getEnableWordTimeOffsets();
+
+  /**
+   * 
+   * *Optional* If 'true', adds punctuation to recognition result hypotheses.
+   * This feature is only available in select languages. Setting this for
+   * requests in other languages has no effect at all.
+   * The default 'false' value does not add punctuation to result hypotheses.
+   * Note: This is currently offered as an experimental service, complimentary
+   * to all users. In the future this may be exclusively available as a
+   * premium feature.
+   * 

+   *
+   * bool enable_automatic_punctuation = 11;
+   */
+  boolean getEnableAutomaticPunctuation();
+
+  /**
+   * 
+   * *Optional* Which model to select for the given request. Select the model
+   * best suited to your domain to get best results. If a model is not
+   * explicitly specified, then we auto-select a model based on the parameters
+   * in the RecognitionConfig.
+   * <table>
+   *   <tr>
+   *     <td><b>Model</b></td>
+   *     <td><b>Description</b></td>
+   *   </tr>
+   *   <tr>
+   *     <td><code>command_and_search</code></td>
+   *     <td>Best for short queries such as voice commands or voice search.</td>
+   *   </tr>
+   *   <tr>
+   *     <td><code>phone_call</code></td>
+   *     <td>Best for audio that originated from a phone call (typically
+   *     recorded at an 8khz sampling rate).</td>
+   *   </tr>
+   *   <tr>
+   *     <td><code>video</code></td>
+   *     <td>Best for audio that originated from from video or includes multiple
+   *         speakers. Ideally the audio is recorded at a 16khz or greater
+   *         sampling rate. This is a premium model that costs more than the
+   *         standard rate.</td>
+   *   </tr>
+   *   <tr>
+   *     <td><code>default</code></td>
+   *     <td>Best for audio that is not one of the specific audio models.
+   *         For example, long-form audio. Ideally the audio is high-fidelity,
+   *         recorded at a 16khz or greater sampling rate.</td>
+   *   </tr>
+   * </table>
+   * 

+   *
+   * string model = 13;
+   */
+  java.lang.String getModel();
+  /**
+   * 
+   * *Optional* Which model to select for the given request. Select the model
+   * best suited to your domain to get best results. If a model is not
+   * explicitly specified, then we auto-select a model based on the parameters
+   * in the RecognitionConfig.
+   * <table>
+   *   <tr>
+   *     <td><b>Model</b></td>
+   *     <td><b>Description</b></td>
+   *   </tr>
+   *   <tr>
+   *     <td><code>command_and_search</code></td>
+   *     <td>Best for short queries such as voice commands or voice search.</td>
+   *   </tr>
+   *   <tr>
+   *     <td><code>phone_call</code></td>
+   *     <td>Best for audio that originated from a phone call (typically
+   *     recorded at an 8khz sampling rate).</td>
+   *   </tr>
+   *   <tr>
+   *     <td><code>video</code></td>
+   *     <td>Best for audio that originated from from video or includes multiple
+   *         speakers. Ideally the audio is recorded at a 16khz or greater
+   *         sampling rate. This is a premium model that costs more than the
+   *         standard rate.</td>
+   *   </tr>
+   *   <tr>
+   *     <td><code>default</code></td>
+   *     <td>Best for audio that is not one of the specific audio models.
+   *         For example, long-form audio. Ideally the audio is high-fidelity,
+   *         recorded at a 16khz or greater sampling rate.</td>
+   *   </tr>
+   * </table>
+   * 

+   *
+   * string model = 13;
+   */
+  com.google.protobuf.ByteString
+      getModelBytes();
+
+  /**
+   * 
+   * *Optional* Set to true to use an enhanced model for speech recognition.
+   * You must also set the `model` field to a valid, enhanced model. If
+   * `use_enhanced` is set to true and the `model` field is not set, then
+   * `use_enhanced` is ignored. If `use_enhanced` is true and an enhanced
+   * version of the specified model does not exist, then the speech is
+   * recognized using the standard version of the specified model.
+   * Enhanced speech models require that you opt-in to data logging using
+   * instructions in the [documentation](/speech-to-text/enable-data-logging).
+   * If you set `use_enhanced` to true and you have not enabled audio logging,
+   * then you will receive an error.
+   * 

+   *
+   * bool use_enhanced = 14;
+   */
+  boolean getUseEnhanced();
 }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognizeRequest.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognizeRequest.java
index 8dcaadf2625d..2769b538033d 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognizeRequest.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognizeRequest.java
@@ -32,9 +32,6 @@ private RecognizeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private RecognizeRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.speech.v1.RecognitionConfig.Builder subBuilder = null;
             if (config_ != null) {
@@ -72,13 +76,6 @@ private RecognizeRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private RecognizeRequest(
     return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_RecognizeRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_RecognizeRequest_fieldAccessorTable
@@ -174,7 +170,6 @@ public com.google.cloud.speech.v1.RecognitionAudioOrBuilder getAudioOrBuilder()
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -184,7 +179,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (config_ != null) {
@@ -196,7 +190,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -330,7 +323,6 @@ public static com.google.cloud.speech.v1.RecognizeRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -338,7 +330,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.speech.v1.RecognizeRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -366,7 +357,6 @@ public static final class Builder extends
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_RecognizeRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_RecognizeRequest_fieldAccessorTable
@@ -389,7 +379,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (configBuilder_ == null) {
@@ -407,18 +396,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_RecognizeRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.RecognizeRequest getDefaultInstanceForType() {
       return com.google.cloud.speech.v1.RecognizeRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.RecognizeRequest build() {
       com.google.cloud.speech.v1.RecognizeRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -427,7 +413,6 @@ public com.google.cloud.speech.v1.RecognizeRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.RecognizeRequest buildPartial() {
       com.google.cloud.speech.v1.RecognizeRequest result = new com.google.cloud.speech.v1.RecognizeRequest(this);
       if (configBuilder_ == null) {
@@ -444,39 +429,32 @@ public com.google.cloud.speech.v1.RecognizeRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.speech.v1.RecognizeRequest) {
         return mergeFrom((com.google.cloud.speech.v1.RecognizeRequest)other);
@@ -499,12 +477,10 @@ public Builder mergeFrom(com.google.cloud.speech.v1.RecognizeRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -837,13 +813,11 @@ public com.google.cloud.speech.v1.RecognitionAudioOrBuilder getAudioOrBuilder()
       }
       return audioBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -865,12 +839,11 @@ public static com.google.cloud.speech.v1.RecognizeRequest getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RecognizeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RecognizeRequest(input, extensionRegistry);
+        return new RecognizeRequest(input, extensionRegistry);
     }
   };
 
@@ -883,7 +856,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.speech.v1.RecognizeRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognizeResponse.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognizeResponse.java
index 16e6253993ea..d82bb509859d 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognizeResponse.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognizeResponse.java
@@ -35,9 +35,6 @@ private RecognizeResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private RecognizeResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               results_ = new java.util.ArrayList();
@@ -58,13 +62,6 @@ private RecognizeResponse(
                 input.readMessage(com.google.cloud.speech.v1.SpeechRecognitionResult.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -85,7 +82,6 @@ private RecognizeResponse(
     return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_RecognizeResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_RecognizeResponse_fieldAccessorTable
@@ -97,7 +93,7 @@ private RecognizeResponse(
   private java.util.List results_;
   /**
    * 
-   * *Output-only* Sequential list of transcription results corresponding to
+   * Output only. Sequential list of transcription results corresponding to
    * sequential portions of audio.
    * 

    *
@@ -108,7 +104,7 @@ public java.util.List getRes
   }
   /**
    * 
-   * *Output-only* Sequential list of transcription results corresponding to
+   * Output only. Sequential list of transcription results corresponding to
    * sequential portions of audio.
    * 

    *
@@ -120,7 +116,7 @@ public java.util.List getRes
   }
   /**
    * 
-   * *Output-only* Sequential list of transcription results corresponding to
+   * Output only. Sequential list of transcription results corresponding to
    * sequential portions of audio.
    * 

    *
@@ -131,7 +127,7 @@ public int getResultsCount() {
   }
   /**
    * 
-   * *Output-only* Sequential list of transcription results corresponding to
+   * Output only. Sequential list of transcription results corresponding to
    * sequential portions of audio.
    * 

    *
@@ -142,7 +138,7 @@ public com.google.cloud.speech.v1.SpeechRecognitionResult getResults(int index)
   }
   /**
    * 
-   * *Output-only* Sequential list of transcription results corresponding to
+   * Output only. Sequential list of transcription results corresponding to
    * sequential portions of audio.
    * 

    *
@@ -154,7 +150,6 @@ public com.google.cloud.speech.v1.SpeechRecognitionResultOrBuilder getResultsOrB
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -164,7 +159,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < results_.size(); i++) {
@@ -173,7 +167,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -291,7 +284,6 @@ public static com.google.cloud.speech.v1.RecognizeResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -299,7 +291,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.speech.v1.RecognizeResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -329,7 +320,6 @@ public static final class Builder extends
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_RecognizeResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_RecognizeResponse_fieldAccessorTable
@@ -353,7 +343,6 @@ private void maybeForceBuilderInitialization() {
         getResultsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (resultsBuilder_ == null) {
@@ -365,18 +354,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_RecognizeResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.RecognizeResponse getDefaultInstanceForType() {
       return com.google.cloud.speech.v1.RecognizeResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.RecognizeResponse build() {
       com.google.cloud.speech.v1.RecognizeResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -385,7 +371,6 @@ public com.google.cloud.speech.v1.RecognizeResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.RecognizeResponse buildPartial() {
       com.google.cloud.speech.v1.RecognizeResponse result = new com.google.cloud.speech.v1.RecognizeResponse(this);
       int from_bitField0_ = bitField0_;
@@ -402,39 +387,32 @@ public com.google.cloud.speech.v1.RecognizeResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.speech.v1.RecognizeResponse) {
         return mergeFrom((com.google.cloud.speech.v1.RecognizeResponse)other);
@@ -477,12 +455,10 @@ public Builder mergeFrom(com.google.cloud.speech.v1.RecognizeResponse other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -516,7 +492,7 @@ private void ensureResultsIsMutable() {
 
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -531,7 +507,7 @@ public java.util.List getRes
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -546,7 +522,7 @@ public int getResultsCount() {
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -561,7 +537,7 @@ public com.google.cloud.speech.v1.SpeechRecognitionResult getResults(int index)
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -583,7 +559,7 @@ public Builder setResults(
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -602,7 +578,7 @@ public Builder setResults(
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -623,7 +599,7 @@ public Builder addResults(com.google.cloud.speech.v1.SpeechRecognitionResult val
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -645,7 +621,7 @@ public Builder addResults(
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -664,7 +640,7 @@ public Builder addResults(
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -683,7 +659,7 @@ public Builder addResults(
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -703,7 +679,7 @@ public Builder addAllResults(
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -721,7 +697,7 @@ public Builder clearResults() {
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -739,7 +715,7 @@ public Builder removeResults(int index) {
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -751,7 +727,7 @@ public com.google.cloud.speech.v1.SpeechRecognitionResult.Builder getResultsBuil
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -766,7 +742,7 @@ public com.google.cloud.speech.v1.SpeechRecognitionResultOrBuilder getResultsOrB
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -782,7 +758,7 @@ public com.google.cloud.speech.v1.SpeechRecognitionResultOrBuilder getResultsOrB
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -794,7 +770,7 @@ public com.google.cloud.speech.v1.SpeechRecognitionResult.Builder addResultsBuil
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -807,7 +783,7 @@ public com.google.cloud.speech.v1.SpeechRecognitionResult.Builder addResultsBuil
     }
     /**
      * 
-     * *Output-only* Sequential list of transcription results corresponding to
+     * Output only. Sequential list of transcription results corresponding to
      * sequential portions of audio.
      * 

      *
@@ -831,13 +807,11 @@ public com.google.cloud.speech.v1.SpeechRecognitionResult.Builder addResultsBuil
       }
       return resultsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -859,12 +833,11 @@ public static com.google.cloud.speech.v1.RecognizeResponse getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RecognizeResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RecognizeResponse(input, extensionRegistry);
+        return new RecognizeResponse(input, extensionRegistry);
     }
   };
 
@@ -877,7 +850,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.speech.v1.RecognizeResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognizeResponseOrBuilder.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognizeResponseOrBuilder.java
index 1a803537a000..316db7f97229 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognizeResponseOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/RecognizeResponseOrBuilder.java
@@ -9,7 +9,7 @@ public interface RecognizeResponseOrBuilder extends
 
   /**
    * 
-   * *Output-only* Sequential list of transcription results corresponding to
+   * Output only. Sequential list of transcription results corresponding to
    * sequential portions of audio.
    * 

    *
@@ -19,7 +19,7 @@ public interface RecognizeResponseOrBuilder extends
       getResultsList();
   /**
    * 
-   * *Output-only* Sequential list of transcription results corresponding to
+   * Output only. Sequential list of transcription results corresponding to
    * sequential portions of audio.
    * 

    *
@@ -28,7 +28,7 @@ public interface RecognizeResponseOrBuilder extends
   com.google.cloud.speech.v1.SpeechRecognitionResult getResults(int index);
   /**
    * 
-   * *Output-only* Sequential list of transcription results corresponding to
+   * Output only. Sequential list of transcription results corresponding to
    * sequential portions of audio.
    * 

    *
@@ -37,7 +37,7 @@ public interface RecognizeResponseOrBuilder extends
   int getResultsCount();
   /**
    * 
-   * *Output-only* Sequential list of transcription results corresponding to
+   * Output only. Sequential list of transcription results corresponding to
    * sequential portions of audio.
    * 

    *
@@ -47,7 +47,7 @@ public interface RecognizeResponseOrBuilder extends
       getResultsOrBuilderList();
   /**
    * 
-   * *Output-only* Sequential list of transcription results corresponding to
+   * Output only. Sequential list of transcription results corresponding to
    * sequential portions of audio.
    * 

    *
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechContext.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechContext.java
index a67628fa7c99..25de57ee7321 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechContext.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechContext.java
@@ -34,9 +34,6 @@ private SpeechContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private SpeechContext(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -57,13 +61,6 @@ private SpeechContext(
             phrases_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private SpeechContext(
     return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_SpeechContext_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_SpeechContext_fieldAccessorTable
@@ -101,7 +97,7 @@ private SpeechContext(
    * to improve the accuracy for specific words and phrases, for example, if
    * specific commands are typically spoken by the user. This can also be used
    * to add additional words to the vocabulary of the recognizer. See
-   * [usage limits](https://cloud.google.com/speech/limits#content).
+   * [usage limits](/speech-to-text/quotas#content).
    * 

    *
    * repeated string phrases = 1;
@@ -117,7 +113,7 @@ private SpeechContext(
    * to improve the accuracy for specific words and phrases, for example, if
    * specific commands are typically spoken by the user. This can also be used
    * to add additional words to the vocabulary of the recognizer. See
-   * [usage limits](https://cloud.google.com/speech/limits#content).
+   * [usage limits](/speech-to-text/quotas#content).
    * 
    *
    * repeated string phrases = 1;
@@ -132,7 +128,7 @@ public int getPhrasesCount() {
    * to improve the accuracy for specific words and phrases, for example, if
    * specific commands are typically spoken by the user. This can also be used
    * to add additional words to the vocabulary of the recognizer. See
-   * [usage limits](https://cloud.google.com/speech/limits#content).
+   * [usage limits](/speech-to-text/quotas#content).
    * 
    *
    * repeated string phrases = 1;
@@ -147,7 +143,7 @@ public java.lang.String getPhrases(int index) {
    * to improve the accuracy for specific words and phrases, for example, if
    * specific commands are typically spoken by the user. This can also be used
    * to add additional words to the vocabulary of the recognizer. See
-   * [usage limits](https://cloud.google.com/speech/limits#content).
+   * [usage limits](/speech-to-text/quotas#content).
    * 
    *
    * repeated string phrases = 1;
@@ -158,7 +154,6 @@ public java.lang.String getPhrases(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -168,7 +163,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < phrases_.size(); i++) {
@@ -177,7 +171,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -299,7 +292,6 @@ public static com.google.cloud.speech.v1.SpeechContext parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -307,7 +299,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.speech.v1.SpeechContext prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -336,7 +327,6 @@ public static final class Builder extends
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_SpeechContext_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_SpeechContext_fieldAccessorTable
@@ -359,7 +349,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       phrases_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -367,18 +356,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_SpeechContext_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.SpeechContext getDefaultInstanceForType() {
       return com.google.cloud.speech.v1.SpeechContext.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.SpeechContext build() {
       com.google.cloud.speech.v1.SpeechContext result = buildPartial();
       if (!result.isInitialized()) {
@@ -387,7 +373,6 @@ public com.google.cloud.speech.v1.SpeechContext build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.SpeechContext buildPartial() {
       com.google.cloud.speech.v1.SpeechContext result = new com.google.cloud.speech.v1.SpeechContext(this);
       int from_bitField0_ = bitField0_;
@@ -400,39 +385,32 @@ public com.google.cloud.speech.v1.SpeechContext buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.speech.v1.SpeechContext) {
         return mergeFrom((com.google.cloud.speech.v1.SpeechContext)other);
@@ -459,12 +437,10 @@ public Builder mergeFrom(com.google.cloud.speech.v1.SpeechContext other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -498,7 +474,7 @@ private void ensurePhrasesIsMutable() {
      * to improve the accuracy for specific words and phrases, for example, if
      * specific commands are typically spoken by the user. This can also be used
      * to add additional words to the vocabulary of the recognizer. See
-     * [usage limits](https://cloud.google.com/speech/limits#content).
+     * [usage limits](/speech-to-text/quotas#content).
      * 
      *
      * repeated string phrases = 1;
@@ -514,7 +490,7 @@ private void ensurePhrasesIsMutable() {
      * to improve the accuracy for specific words and phrases, for example, if
      * specific commands are typically spoken by the user. This can also be used
      * to add additional words to the vocabulary of the recognizer. See
-     * [usage limits](https://cloud.google.com/speech/limits#content).
+     * [usage limits](/speech-to-text/quotas#content).
      * 
      *
      * repeated string phrases = 1;
@@ -529,7 +505,7 @@ public int getPhrasesCount() {
      * to improve the accuracy for specific words and phrases, for example, if
      * specific commands are typically spoken by the user. This can also be used
      * to add additional words to the vocabulary of the recognizer. See
-     * [usage limits](https://cloud.google.com/speech/limits#content).
+     * [usage limits](/speech-to-text/quotas#content).
      * 
      *
      * repeated string phrases = 1;
@@ -544,7 +520,7 @@ public java.lang.String getPhrases(int index) {
      * to improve the accuracy for specific words and phrases, for example, if
      * specific commands are typically spoken by the user. This can also be used
      * to add additional words to the vocabulary of the recognizer. See
-     * [usage limits](https://cloud.google.com/speech/limits#content).
+     * [usage limits](/speech-to-text/quotas#content).
      * 
      *
      * repeated string phrases = 1;
@@ -560,7 +536,7 @@ public java.lang.String getPhrases(int index) {
      * to improve the accuracy for specific words and phrases, for example, if
      * specific commands are typically spoken by the user. This can also be used
      * to add additional words to the vocabulary of the recognizer. See
-     * [usage limits](https://cloud.google.com/speech/limits#content).
+     * [usage limits](/speech-to-text/quotas#content).
      * 
      *
      * repeated string phrases = 1;
@@ -582,7 +558,7 @@ public Builder setPhrases(
      * to improve the accuracy for specific words and phrases, for example, if
      * specific commands are typically spoken by the user. This can also be used
      * to add additional words to the vocabulary of the recognizer. See
-     * [usage limits](https://cloud.google.com/speech/limits#content).
+     * [usage limits](/speech-to-text/quotas#content).
      * 
      *
      * repeated string phrases = 1;
@@ -604,7 +580,7 @@ public Builder addPhrases(
      * to improve the accuracy for specific words and phrases, for example, if
      * specific commands are typically spoken by the user. This can also be used
      * to add additional words to the vocabulary of the recognizer. See
-     * [usage limits](https://cloud.google.com/speech/limits#content).
+     * [usage limits](/speech-to-text/quotas#content).
      * 
      *
      * repeated string phrases = 1;
@@ -624,7 +600,7 @@ public Builder addAllPhrases(
      * to improve the accuracy for specific words and phrases, for example, if
      * specific commands are typically spoken by the user. This can also be used
      * to add additional words to the vocabulary of the recognizer. See
-     * [usage limits](https://cloud.google.com/speech/limits#content).
+     * [usage limits](/speech-to-text/quotas#content).
      * 
      *
      * repeated string phrases = 1;
@@ -642,7 +618,7 @@ public Builder clearPhrases() {
      * to improve the accuracy for specific words and phrases, for example, if
      * specific commands are typically spoken by the user. This can also be used
      * to add additional words to the vocabulary of the recognizer. See
-     * [usage limits](https://cloud.google.com/speech/limits#content).
+     * [usage limits](/speech-to-text/quotas#content).
      * 
      *
      * repeated string phrases = 1;
@@ -658,13 +634,11 @@ public Builder addPhrasesBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -686,12 +660,11 @@ public static com.google.cloud.speech.v1.SpeechContext getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SpeechContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SpeechContext(input, extensionRegistry);
+        return new SpeechContext(input, extensionRegistry);
     }
   };
 
@@ -704,7 +677,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.speech.v1.SpeechContext getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechContextOrBuilder.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechContextOrBuilder.java
index 17901241c8f1..14412404465d 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechContextOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechContextOrBuilder.java
@@ -14,7 +14,7 @@ public interface SpeechContextOrBuilder extends
    * to improve the accuracy for specific words and phrases, for example, if
    * specific commands are typically spoken by the user. This can also be used
    * to add additional words to the vocabulary of the recognizer. See
-   * [usage limits](https://cloud.google.com/speech/limits#content).
+   * [usage limits](/speech-to-text/quotas#content).
    * 
    *
    * repeated string phrases = 1;
@@ -28,7 +28,7 @@ public interface SpeechContextOrBuilder extends
    * to improve the accuracy for specific words and phrases, for example, if
    * specific commands are typically spoken by the user. This can also be used
    * to add additional words to the vocabulary of the recognizer. See
-   * [usage limits](https://cloud.google.com/speech/limits#content).
+   * [usage limits](/speech-to-text/quotas#content).
    * 
    *
    * repeated string phrases = 1;
@@ -41,7 +41,7 @@ public interface SpeechContextOrBuilder extends
    * to improve the accuracy for specific words and phrases, for example, if
    * specific commands are typically spoken by the user. This can also be used
    * to add additional words to the vocabulary of the recognizer. See
-   * [usage limits](https://cloud.google.com/speech/limits#content).
+   * [usage limits](/speech-to-text/quotas#content).
    * 
    *
    * repeated string phrases = 1;
@@ -54,7 +54,7 @@ public interface SpeechContextOrBuilder extends
    * to improve the accuracy for specific words and phrases, for example, if
    * specific commands are typically spoken by the user. This can also be used
    * to add additional words to the vocabulary of the recognizer. See
-   * [usage limits](https://cloud.google.com/speech/limits#content).
+   * [usage limits](/speech-to-text/quotas#content).
    * 
    *
    * repeated string phrases = 1;
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechProto.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechProto.java
index ddf58b5f1623..4fb152c9d10f 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechProto.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechProto.java
@@ -102,79 +102,82 @@ public static void registerAllExtensions(
       "oto\022\026google.cloud.speech.v1\032\034google/api/" +
       "annotations.proto\032#google/longrunning/op" +
       "erations.proto\032\031google/protobuf/any.prot" +
-      "o\032\036google/protobuf/duration.proto\032\037googl" +
-      "e/protobuf/timestamp.proto\032\027google/rpc/s" +
-      "tatus.proto\"\206\001\n\020RecognizeRequest\0229\n\006conf" +
-      "ig\030\001 \001(\0132).google.cloud.speech.v1.Recogn" +
-      "itionConfig\0227\n\005audio\030\002 \001(\0132(.google.clou" +
-      "d.speech.v1.RecognitionAudio\"\221\001\n\033LongRun" +
-      "ningRecognizeRequest\0229\n\006config\030\001 \001(\0132).g" +
-      "oogle.cloud.speech.v1.RecognitionConfig\022" +
-      "7\n\005audio\030\002 \001(\0132(.google.cloud.speech.v1." +
-      "RecognitionAudio\"\231\001\n\031StreamingRecognizeR" +
-      "equest\022N\n\020streaming_config\030\001 \001(\01322.googl" +
-      "e.cloud.speech.v1.StreamingRecognitionCo" +
-      "nfigH\000\022\027\n\raudio_content\030\002 \001(\014H\000B\023\n\021strea" +
-      "ming_request\"\212\001\n\032StreamingRecognitionCon" +
-      "fig\0229\n\006config\030\001 \001(\0132).google.cloud.speec" +
-      "h.v1.RecognitionConfig\022\030\n\020single_utteran" +
-      "ce\030\002 \001(\010\022\027\n\017interim_results\030\003 \001(\010\"\264\003\n\021Re" +
-      "cognitionConfig\022I\n\010encoding\030\001 \001(\01627.goog" +
-      "le.cloud.speech.v1.RecognitionConfig.Aud" +
-      "ioEncoding\022\031\n\021sample_rate_hertz\030\002 \001(\005\022\025\n" +
-      "\rlanguage_code\030\003 \001(\t\022\030\n\020max_alternatives" +
-      "\030\004 \001(\005\022\030\n\020profanity_filter\030\005 \001(\010\022>\n\017spee" +
-      "ch_contexts\030\006 \003(\0132%.google.cloud.speech." +
-      "v1.SpeechContext\022 \n\030enable_word_time_off" +
-      "sets\030\010 \001(\010\"\213\001\n\rAudioEncoding\022\030\n\024ENCODING" +
-      "_UNSPECIFIED\020\000\022\014\n\010LINEAR16\020\001\022\010\n\004FLAC\020\002\022\t" +
-      "\n\005MULAW\020\003\022\007\n\003AMR\020\004\022\n\n\006AMR_WB\020\005\022\014\n\010OGG_OP" +
-      "US\020\006\022\032\n\026SPEEX_WITH_HEADER_BYTE\020\007\" \n\rSpee" +
-      "chContext\022\017\n\007phrases\030\001 \003(\t\"D\n\020Recognitio" +
-      "nAudio\022\021\n\007content\030\001 \001(\014H\000\022\r\n\003uri\030\002 \001(\tH\000" +
-      "B\016\n\014audio_source\"U\n\021RecognizeResponse\022@\n" +
-      "\007results\030\002 \003(\0132/.google.cloud.speech.v1." +
-      "SpeechRecognitionResult\"`\n\034LongRunningRe" +
-      "cognizeResponse\022@\n\007results\030\002 \003(\0132/.googl" +
-      "e.cloud.speech.v1.SpeechRecognitionResul" +
-      "t\"\236\001\n\034LongRunningRecognizeMetadata\022\030\n\020pr" +
-      "ogress_percent\030\001 \001(\005\022.\n\nstart_time\030\002 \001(\013" +
-      "2\032.google.protobuf.Timestamp\0224\n\020last_upd" +
-      "ate_time\030\003 \001(\0132\032.google.protobuf.Timesta" +
-      "mp\"\261\002\n\032StreamingRecognizeResponse\022!\n\005err" +
-      "or\030\001 \001(\0132\022.google.rpc.Status\022C\n\007results\030" +
-      "\002 \003(\01322.google.cloud.speech.v1.Streaming" +
-      "RecognitionResult\022]\n\021speech_event_type\030\004" +
-      " \001(\0162B.google.cloud.speech.v1.StreamingR" +
-      "ecognizeResponse.SpeechEventType\"L\n\017Spee" +
-      "chEventType\022\034\n\030SPEECH_EVENT_UNSPECIFIED\020" +
-      "\000\022\033\n\027END_OF_SINGLE_UTTERANCE\020\001\"\215\001\n\032Strea" +
-      "mingRecognitionResult\022J\n\014alternatives\030\001 " +
-      "\003(\01324.google.cloud.speech.v1.SpeechRecog" +
-      "nitionAlternative\022\020\n\010is_final\030\002 \001(\010\022\021\n\ts" +
-      "tability\030\003 \001(\002\"e\n\027SpeechRecognitionResul" +
-      "t\022J\n\014alternatives\030\001 \003(\01324.google.cloud.s" +
-      "peech.v1.SpeechRecognitionAlternative\"w\n" +
-      "\034SpeechRecognitionAlternative\022\022\n\ntranscr" +
-      "ipt\030\001 \001(\t\022\022\n\nconfidence\030\002 \001(\002\022/\n\005words\030\003" +
-      " \003(\0132 .google.cloud.speech.v1.WordInfo\"t" +
-      "\n\010WordInfo\022-\n\nstart_time\030\001 \001(\0132\031.google." +
-      "protobuf.Duration\022+\n\010end_time\030\002 \001(\0132\031.go" +
-      "ogle.protobuf.Duration\022\014\n\004word\030\003 \001(\t2\246\003\n" +
-      "\006Speech\022\201\001\n\tRecognize\022(.google.cloud.spe" +
-      "ech.v1.RecognizeRequest\032).google.cloud.s" +
-      "peech.v1.RecognizeResponse\"\037\202\323\344\223\002\031\"\024/v1/" +
-      "speech:recognize:\001*\022\226\001\n\024LongRunningRecog" +
-      "nize\0223.google.cloud.speech.v1.LongRunnin" +
-      "gRecognizeRequest\032\035.google.longrunning.O" +
-      "peration\"*\202\323\344\223\002$\"\037/v1/speech:longrunning" +
-      "recognize:\001*\022\177\n\022StreamingRecognize\0221.goo" +
-      "gle.cloud.speech.v1.StreamingRecognizeRe" +
-      "quest\0322.google.cloud.speech.v1.Streaming" +
-      "RecognizeResponse(\0010\001Bl\n\032com.google.clou" +
-      "d.speech.v1B\013SpeechProtoP\001Z\n\017speech_contexts" +
+      "\030\006 \003(\0132%.google.cloud.speech.v1.SpeechCo" +
+      "ntext\022 \n\030enable_word_time_offsets\030\010 \001(\010\022" +
+      "$\n\034enable_automatic_punctuation\030\013 \001(\010\022\r\n",
+      "\005model\030\r \001(\t\022\024\n\014use_enhanced\030\016 \001(\010\"\213\001\n\rA" +
+      "udioEncoding\022\030\n\024ENCODING_UNSPECIFIED\020\000\022\014" +
+      "\n\010LINEAR16\020\001\022\010\n\004FLAC\020\002\022\t\n\005MULAW\020\003\022\007\n\003AMR" +
+      "\020\004\022\n\n\006AMR_WB\020\005\022\014\n\010OGG_OPUS\020\006\022\032\n\026SPEEX_WI" +
+      "TH_HEADER_BYTE\020\007\" \n\rSpeechContext\022\017\n\007phr" +
+      "ases\030\001 \003(\t\"D\n\020RecognitionAudio\022\021\n\007conten" +
+      "t\030\001 \001(\014H\000\022\r\n\003uri\030\002 \001(\tH\000B\016\n\014audio_source" +
+      "\"U\n\021RecognizeResponse\022@\n\007results\030\002 \003(\0132/" +
+      ".google.cloud.speech.v1.SpeechRecognitio" +
+      "nResult\"`\n\034LongRunningRecognizeResponse\022",
+      "@\n\007results\030\002 \003(\0132/.google.cloud.speech.v" +
+      "1.SpeechRecognitionResult\"\236\001\n\034LongRunnin" +
+      "gRecognizeMetadata\022\030\n\020progress_percent\030\001" +
+      " \001(\005\022.\n\nstart_time\030\002 \001(\0132\032.google.protob" +
+      "uf.Timestamp\0224\n\020last_update_time\030\003 \001(\0132\032" +
+      ".google.protobuf.Timestamp\"\261\002\n\032Streaming" +
+      "RecognizeResponse\022!\n\005error\030\001 \001(\0132\022.googl" +
+      "e.rpc.Status\022C\n\007results\030\002 \003(\01322.google.c" +
+      "loud.speech.v1.StreamingRecognitionResul" +
+      "t\022]\n\021speech_event_type\030\004 \001(\0162B.google.cl",
+      "oud.speech.v1.StreamingRecognizeResponse" +
+      ".SpeechEventType\"L\n\017SpeechEventType\022\034\n\030S" +
+      "PEECH_EVENT_UNSPECIFIED\020\000\022\033\n\027END_OF_SING" +
+      "LE_UTTERANCE\020\001\"\215\001\n\032StreamingRecognitionR" +
+      "esult\022J\n\014alternatives\030\001 \003(\01324.google.clo" +
+      "ud.speech.v1.SpeechRecognitionAlternativ" +
+      "e\022\020\n\010is_final\030\002 \001(\010\022\021\n\tstability\030\003 \001(\002\"e" +
+      "\n\027SpeechRecognitionResult\022J\n\014alternative" +
+      "s\030\001 \003(\01324.google.cloud.speech.v1.SpeechR" +
+      "ecognitionAlternative\"w\n\034SpeechRecogniti",
+      "onAlternative\022\022\n\ntranscript\030\001 \001(\t\022\022\n\ncon" +
+      "fidence\030\002 \001(\002\022/\n\005words\030\003 \003(\0132 .google.cl" +
+      "oud.speech.v1.WordInfo\"t\n\010WordInfo\022-\n\nst" +
+      "art_time\030\001 \001(\0132\031.google.protobuf.Duratio" +
+      "n\022+\n\010end_time\030\002 \001(\0132\031.google.protobuf.Du" +
+      "ration\022\014\n\004word\030\003 \001(\t2\251\003\n\006Speech\022\201\001\n\tReco" +
+      "gnize\022(.google.cloud.speech.v1.Recognize" +
+      "Request\032).google.cloud.speech.v1.Recogni" +
+      "zeResponse\"\037\202\323\344\223\002\031\"\024/v1/speech:recognize" +
+      ":\001*\022\226\001\n\024LongRunningRecognize\0223.google.cl",
+      "oud.speech.v1.LongRunningRecognizeReques" +
+      "t\032\035.google.longrunning.Operation\"*\202\323\344\223\002$" +
+      "\"\037/v1/speech:longrunningrecognize:\001*\022\201\001\n" +
+      "\022StreamingRecognize\0221.google.cloud.speec" +
+      "h.v1.StreamingRecognizeRequest\0322.google." +
+      "cloud.speech.v1.StreamingRecognizeRespon" +
+      "se\"\000(\0010\001Bl\n\032com.google.cloud.speech.v1B\013" +
+      "SpeechProtoP\001Z
-   * *Output-only* Transcript text representing the words that the user spoke.
+   * Output only. Transcript text representing the words that the user spoke.
    * 
    *
    * string transcript = 1;
@@ -128,7 +124,7 @@ public java.lang.String getTranscript() {
   }
   /**
    * 
-   * *Output-only* Transcript text representing the words that the user spoke.
+   * Output only. Transcript text representing the words that the user spoke.
    * 

    *
    * string transcript = 1;
@@ -151,11 +147,12 @@ public java.lang.String getTranscript() {
   private float confidence_;
   /**
    * 
-   * *Output-only* The confidence estimate between 0.0 and 1.0. A higher number
+   * Output only. The confidence estimate between 0.0 and 1.0. A higher number
    * indicates an estimated greater likelihood that the recognized words are
-   * correct. This field is typically provided only for the top hypothesis, and
-   * only for `is_final=true` results. Clients should not rely on the
-   * `confidence` field as it is not guaranteed to be accurate or consistent.
+   * correct. This field is set only for the top alternative of a non-streaming
+   * result or, of a streaming result where `is_final=true`.
+   * This field is not guaranteed to be accurate and users should not rely on it
+   * to be always provided.
    * The default of 0.0 is a sentinel value indicating `confidence` was not set.
    * 

    *
@@ -169,7 +166,7 @@ public float getConfidence() {
   private java.util.List words_;
   /**
    * 
-   * *Output-only* A list of word-specific information for each recognized word.
+   * Output only. A list of word-specific information for each recognized word.
    * 

    *
    * repeated .google.cloud.speech.v1.WordInfo words = 3;
@@ -179,7 +176,7 @@ public java.util.List getWordsList() {
   }
   /**
    * 
-   * *Output-only* A list of word-specific information for each recognized word.
+   * Output only. A list of word-specific information for each recognized word.
    * 

    *
    * repeated .google.cloud.speech.v1.WordInfo words = 3;
@@ -190,7 +187,7 @@ public java.util.List getWordsList() {
   }
   /**
    * 
-   * *Output-only* A list of word-specific information for each recognized word.
+   * Output only. A list of word-specific information for each recognized word.
    * 

    *
    * repeated .google.cloud.speech.v1.WordInfo words = 3;
@@ -200,7 +197,7 @@ public int getWordsCount() {
   }
   /**
    * 
-   * *Output-only* A list of word-specific information for each recognized word.
+   * Output only. A list of word-specific information for each recognized word.
    * 

    *
    * repeated .google.cloud.speech.v1.WordInfo words = 3;
@@ -210,7 +207,7 @@ public com.google.cloud.speech.v1.WordInfo getWords(int index) {
   }
   /**
    * 
-   * *Output-only* A list of word-specific information for each recognized word.
+   * Output only. A list of word-specific information for each recognized word.
    * 

    *
    * repeated .google.cloud.speech.v1.WordInfo words = 3;
@@ -221,7 +218,6 @@ public com.google.cloud.speech.v1.WordInfoOrBuilder getWordsOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -231,7 +227,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getTranscriptBytes().isEmpty()) {
@@ -246,7 +241,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -382,7 +376,6 @@ public static com.google.cloud.speech.v1.SpeechRecognitionAlternative parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -390,7 +383,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.speech.v1.SpeechRecognitionAlternative prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -418,7 +410,6 @@ public static final class Builder extends
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_SpeechRecognitionAlternative_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_SpeechRecognitionAlternative_fieldAccessorTable
@@ -442,7 +433,6 @@ private void maybeForceBuilderInitialization() {
         getWordsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       transcript_ = "";
@@ -458,18 +448,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_SpeechRecognitionAlternative_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.SpeechRecognitionAlternative getDefaultInstanceForType() {
       return com.google.cloud.speech.v1.SpeechRecognitionAlternative.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.SpeechRecognitionAlternative build() {
       com.google.cloud.speech.v1.SpeechRecognitionAlternative result = buildPartial();
       if (!result.isInitialized()) {
@@ -478,7 +465,6 @@ public com.google.cloud.speech.v1.SpeechRecognitionAlternative build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.SpeechRecognitionAlternative buildPartial() {
       com.google.cloud.speech.v1.SpeechRecognitionAlternative result = new com.google.cloud.speech.v1.SpeechRecognitionAlternative(this);
       int from_bitField0_ = bitField0_;
@@ -499,39 +485,32 @@ public com.google.cloud.speech.v1.SpeechRecognitionAlternative buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.speech.v1.SpeechRecognitionAlternative) {
         return mergeFrom((com.google.cloud.speech.v1.SpeechRecognitionAlternative)other);
@@ -581,12 +560,10 @@ public Builder mergeFrom(com.google.cloud.speech.v1.SpeechRecognitionAlternative
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -609,7 +586,7 @@ public Builder mergeFrom(
     private java.lang.Object transcript_ = "";
     /**
      * 
-     * *Output-only* Transcript text representing the words that the user spoke.
+     * Output only. Transcript text representing the words that the user spoke.
      * 

      *
      * string transcript = 1;
@@ -628,7 +605,7 @@ public java.lang.String getTranscript() {
     }
     /**
      * 
-     * *Output-only* Transcript text representing the words that the user spoke.
+     * Output only. Transcript text representing the words that the user spoke.
      * 

      *
      * string transcript = 1;
@@ -648,7 +625,7 @@ public java.lang.String getTranscript() {
     }
     /**
      * 
-     * *Output-only* Transcript text representing the words that the user spoke.
+     * Output only. Transcript text representing the words that the user spoke.
      * 

      *
      * string transcript = 1;
@@ -665,7 +642,7 @@ public Builder setTranscript(
     }
     /**
      * 
-     * *Output-only* Transcript text representing the words that the user spoke.
+     * Output only. Transcript text representing the words that the user spoke.
      * 

      *
      * string transcript = 1;
@@ -678,7 +655,7 @@ public Builder clearTranscript() {
     }
     /**
      * 
-     * *Output-only* Transcript text representing the words that the user spoke.
+     * Output only. Transcript text representing the words that the user spoke.
      * 

      *
      * string transcript = 1;
@@ -698,11 +675,12 @@ public Builder setTranscriptBytes(
     private float confidence_ ;
     /**
      * 
-     * *Output-only* The confidence estimate between 0.0 and 1.0. A higher number
+     * Output only. The confidence estimate between 0.0 and 1.0. A higher number
      * indicates an estimated greater likelihood that the recognized words are
-     * correct. This field is typically provided only for the top hypothesis, and
-     * only for `is_final=true` results. Clients should not rely on the
-     * `confidence` field as it is not guaranteed to be accurate or consistent.
+     * correct. This field is set only for the top alternative of a non-streaming
+     * result or, of a streaming result where `is_final=true`.
+     * This field is not guaranteed to be accurate and users should not rely on it
+     * to be always provided.
      * The default of 0.0 is a sentinel value indicating `confidence` was not set.
      * 

      *
@@ -713,11 +691,12 @@ public float getConfidence() {
     }
     /**
      * 
-     * *Output-only* The confidence estimate between 0.0 and 1.0. A higher number
+     * Output only. The confidence estimate between 0.0 and 1.0. A higher number
      * indicates an estimated greater likelihood that the recognized words are
-     * correct. This field is typically provided only for the top hypothesis, and
-     * only for `is_final=true` results. Clients should not rely on the
-     * `confidence` field as it is not guaranteed to be accurate or consistent.
+     * correct. This field is set only for the top alternative of a non-streaming
+     * result or, of a streaming result where `is_final=true`.
+     * This field is not guaranteed to be accurate and users should not rely on it
+     * to be always provided.
      * The default of 0.0 is a sentinel value indicating `confidence` was not set.
      * 

      *
@@ -731,11 +710,12 @@ public Builder setConfidence(float value) {
     }
     /**
      * 
-     * *Output-only* The confidence estimate between 0.0 and 1.0. A higher number
+     * Output only. The confidence estimate between 0.0 and 1.0. A higher number
      * indicates an estimated greater likelihood that the recognized words are
-     * correct. This field is typically provided only for the top hypothesis, and
-     * only for `is_final=true` results. Clients should not rely on the
-     * `confidence` field as it is not guaranteed to be accurate or consistent.
+     * correct. This field is set only for the top alternative of a non-streaming
+     * result or, of a streaming result where `is_final=true`.
+     * This field is not guaranteed to be accurate and users should not rely on it
+     * to be always provided.
      * The default of 0.0 is a sentinel value indicating `confidence` was not set.
      * 

      *
@@ -762,7 +742,7 @@ private void ensureWordsIsMutable() {
 
     /**
      * 
-     * *Output-only* A list of word-specific information for each recognized word.
+     * Output only. A list of word-specific information for each recognized word.
      * 

      *
      * repeated .google.cloud.speech.v1.WordInfo words = 3;
@@ -776,7 +756,7 @@ public java.util.List getWordsList() {
     }
     /**
      * 
-     * *Output-only* A list of word-specific information for each recognized word.
+     * Output only. A list of word-specific information for each recognized word.
      * 

      *
      * repeated .google.cloud.speech.v1.WordInfo words = 3;
@@ -790,7 +770,7 @@ public int getWordsCount() {
     }
     /**
      * 
-     * *Output-only* A list of word-specific information for each recognized word.
+     * Output only. A list of word-specific information for each recognized word.
      * 

      *
      * repeated .google.cloud.speech.v1.WordInfo words = 3;
@@ -804,7 +784,7 @@ public com.google.cloud.speech.v1.WordInfo getWords(int index) {
     }
     /**
      * 
-     * *Output-only* A list of word-specific information for each recognized word.
+     * Output only. A list of word-specific information for each recognized word.
      * 

      *
      * repeated .google.cloud.speech.v1.WordInfo words = 3;
@@ -825,7 +805,7 @@ public Builder setWords(
     }
     /**
      * 
-     * *Output-only* A list of word-specific information for each recognized word.
+     * Output only. A list of word-specific information for each recognized word.
      * 

      *
      * repeated .google.cloud.speech.v1.WordInfo words = 3;
@@ -843,7 +823,7 @@ public Builder setWords(
     }
     /**
      * 
-     * *Output-only* A list of word-specific information for each recognized word.
+     * Output only. A list of word-specific information for each recognized word.
      * 

      *
      * repeated .google.cloud.speech.v1.WordInfo words = 3;
@@ -863,7 +843,7 @@ public Builder addWords(com.google.cloud.speech.v1.WordInfo value) {
     }
     /**
      * 
-     * *Output-only* A list of word-specific information for each recognized word.
+     * Output only. A list of word-specific information for each recognized word.
      * 

      *
      * repeated .google.cloud.speech.v1.WordInfo words = 3;
@@ -884,7 +864,7 @@ public Builder addWords(
     }
     /**
      * 
-     * *Output-only* A list of word-specific information for each recognized word.
+     * Output only. A list of word-specific information for each recognized word.
      * 

      *
      * repeated .google.cloud.speech.v1.WordInfo words = 3;
@@ -902,7 +882,7 @@ public Builder addWords(
     }
     /**
      * 
-     * *Output-only* A list of word-specific information for each recognized word.
+     * Output only. A list of word-specific information for each recognized word.
      * 

      *
      * repeated .google.cloud.speech.v1.WordInfo words = 3;
@@ -920,7 +900,7 @@ public Builder addWords(
     }
     /**
      * 
-     * *Output-only* A list of word-specific information for each recognized word.
+     * Output only. A list of word-specific information for each recognized word.
      * 

      *
      * repeated .google.cloud.speech.v1.WordInfo words = 3;
@@ -939,7 +919,7 @@ public Builder addAllWords(
     }
     /**
      * 
-     * *Output-only* A list of word-specific information for each recognized word.
+     * Output only. A list of word-specific information for each recognized word.
      * 

      *
      * repeated .google.cloud.speech.v1.WordInfo words = 3;
@@ -956,7 +936,7 @@ public Builder clearWords() {
     }
     /**
      * 
-     * *Output-only* A list of word-specific information for each recognized word.
+     * Output only. A list of word-specific information for each recognized word.
      * 

      *
      * repeated .google.cloud.speech.v1.WordInfo words = 3;
@@ -973,7 +953,7 @@ public Builder removeWords(int index) {
     }
     /**
      * 
-     * *Output-only* A list of word-specific information for each recognized word.
+     * Output only. A list of word-specific information for each recognized word.
      * 

      *
      * repeated .google.cloud.speech.v1.WordInfo words = 3;
@@ -984,7 +964,7 @@ public com.google.cloud.speech.v1.WordInfo.Builder getWordsBuilder(
     }
     /**
      * 
-     * *Output-only* A list of word-specific information for each recognized word.
+     * Output only. A list of word-specific information for each recognized word.
      * 

      *
      * repeated .google.cloud.speech.v1.WordInfo words = 3;
@@ -998,7 +978,7 @@ public com.google.cloud.speech.v1.WordInfoOrBuilder getWordsOrBuilder(
     }
     /**
      * 
-     * *Output-only* A list of word-specific information for each recognized word.
+     * Output only. A list of word-specific information for each recognized word.
      * 

      *
      * repeated .google.cloud.speech.v1.WordInfo words = 3;
@@ -1013,7 +993,7 @@ public com.google.cloud.speech.v1.WordInfoOrBuilder getWordsOrBuilder(
     }
     /**
      * 
-     * *Output-only* A list of word-specific information for each recognized word.
+     * Output only. A list of word-specific information for each recognized word.
      * 

      *
      * repeated .google.cloud.speech.v1.WordInfo words = 3;
@@ -1024,7 +1004,7 @@ public com.google.cloud.speech.v1.WordInfo.Builder addWordsBuilder() {
     }
     /**
      * 
-     * *Output-only* A list of word-specific information for each recognized word.
+     * Output only. A list of word-specific information for each recognized word.
      * 

      *
      * repeated .google.cloud.speech.v1.WordInfo words = 3;
@@ -1036,7 +1016,7 @@ public com.google.cloud.speech.v1.WordInfo.Builder addWordsBuilder(
     }
     /**
      * 
-     * *Output-only* A list of word-specific information for each recognized word.
+     * Output only. A list of word-specific information for each recognized word.
      * 

      *
      * repeated .google.cloud.speech.v1.WordInfo words = 3;
@@ -1059,13 +1039,11 @@ public com.google.cloud.speech.v1.WordInfo.Builder addWordsBuilder(
       }
       return wordsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1087,12 +1065,11 @@ public static com.google.cloud.speech.v1.SpeechRecognitionAlternative getDefault
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SpeechRecognitionAlternative parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SpeechRecognitionAlternative(input, extensionRegistry);
+        return new SpeechRecognitionAlternative(input, extensionRegistry);
     }
   };
 
@@ -1105,7 +1082,6 @@ public com.google.protobuf.Parser getParserForType
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.speech.v1.SpeechRecognitionAlternative getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechRecognitionAlternativeOrBuilder.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechRecognitionAlternativeOrBuilder.java
index 94475e096b29..fcf59872789f 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechRecognitionAlternativeOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechRecognitionAlternativeOrBuilder.java
@@ -9,7 +9,7 @@ public interface SpeechRecognitionAlternativeOrBuilder extends
 
   /**
    * 
-   * *Output-only* Transcript text representing the words that the user spoke.
+   * Output only. Transcript text representing the words that the user spoke.
    * 

    *
    * string transcript = 1;
@@ -17,7 +17,7 @@ public interface SpeechRecognitionAlternativeOrBuilder extends
   java.lang.String getTranscript();
   /**
    * 
-   * *Output-only* Transcript text representing the words that the user spoke.
+   * Output only. Transcript text representing the words that the user spoke.
    * 

    *
    * string transcript = 1;
@@ -27,11 +27,12 @@ public interface SpeechRecognitionAlternativeOrBuilder extends
 
   /**
    * 
-   * *Output-only* The confidence estimate between 0.0 and 1.0. A higher number
+   * Output only. The confidence estimate between 0.0 and 1.0. A higher number
    * indicates an estimated greater likelihood that the recognized words are
-   * correct. This field is typically provided only for the top hypothesis, and
-   * only for `is_final=true` results. Clients should not rely on the
-   * `confidence` field as it is not guaranteed to be accurate or consistent.
+   * correct. This field is set only for the top alternative of a non-streaming
+   * result or, of a streaming result where `is_final=true`.
+   * This field is not guaranteed to be accurate and users should not rely on it
+   * to be always provided.
    * The default of 0.0 is a sentinel value indicating `confidence` was not set.
    * 

    *
@@ -41,7 +42,7 @@ public interface SpeechRecognitionAlternativeOrBuilder extends
 
   /**
    * 
-   * *Output-only* A list of word-specific information for each recognized word.
+   * Output only. A list of word-specific information for each recognized word.
    * 

    *
    * repeated .google.cloud.speech.v1.WordInfo words = 3;
@@ -50,7 +51,7 @@ public interface SpeechRecognitionAlternativeOrBuilder extends
       getWordsList();
   /**
    * 
-   * *Output-only* A list of word-specific information for each recognized word.
+   * Output only. A list of word-specific information for each recognized word.
    * 

    *
    * repeated .google.cloud.speech.v1.WordInfo words = 3;
@@ -58,7 +59,7 @@ public interface SpeechRecognitionAlternativeOrBuilder extends
   com.google.cloud.speech.v1.WordInfo getWords(int index);
   /**
    * 
-   * *Output-only* A list of word-specific information for each recognized word.
+   * Output only. A list of word-specific information for each recognized word.
    * 

    *
    * repeated .google.cloud.speech.v1.WordInfo words = 3;
@@ -66,7 +67,7 @@ public interface SpeechRecognitionAlternativeOrBuilder extends
   int getWordsCount();
   /**
    * 
-   * *Output-only* A list of word-specific information for each recognized word.
+   * Output only. A list of word-specific information for each recognized word.
    * 

    *
    * repeated .google.cloud.speech.v1.WordInfo words = 3;
@@ -75,7 +76,7 @@ public interface SpeechRecognitionAlternativeOrBuilder extends
       getWordsOrBuilderList();
   /**
    * 
-   * *Output-only* A list of word-specific information for each recognized word.
+   * Output only. A list of word-specific information for each recognized word.
    * 

    *
    * repeated .google.cloud.speech.v1.WordInfo words = 3;
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechRecognitionResult.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechRecognitionResult.java
index 67f33c6305be..4580d72cc070 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechRecognitionResult.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechRecognitionResult.java
@@ -33,9 +33,6 @@ private SpeechRecognitionResult(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private SpeechRecognitionResult(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               alternatives_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private SpeechRecognitionResult(
                 input.readMessage(com.google.cloud.speech.v1.SpeechRecognitionAlternative.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private SpeechRecognitionResult(
     return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_SpeechRecognitionResult_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_SpeechRecognitionResult_fieldAccessorTable
@@ -95,7 +91,7 @@ private SpeechRecognitionResult(
   private java.util.List alternatives_;
   /**
    * 
-   * *Output-only* May contain one or more recognition hypotheses (up to the
+   * Output only. May contain one or more recognition hypotheses (up to the
    * maximum specified in `max_alternatives`).
    * These alternatives are ordered in terms of accuracy, with the top (first)
    * alternative being the most probable, as ranked by the recognizer.
@@ -108,7 +104,7 @@ public java.util.List g
   }
   /**
    * 
-   * *Output-only* May contain one or more recognition hypotheses (up to the
+   * Output only. May contain one or more recognition hypotheses (up to the
    * maximum specified in `max_alternatives`).
    * These alternatives are ordered in terms of accuracy, with the top (first)
    * alternative being the most probable, as ranked by the recognizer.
@@ -122,7 +118,7 @@ public java.util.List g
   }
   /**
    * 
-   * *Output-only* May contain one or more recognition hypotheses (up to the
+   * Output only. May contain one or more recognition hypotheses (up to the
    * maximum specified in `max_alternatives`).
    * These alternatives are ordered in terms of accuracy, with the top (first)
    * alternative being the most probable, as ranked by the recognizer.
@@ -135,7 +131,7 @@ public int getAlternativesCount() {
   }
   /**
    * 
-   * *Output-only* May contain one or more recognition hypotheses (up to the
+   * Output only. May contain one or more recognition hypotheses (up to the
    * maximum specified in `max_alternatives`).
    * These alternatives are ordered in terms of accuracy, with the top (first)
    * alternative being the most probable, as ranked by the recognizer.
@@ -148,7 +144,7 @@ public com.google.cloud.speech.v1.SpeechRecognitionAlternative getAlternatives(i
   }
   /**
    * 
-   * *Output-only* May contain one or more recognition hypotheses (up to the
+   * Output only. May contain one or more recognition hypotheses (up to the
    * maximum specified in `max_alternatives`).
    * These alternatives are ordered in terms of accuracy, with the top (first)
    * alternative being the most probable, as ranked by the recognizer.
@@ -162,7 +158,6 @@ public com.google.cloud.speech.v1.SpeechRecognitionAlternativeOrBuilder getAlter
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -172,7 +167,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < alternatives_.size(); i++) {
@@ -181,7 +175,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -299,7 +292,6 @@ public static com.google.cloud.speech.v1.SpeechRecognitionResult parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -307,7 +299,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.speech.v1.SpeechRecognitionResult prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -335,7 +326,6 @@ public static final class Builder extends
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_SpeechRecognitionResult_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_SpeechRecognitionResult_fieldAccessorTable
@@ -359,7 +349,6 @@ private void maybeForceBuilderInitialization() {
         getAlternativesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (alternativesBuilder_ == null) {
@@ -371,18 +360,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_SpeechRecognitionResult_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.SpeechRecognitionResult getDefaultInstanceForType() {
       return com.google.cloud.speech.v1.SpeechRecognitionResult.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.SpeechRecognitionResult build() {
       com.google.cloud.speech.v1.SpeechRecognitionResult result = buildPartial();
       if (!result.isInitialized()) {
@@ -391,7 +377,6 @@ public com.google.cloud.speech.v1.SpeechRecognitionResult build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.SpeechRecognitionResult buildPartial() {
       com.google.cloud.speech.v1.SpeechRecognitionResult result = new com.google.cloud.speech.v1.SpeechRecognitionResult(this);
       int from_bitField0_ = bitField0_;
@@ -408,39 +393,32 @@ public com.google.cloud.speech.v1.SpeechRecognitionResult buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.speech.v1.SpeechRecognitionResult) {
         return mergeFrom((com.google.cloud.speech.v1.SpeechRecognitionResult)other);
@@ -483,12 +461,10 @@ public Builder mergeFrom(com.google.cloud.speech.v1.SpeechRecognitionResult othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -522,7 +498,7 @@ private void ensureAlternativesIsMutable() {
 
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
      * These alternatives are ordered in terms of accuracy, with the top (first)
      * alternative being the most probable, as ranked by the recognizer.
@@ -539,7 +515,7 @@ public java.util.List g
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
      * These alternatives are ordered in terms of accuracy, with the top (first)
      * alternative being the most probable, as ranked by the recognizer.
@@ -556,7 +532,7 @@ public int getAlternativesCount() {
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
      * These alternatives are ordered in terms of accuracy, with the top (first)
      * alternative being the most probable, as ranked by the recognizer.
@@ -573,7 +549,7 @@ public com.google.cloud.speech.v1.SpeechRecognitionAlternative getAlternatives(i
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
      * These alternatives are ordered in terms of accuracy, with the top (first)
      * alternative being the most probable, as ranked by the recognizer.
@@ -597,7 +573,7 @@ public Builder setAlternatives(
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
      * These alternatives are ordered in terms of accuracy, with the top (first)
      * alternative being the most probable, as ranked by the recognizer.
@@ -618,7 +594,7 @@ public Builder setAlternatives(
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
      * These alternatives are ordered in terms of accuracy, with the top (first)
      * alternative being the most probable, as ranked by the recognizer.
@@ -641,7 +617,7 @@ public Builder addAlternatives(com.google.cloud.speech.v1.SpeechRecognitionAlter
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
      * These alternatives are ordered in terms of accuracy, with the top (first)
      * alternative being the most probable, as ranked by the recognizer.
@@ -665,7 +641,7 @@ public Builder addAlternatives(
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
      * These alternatives are ordered in terms of accuracy, with the top (first)
      * alternative being the most probable, as ranked by the recognizer.
@@ -686,7 +662,7 @@ public Builder addAlternatives(
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
      * These alternatives are ordered in terms of accuracy, with the top (first)
      * alternative being the most probable, as ranked by the recognizer.
@@ -707,7 +683,7 @@ public Builder addAlternatives(
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
      * These alternatives are ordered in terms of accuracy, with the top (first)
      * alternative being the most probable, as ranked by the recognizer.
@@ -729,7 +705,7 @@ public Builder addAllAlternatives(
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
      * These alternatives are ordered in terms of accuracy, with the top (first)
      * alternative being the most probable, as ranked by the recognizer.
@@ -749,7 +725,7 @@ public Builder clearAlternatives() {
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
      * These alternatives are ordered in terms of accuracy, with the top (first)
      * alternative being the most probable, as ranked by the recognizer.
@@ -769,7 +745,7 @@ public Builder removeAlternatives(int index) {
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
      * These alternatives are ordered in terms of accuracy, with the top (first)
      * alternative being the most probable, as ranked by the recognizer.
@@ -783,7 +759,7 @@ public com.google.cloud.speech.v1.SpeechRecognitionAlternative.Builder getAltern
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
      * These alternatives are ordered in terms of accuracy, with the top (first)
      * alternative being the most probable, as ranked by the recognizer.
@@ -800,7 +776,7 @@ public com.google.cloud.speech.v1.SpeechRecognitionAlternativeOrBuilder getAlter
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
      * These alternatives are ordered in terms of accuracy, with the top (first)
      * alternative being the most probable, as ranked by the recognizer.
@@ -818,7 +794,7 @@ public com.google.cloud.speech.v1.SpeechRecognitionAlternativeOrBuilder getAlter
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
      * These alternatives are ordered in terms of accuracy, with the top (first)
      * alternative being the most probable, as ranked by the recognizer.
@@ -832,7 +808,7 @@ public com.google.cloud.speech.v1.SpeechRecognitionAlternative.Builder addAltern
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
      * These alternatives are ordered in terms of accuracy, with the top (first)
      * alternative being the most probable, as ranked by the recognizer.
@@ -847,7 +823,7 @@ public com.google.cloud.speech.v1.SpeechRecognitionAlternative.Builder addAltern
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
      * These alternatives are ordered in terms of accuracy, with the top (first)
      * alternative being the most probable, as ranked by the recognizer.
@@ -873,13 +849,11 @@ public com.google.cloud.speech.v1.SpeechRecognitionAlternative.Builder addAltern
       }
       return alternativesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -901,12 +875,11 @@ public static com.google.cloud.speech.v1.SpeechRecognitionResult getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SpeechRecognitionResult parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SpeechRecognitionResult(input, extensionRegistry);
+        return new SpeechRecognitionResult(input, extensionRegistry);
     }
   };
 
@@ -919,7 +892,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.speech.v1.SpeechRecognitionResult getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechRecognitionResultOrBuilder.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechRecognitionResultOrBuilder.java
index 2d68008bb07e..014d98708e92 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechRecognitionResultOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/SpeechRecognitionResultOrBuilder.java
@@ -9,7 +9,7 @@ public interface SpeechRecognitionResultOrBuilder extends
 
   /**
    * 
-   * *Output-only* May contain one or more recognition hypotheses (up to the
+   * Output only. May contain one or more recognition hypotheses (up to the
    * maximum specified in `max_alternatives`).
    * These alternatives are ordered in terms of accuracy, with the top (first)
    * alternative being the most probable, as ranked by the recognizer.
@@ -21,7 +21,7 @@ public interface SpeechRecognitionResultOrBuilder extends
       getAlternativesList();
   /**
    * 
-   * *Output-only* May contain one or more recognition hypotheses (up to the
+   * Output only. May contain one or more recognition hypotheses (up to the
    * maximum specified in `max_alternatives`).
    * These alternatives are ordered in terms of accuracy, with the top (first)
    * alternative being the most probable, as ranked by the recognizer.
@@ -32,7 +32,7 @@ public interface SpeechRecognitionResultOrBuilder extends
   com.google.cloud.speech.v1.SpeechRecognitionAlternative getAlternatives(int index);
   /**
    * 
-   * *Output-only* May contain one or more recognition hypotheses (up to the
+   * Output only. May contain one or more recognition hypotheses (up to the
    * maximum specified in `max_alternatives`).
    * These alternatives are ordered in terms of accuracy, with the top (first)
    * alternative being the most probable, as ranked by the recognizer.
@@ -43,7 +43,7 @@ public interface SpeechRecognitionResultOrBuilder extends
   int getAlternativesCount();
   /**
    * 
-   * *Output-only* May contain one or more recognition hypotheses (up to the
+   * Output only. May contain one or more recognition hypotheses (up to the
    * maximum specified in `max_alternatives`).
    * These alternatives are ordered in terms of accuracy, with the top (first)
    * alternative being the most probable, as ranked by the recognizer.
@@ -55,7 +55,7 @@ public interface SpeechRecognitionResultOrBuilder extends
       getAlternativesOrBuilderList();
   /**
    * 
-   * *Output-only* May contain one or more recognition hypotheses (up to the
+   * Output only. May contain one or more recognition hypotheses (up to the
    * maximum specified in `max_alternatives`).
    * These alternatives are ordered in terms of accuracy, with the top (first)
    * alternative being the most probable, as ranked by the recognizer.
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognitionConfig.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognitionConfig.java
index 06e861207cbd..a792ec57ead3 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognitionConfig.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognitionConfig.java
@@ -35,9 +35,6 @@ private StreamingRecognitionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private StreamingRecognitionConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.speech.v1.RecognitionConfig.Builder subBuilder = null;
             if (config_ != null) {
@@ -72,13 +76,6 @@ private StreamingRecognitionConfig(
             interimResults_ = input.readBool();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private StreamingRecognitionConfig(
     return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_StreamingRecognitionConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_StreamingRecognitionConfig_fieldAccessorTable
@@ -179,7 +175,6 @@ public boolean getInterimResults() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -189,7 +184,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (config_ != null) {
@@ -204,7 +198,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -343,7 +336,6 @@ public static com.google.cloud.speech.v1.StreamingRecognitionConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -351,7 +343,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.speech.v1.StreamingRecognitionConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -380,7 +371,6 @@ public static final class Builder extends
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_StreamingRecognitionConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_StreamingRecognitionConfig_fieldAccessorTable
@@ -403,7 +393,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (configBuilder_ == null) {
@@ -419,18 +408,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_StreamingRecognitionConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.StreamingRecognitionConfig getDefaultInstanceForType() {
       return com.google.cloud.speech.v1.StreamingRecognitionConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.StreamingRecognitionConfig build() {
       com.google.cloud.speech.v1.StreamingRecognitionConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -439,7 +425,6 @@ public com.google.cloud.speech.v1.StreamingRecognitionConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.StreamingRecognitionConfig buildPartial() {
       com.google.cloud.speech.v1.StreamingRecognitionConfig result = new com.google.cloud.speech.v1.StreamingRecognitionConfig(this);
       if (configBuilder_ == null) {
@@ -453,39 +438,32 @@ public com.google.cloud.speech.v1.StreamingRecognitionConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.speech.v1.StreamingRecognitionConfig) {
         return mergeFrom((com.google.cloud.speech.v1.StreamingRecognitionConfig)other);
@@ -511,12 +489,10 @@ public Builder mergeFrom(com.google.cloud.speech.v1.StreamingRecognitionConfig o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -808,13 +784,11 @@ public Builder clearInterimResults() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -836,12 +810,11 @@ public static com.google.cloud.speech.v1.StreamingRecognitionConfig getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public StreamingRecognitionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StreamingRecognitionConfig(input, extensionRegistry);
+        return new StreamingRecognitionConfig(input, extensionRegistry);
     }
   };
 
@@ -854,7 +827,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.speech.v1.StreamingRecognitionConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognitionResult.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognitionResult.java
index 0641e4405b2d..ab22e64542ee 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognitionResult.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognitionResult.java
@@ -36,9 +36,6 @@ private StreamingRecognitionResult(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private StreamingRecognitionResult(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               alternatives_ = new java.util.ArrayList();
@@ -69,13 +73,6 @@ private StreamingRecognitionResult(
             stability_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private StreamingRecognitionResult(
     return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_StreamingRecognitionResult_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_StreamingRecognitionResult_fieldAccessorTable
@@ -109,8 +105,10 @@ private StreamingRecognitionResult(
   private java.util.List alternatives_;
   /**
    * 
-   * *Output-only* May contain one or more recognition hypotheses (up to the
+   * Output only. May contain one or more recognition hypotheses (up to the
    * maximum specified in `max_alternatives`).
+   * These alternatives are ordered in terms of accuracy, with the top (first)
+   * alternative being the most probable, as ranked by the recognizer.
    * 

    *
    * repeated .google.cloud.speech.v1.SpeechRecognitionAlternative alternatives = 1;
@@ -120,8 +118,10 @@ public java.util.List g
   }
   /**
    * 
-   * *Output-only* May contain one or more recognition hypotheses (up to the
+   * Output only. May contain one or more recognition hypotheses (up to the
    * maximum specified in `max_alternatives`).
+   * These alternatives are ordered in terms of accuracy, with the top (first)
+   * alternative being the most probable, as ranked by the recognizer.
    * 

    *
    * repeated .google.cloud.speech.v1.SpeechRecognitionAlternative alternatives = 1;
@@ -132,8 +132,10 @@ public java.util.List g
   }
   /**
    * 
-   * *Output-only* May contain one or more recognition hypotheses (up to the
+   * Output only. May contain one or more recognition hypotheses (up to the
    * maximum specified in `max_alternatives`).
+   * These alternatives are ordered in terms of accuracy, with the top (first)
+   * alternative being the most probable, as ranked by the recognizer.
    * 

    *
    * repeated .google.cloud.speech.v1.SpeechRecognitionAlternative alternatives = 1;
@@ -143,8 +145,10 @@ public int getAlternativesCount() {
   }
   /**
    * 
-   * *Output-only* May contain one or more recognition hypotheses (up to the
+   * Output only. May contain one or more recognition hypotheses (up to the
    * maximum specified in `max_alternatives`).
+   * These alternatives are ordered in terms of accuracy, with the top (first)
+   * alternative being the most probable, as ranked by the recognizer.
    * 

    *
    * repeated .google.cloud.speech.v1.SpeechRecognitionAlternative alternatives = 1;
@@ -154,8 +158,10 @@ public com.google.cloud.speech.v1.SpeechRecognitionAlternative getAlternatives(i
   }
   /**
    * 
-   * *Output-only* May contain one or more recognition hypotheses (up to the
+   * Output only. May contain one or more recognition hypotheses (up to the
    * maximum specified in `max_alternatives`).
+   * These alternatives are ordered in terms of accuracy, with the top (first)
+   * alternative being the most probable, as ranked by the recognizer.
    * 

    *
    * repeated .google.cloud.speech.v1.SpeechRecognitionAlternative alternatives = 1;
@@ -169,7 +175,7 @@ public com.google.cloud.speech.v1.SpeechRecognitionAlternativeOrBuilder getAlter
   private boolean isFinal_;
   /**
    * 
-   * *Output-only* If `false`, this `StreamingRecognitionResult` represents an
+   * Output only. If `false`, this `StreamingRecognitionResult` represents an
    * interim result that may change. If `true`, this is the final time the
    * speech service will return this particular `StreamingRecognitionResult`,
    * the recognizer will not return any further hypotheses for this portion of
@@ -186,7 +192,7 @@ public boolean getIsFinal() {
   private float stability_;
   /**
    * 
-   * *Output-only* An estimate of the likelihood that the recognizer will not
+   * Output only. An estimate of the likelihood that the recognizer will not
    * change its guess about this interim result. Values range from 0.0
    * (completely unstable) to 1.0 (completely stable).
    * This field is only provided for interim results (`is_final=false`).
@@ -200,7 +206,6 @@ public float getStability() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -210,7 +215,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < alternatives_.size(); i++) {
@@ -225,7 +229,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -363,7 +366,6 @@ public static com.google.cloud.speech.v1.StreamingRecognitionResult parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -371,7 +373,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.speech.v1.StreamingRecognitionResult prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -400,7 +401,6 @@ public static final class Builder extends
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_StreamingRecognitionResult_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_StreamingRecognitionResult_fieldAccessorTable
@@ -424,7 +424,6 @@ private void maybeForceBuilderInitialization() {
         getAlternativesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (alternativesBuilder_ == null) {
@@ -440,18 +439,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_StreamingRecognitionResult_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.StreamingRecognitionResult getDefaultInstanceForType() {
       return com.google.cloud.speech.v1.StreamingRecognitionResult.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.StreamingRecognitionResult build() {
       com.google.cloud.speech.v1.StreamingRecognitionResult result = buildPartial();
       if (!result.isInitialized()) {
@@ -460,7 +456,6 @@ public com.google.cloud.speech.v1.StreamingRecognitionResult build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.StreamingRecognitionResult buildPartial() {
       com.google.cloud.speech.v1.StreamingRecognitionResult result = new com.google.cloud.speech.v1.StreamingRecognitionResult(this);
       int from_bitField0_ = bitField0_;
@@ -481,39 +476,32 @@ public com.google.cloud.speech.v1.StreamingRecognitionResult buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.speech.v1.StreamingRecognitionResult) {
         return mergeFrom((com.google.cloud.speech.v1.StreamingRecognitionResult)other);
@@ -562,12 +550,10 @@ public Builder mergeFrom(com.google.cloud.speech.v1.StreamingRecognitionResult o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -601,8 +587,10 @@ private void ensureAlternativesIsMutable() {
 
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
+     * These alternatives are ordered in terms of accuracy, with the top (first)
+     * alternative being the most probable, as ranked by the recognizer.
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechRecognitionAlternative alternatives = 1;
@@ -616,8 +604,10 @@ public java.util.List g
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
+     * These alternatives are ordered in terms of accuracy, with the top (first)
+     * alternative being the most probable, as ranked by the recognizer.
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechRecognitionAlternative alternatives = 1;
@@ -631,8 +621,10 @@ public int getAlternativesCount() {
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
+     * These alternatives are ordered in terms of accuracy, with the top (first)
+     * alternative being the most probable, as ranked by the recognizer.
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechRecognitionAlternative alternatives = 1;
@@ -646,8 +638,10 @@ public com.google.cloud.speech.v1.SpeechRecognitionAlternative getAlternatives(i
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
+     * These alternatives are ordered in terms of accuracy, with the top (first)
+     * alternative being the most probable, as ranked by the recognizer.
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechRecognitionAlternative alternatives = 1;
@@ -668,8 +662,10 @@ public Builder setAlternatives(
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
+     * These alternatives are ordered in terms of accuracy, with the top (first)
+     * alternative being the most probable, as ranked by the recognizer.
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechRecognitionAlternative alternatives = 1;
@@ -687,8 +683,10 @@ public Builder setAlternatives(
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
+     * These alternatives are ordered in terms of accuracy, with the top (first)
+     * alternative being the most probable, as ranked by the recognizer.
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechRecognitionAlternative alternatives = 1;
@@ -708,8 +706,10 @@ public Builder addAlternatives(com.google.cloud.speech.v1.SpeechRecognitionAlter
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
+     * These alternatives are ordered in terms of accuracy, with the top (first)
+     * alternative being the most probable, as ranked by the recognizer.
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechRecognitionAlternative alternatives = 1;
@@ -730,8 +730,10 @@ public Builder addAlternatives(
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
+     * These alternatives are ordered in terms of accuracy, with the top (first)
+     * alternative being the most probable, as ranked by the recognizer.
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechRecognitionAlternative alternatives = 1;
@@ -749,8 +751,10 @@ public Builder addAlternatives(
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
+     * These alternatives are ordered in terms of accuracy, with the top (first)
+     * alternative being the most probable, as ranked by the recognizer.
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechRecognitionAlternative alternatives = 1;
@@ -768,8 +772,10 @@ public Builder addAlternatives(
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
+     * These alternatives are ordered in terms of accuracy, with the top (first)
+     * alternative being the most probable, as ranked by the recognizer.
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechRecognitionAlternative alternatives = 1;
@@ -788,8 +794,10 @@ public Builder addAllAlternatives(
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
+     * These alternatives are ordered in terms of accuracy, with the top (first)
+     * alternative being the most probable, as ranked by the recognizer.
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechRecognitionAlternative alternatives = 1;
@@ -806,8 +814,10 @@ public Builder clearAlternatives() {
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
+     * These alternatives are ordered in terms of accuracy, with the top (first)
+     * alternative being the most probable, as ranked by the recognizer.
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechRecognitionAlternative alternatives = 1;
@@ -824,8 +834,10 @@ public Builder removeAlternatives(int index) {
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
+     * These alternatives are ordered in terms of accuracy, with the top (first)
+     * alternative being the most probable, as ranked by the recognizer.
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechRecognitionAlternative alternatives = 1;
@@ -836,8 +848,10 @@ public com.google.cloud.speech.v1.SpeechRecognitionAlternative.Builder getAltern
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
+     * These alternatives are ordered in terms of accuracy, with the top (first)
+     * alternative being the most probable, as ranked by the recognizer.
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechRecognitionAlternative alternatives = 1;
@@ -851,8 +865,10 @@ public com.google.cloud.speech.v1.SpeechRecognitionAlternativeOrBuilder getAlter
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
+     * These alternatives are ordered in terms of accuracy, with the top (first)
+     * alternative being the most probable, as ranked by the recognizer.
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechRecognitionAlternative alternatives = 1;
@@ -867,8 +883,10 @@ public com.google.cloud.speech.v1.SpeechRecognitionAlternativeOrBuilder getAlter
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
+     * These alternatives are ordered in terms of accuracy, with the top (first)
+     * alternative being the most probable, as ranked by the recognizer.
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechRecognitionAlternative alternatives = 1;
@@ -879,8 +897,10 @@ public com.google.cloud.speech.v1.SpeechRecognitionAlternative.Builder addAltern
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
+     * These alternatives are ordered in terms of accuracy, with the top (first)
+     * alternative being the most probable, as ranked by the recognizer.
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechRecognitionAlternative alternatives = 1;
@@ -892,8 +912,10 @@ public com.google.cloud.speech.v1.SpeechRecognitionAlternative.Builder addAltern
     }
     /**
      * 
-     * *Output-only* May contain one or more recognition hypotheses (up to the
+     * Output only. May contain one or more recognition hypotheses (up to the
      * maximum specified in `max_alternatives`).
+     * These alternatives are ordered in terms of accuracy, with the top (first)
+     * alternative being the most probable, as ranked by the recognizer.
      * 

      *
      * repeated .google.cloud.speech.v1.SpeechRecognitionAlternative alternatives = 1;
@@ -920,7 +942,7 @@ public com.google.cloud.speech.v1.SpeechRecognitionAlternative.Builder addAltern
     private boolean isFinal_ ;
     /**
      * 
-     * *Output-only* If `false`, this `StreamingRecognitionResult` represents an
+     * Output only. If `false`, this `StreamingRecognitionResult` represents an
      * interim result that may change. If `true`, this is the final time the
      * speech service will return this particular `StreamingRecognitionResult`,
      * the recognizer will not return any further hypotheses for this portion of
@@ -934,7 +956,7 @@ public boolean getIsFinal() {
     }
     /**
      * 
-     * *Output-only* If `false`, this `StreamingRecognitionResult` represents an
+     * Output only. If `false`, this `StreamingRecognitionResult` represents an
      * interim result that may change. If `true`, this is the final time the
      * speech service will return this particular `StreamingRecognitionResult`,
      * the recognizer will not return any further hypotheses for this portion of
@@ -951,7 +973,7 @@ public Builder setIsFinal(boolean value) {
     }
     /**
      * 
-     * *Output-only* If `false`, this `StreamingRecognitionResult` represents an
+     * Output only. If `false`, this `StreamingRecognitionResult` represents an
      * interim result that may change. If `true`, this is the final time the
      * speech service will return this particular `StreamingRecognitionResult`,
      * the recognizer will not return any further hypotheses for this portion of
@@ -970,7 +992,7 @@ public Builder clearIsFinal() {
     private float stability_ ;
     /**
      * 
-     * *Output-only* An estimate of the likelihood that the recognizer will not
+     * Output only. An estimate of the likelihood that the recognizer will not
      * change its guess about this interim result. Values range from 0.0
      * (completely unstable) to 1.0 (completely stable).
      * This field is only provided for interim results (`is_final=false`).
@@ -984,7 +1006,7 @@ public float getStability() {
     }
     /**
      * 
-     * *Output-only* An estimate of the likelihood that the recognizer will not
+     * Output only. An estimate of the likelihood that the recognizer will not
      * change its guess about this interim result. Values range from 0.0
      * (completely unstable) to 1.0 (completely stable).
      * This field is only provided for interim results (`is_final=false`).
@@ -1001,7 +1023,7 @@ public Builder setStability(float value) {
     }
     /**
      * 
-     * *Output-only* An estimate of the likelihood that the recognizer will not
+     * Output only. An estimate of the likelihood that the recognizer will not
      * change its guess about this interim result. Values range from 0.0
      * (completely unstable) to 1.0 (completely stable).
      * This field is only provided for interim results (`is_final=false`).
@@ -1016,13 +1038,11 @@ public Builder clearStability() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1044,12 +1064,11 @@ public static com.google.cloud.speech.v1.StreamingRecognitionResult getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public StreamingRecognitionResult parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StreamingRecognitionResult(input, extensionRegistry);
+        return new StreamingRecognitionResult(input, extensionRegistry);
     }
   };
 
@@ -1062,7 +1081,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.speech.v1.StreamingRecognitionResult getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognitionResultOrBuilder.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognitionResultOrBuilder.java
index 5301ab08b274..361a96e69dff 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognitionResultOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognitionResultOrBuilder.java
@@ -9,8 +9,10 @@ public interface StreamingRecognitionResultOrBuilder extends
 
   /**
    * 
-   * *Output-only* May contain one or more recognition hypotheses (up to the
+   * Output only. May contain one or more recognition hypotheses (up to the
    * maximum specified in `max_alternatives`).
+   * These alternatives are ordered in terms of accuracy, with the top (first)
+   * alternative being the most probable, as ranked by the recognizer.
    * 

    *
    * repeated .google.cloud.speech.v1.SpeechRecognitionAlternative alternatives = 1;
@@ -19,8 +21,10 @@ public interface StreamingRecognitionResultOrBuilder extends
       getAlternativesList();
   /**
    * 
-   * *Output-only* May contain one or more recognition hypotheses (up to the
+   * Output only. May contain one or more recognition hypotheses (up to the
    * maximum specified in `max_alternatives`).
+   * These alternatives are ordered in terms of accuracy, with the top (first)
+   * alternative being the most probable, as ranked by the recognizer.
    * 

    *
    * repeated .google.cloud.speech.v1.SpeechRecognitionAlternative alternatives = 1;
@@ -28,8 +32,10 @@ public interface StreamingRecognitionResultOrBuilder extends
   com.google.cloud.speech.v1.SpeechRecognitionAlternative getAlternatives(int index);
   /**
    * 
-   * *Output-only* May contain one or more recognition hypotheses (up to the
+   * Output only. May contain one or more recognition hypotheses (up to the
    * maximum specified in `max_alternatives`).
+   * These alternatives are ordered in terms of accuracy, with the top (first)
+   * alternative being the most probable, as ranked by the recognizer.
    * 

    *
    * repeated .google.cloud.speech.v1.SpeechRecognitionAlternative alternatives = 1;
@@ -37,8 +43,10 @@ public interface StreamingRecognitionResultOrBuilder extends
   int getAlternativesCount();
   /**
    * 
-   * *Output-only* May contain one or more recognition hypotheses (up to the
+   * Output only. May contain one or more recognition hypotheses (up to the
    * maximum specified in `max_alternatives`).
+   * These alternatives are ordered in terms of accuracy, with the top (first)
+   * alternative being the most probable, as ranked by the recognizer.
    * 

    *
    * repeated .google.cloud.speech.v1.SpeechRecognitionAlternative alternatives = 1;
@@ -47,8 +55,10 @@ public interface StreamingRecognitionResultOrBuilder extends
       getAlternativesOrBuilderList();
   /**
    * 
-   * *Output-only* May contain one or more recognition hypotheses (up to the
+   * Output only. May contain one or more recognition hypotheses (up to the
    * maximum specified in `max_alternatives`).
+   * These alternatives are ordered in terms of accuracy, with the top (first)
+   * alternative being the most probable, as ranked by the recognizer.
    * 

    *
    * repeated .google.cloud.speech.v1.SpeechRecognitionAlternative alternatives = 1;
@@ -58,7 +68,7 @@ com.google.cloud.speech.v1.SpeechRecognitionAlternativeOrBuilder getAlternatives
 
   /**
    * 
-   * *Output-only* If `false`, this `StreamingRecognitionResult` represents an
+   * Output only. If `false`, this `StreamingRecognitionResult` represents an
    * interim result that may change. If `true`, this is the final time the
    * speech service will return this particular `StreamingRecognitionResult`,
    * the recognizer will not return any further hypotheses for this portion of
@@ -71,7 +81,7 @@ com.google.cloud.speech.v1.SpeechRecognitionAlternativeOrBuilder getAlternatives
 
   /**
    * 
-   * *Output-only* An estimate of the likelihood that the recognizer will not
+   * Output only. An estimate of the likelihood that the recognizer will not
    * change its guess about this interim result. Values range from 0.0
    * (completely unstable) to 1.0 (completely stable).
    * This field is only provided for interim results (`is_final=false`).
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeRequest.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeRequest.java
index 0a600295ba06..ba3fe7d3c566 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeRequest.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeRequest.java
@@ -36,9 +36,6 @@ private StreamingRecognizeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private StreamingRecognizeRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.speech.v1.StreamingRecognitionConfig.Builder subBuilder = null;
             if (streamingRequestCase_ == 1) {
@@ -69,13 +73,6 @@ private StreamingRecognizeRequest(
             streamingRequest_ = input.readBytes();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -93,7 +90,6 @@ private StreamingRecognizeRequest(
     return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_StreamingRecognizeRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_StreamingRecognizeRequest_fieldAccessorTable
@@ -193,7 +189,7 @@ public com.google.cloud.speech.v1.StreamingRecognitionConfigOrBuilder getStreami
    * `audio_content` data. The audio bytes must be encoded as specified in
    * `RecognitionConfig`. Note: as with all bytes fields, protobuffers use a
    * pure binary representation (not base64). See
-   * [audio limits](https://cloud.google.com/speech/limits#content).
+   * [content limits](/speech-to-text/quotas#content).
    * 

    *
    * bytes audio_content = 2;
@@ -206,7 +202,6 @@ public com.google.protobuf.ByteString getAudioContent() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -216,7 +211,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (streamingRequestCase_ == 1) {
@@ -229,7 +223,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -373,7 +366,6 @@ public static com.google.cloud.speech.v1.StreamingRecognizeRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -381,7 +373,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.speech.v1.StreamingRecognizeRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -413,7 +404,6 @@ public static final class Builder extends
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_StreamingRecognizeRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_StreamingRecognizeRequest_fieldAccessorTable
@@ -436,7 +426,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       streamingRequestCase_ = 0;
@@ -444,18 +433,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_StreamingRecognizeRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.StreamingRecognizeRequest getDefaultInstanceForType() {
       return com.google.cloud.speech.v1.StreamingRecognizeRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.StreamingRecognizeRequest build() {
       com.google.cloud.speech.v1.StreamingRecognizeRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -464,7 +450,6 @@ public com.google.cloud.speech.v1.StreamingRecognizeRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.StreamingRecognizeRequest buildPartial() {
       com.google.cloud.speech.v1.StreamingRecognizeRequest result = new com.google.cloud.speech.v1.StreamingRecognizeRequest(this);
       if (streamingRequestCase_ == 1) {
@@ -482,39 +467,32 @@ public com.google.cloud.speech.v1.StreamingRecognizeRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.speech.v1.StreamingRecognizeRequest) {
         return mergeFrom((com.google.cloud.speech.v1.StreamingRecognizeRequest)other);
@@ -544,12 +522,10 @@ public Builder mergeFrom(com.google.cloud.speech.v1.StreamingRecognizeRequest ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -782,7 +758,7 @@ public com.google.cloud.speech.v1.StreamingRecognitionConfigOrBuilder getStreami
      * `audio_content` data. The audio bytes must be encoded as specified in
      * `RecognitionConfig`. Note: as with all bytes fields, protobuffers use a
      * pure binary representation (not base64). See
-     * [audio limits](https://cloud.google.com/speech/limits#content).
+     * [content limits](/speech-to-text/quotas#content).
      * 

      *
      * bytes audio_content = 2;
@@ -802,7 +778,7 @@ public com.google.protobuf.ByteString getAudioContent() {
      * `audio_content` data. The audio bytes must be encoded as specified in
      * `RecognitionConfig`. Note: as with all bytes fields, protobuffers use a
      * pure binary representation (not base64). See
-     * [audio limits](https://cloud.google.com/speech/limits#content).
+     * [content limits](/speech-to-text/quotas#content).
      * 

      *
      * bytes audio_content = 2;
@@ -825,7 +801,7 @@ public Builder setAudioContent(com.google.protobuf.ByteString value) {
      * `audio_content` data. The audio bytes must be encoded as specified in
      * `RecognitionConfig`. Note: as with all bytes fields, protobuffers use a
      * pure binary representation (not base64). See
-     * [audio limits](https://cloud.google.com/speech/limits#content).
+     * [content limits](/speech-to-text/quotas#content).
      * 

      *
      * bytes audio_content = 2;
@@ -838,13 +814,11 @@ public Builder clearAudioContent() {
       }
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -866,12 +840,11 @@ public static com.google.cloud.speech.v1.StreamingRecognizeRequest getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public StreamingRecognizeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StreamingRecognizeRequest(input, extensionRegistry);
+        return new StreamingRecognizeRequest(input, extensionRegistry);
     }
   };
 
@@ -884,7 +857,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.speech.v1.StreamingRecognizeRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeRequestOrBuilder.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeRequestOrBuilder.java
index 75ecebce36e9..d385dcf47dd2 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeRequestOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeRequestOrBuilder.java
@@ -47,7 +47,7 @@ public interface StreamingRecognizeRequestOrBuilder extends
    * `audio_content` data. The audio bytes must be encoded as specified in
    * `RecognitionConfig`. Note: as with all bytes fields, protobuffers use a
    * pure binary representation (not base64). See
-   * [audio limits](https://cloud.google.com/speech/limits#content).
+   * [content limits](/speech-to-text/quotas#content).
    * 

    *
    * bytes audio_content = 2;
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeResponse.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeResponse.java
index db2c5e6c4aa9..03a1d929c882 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeResponse.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeResponse.java
@@ -69,9 +69,6 @@ private StreamingRecognizeResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -83,6 +80,13 @@ private StreamingRecognizeResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.rpc.Status.Builder subBuilder = null;
             if (error_ != null) {
@@ -111,13 +115,6 @@ private StreamingRecognizeResponse(
             speechEventType_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -138,7 +135,6 @@ private StreamingRecognizeResponse(
     return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_StreamingRecognizeResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_StreamingRecognizeResponse_fieldAccessorTable
@@ -281,7 +277,7 @@ private SpeechEventType(int value) {
   private com.google.rpc.Status error_;
   /**
    * 
-   * *Output-only* If set, returns a [google.rpc.Status][google.rpc.Status] message that
+   * Output only. If set, returns a [google.rpc.Status][google.rpc.Status] message that
    * specifies the error for the operation.
    * 

    *
@@ -292,7 +288,7 @@ public boolean hasError() {
   }
   /**
    * 
-   * *Output-only* If set, returns a [google.rpc.Status][google.rpc.Status] message that
+   * Output only. If set, returns a [google.rpc.Status][google.rpc.Status] message that
    * specifies the error for the operation.
    * 

    *
@@ -303,7 +299,7 @@ public com.google.rpc.Status getError() {
   }
   /**
    * 
-   * *Output-only* If set, returns a [google.rpc.Status][google.rpc.Status] message that
+   * Output only. If set, returns a [google.rpc.Status][google.rpc.Status] message that
    * specifies the error for the operation.
    * 

    *
@@ -317,10 +313,10 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() {
   private java.util.List results_;
   /**
    * 
-   * *Output-only* This repeated list contains zero or more results that
+   * Output only. This repeated list contains zero or more results that
    * correspond to consecutive portions of the audio currently being processed.
-   * It contains zero or more `is_final=false` results followed by zero or one
-   * `is_final=true` result (the newly settled portion).
+   * It contains zero or one `is_final=true` result (the newly settled portion),
+   * followed by zero or more `is_final=false` results (the interim results).
    * 

    *
    * repeated .google.cloud.speech.v1.StreamingRecognitionResult results = 2;
@@ -330,10 +326,10 @@ public java.util.List get
   }
   /**
    * 
-   * *Output-only* This repeated list contains zero or more results that
+   * Output only. This repeated list contains zero or more results that
    * correspond to consecutive portions of the audio currently being processed.
-   * It contains zero or more `is_final=false` results followed by zero or one
-   * `is_final=true` result (the newly settled portion).
+   * It contains zero or one `is_final=true` result (the newly settled portion),
+   * followed by zero or more `is_final=false` results (the interim results).
    * 

    *
    * repeated .google.cloud.speech.v1.StreamingRecognitionResult results = 2;
@@ -344,10 +340,10 @@ public java.util.List get
   }
   /**
    * 
-   * *Output-only* This repeated list contains zero or more results that
+   * Output only. This repeated list contains zero or more results that
    * correspond to consecutive portions of the audio currently being processed.
-   * It contains zero or more `is_final=false` results followed by zero or one
-   * `is_final=true` result (the newly settled portion).
+   * It contains zero or one `is_final=true` result (the newly settled portion),
+   * followed by zero or more `is_final=false` results (the interim results).
    * 

    *
    * repeated .google.cloud.speech.v1.StreamingRecognitionResult results = 2;
@@ -357,10 +353,10 @@ public int getResultsCount() {
   }
   /**
    * 
-   * *Output-only* This repeated list contains zero or more results that
+   * Output only. This repeated list contains zero or more results that
    * correspond to consecutive portions of the audio currently being processed.
-   * It contains zero or more `is_final=false` results followed by zero or one
-   * `is_final=true` result (the newly settled portion).
+   * It contains zero or one `is_final=true` result (the newly settled portion),
+   * followed by zero or more `is_final=false` results (the interim results).
    * 

    *
    * repeated .google.cloud.speech.v1.StreamingRecognitionResult results = 2;
@@ -370,10 +366,10 @@ public com.google.cloud.speech.v1.StreamingRecognitionResult getResults(int inde
   }
   /**
    * 
-   * *Output-only* This repeated list contains zero or more results that
+   * Output only. This repeated list contains zero or more results that
    * correspond to consecutive portions of the audio currently being processed.
-   * It contains zero or more `is_final=false` results followed by zero or one
-   * `is_final=true` result (the newly settled portion).
+   * It contains zero or one `is_final=true` result (the newly settled portion),
+   * followed by zero or more `is_final=false` results (the interim results).
    * 

    *
    * repeated .google.cloud.speech.v1.StreamingRecognitionResult results = 2;
@@ -387,7 +383,7 @@ public com.google.cloud.speech.v1.StreamingRecognitionResultOrBuilder getResults
   private int speechEventType_;
   /**
    * 
-   * *Output-only* Indicates the type of speech event.
+   * Output only. Indicates the type of speech event.
    * 

    *
    * .google.cloud.speech.v1.StreamingRecognizeResponse.SpeechEventType speech_event_type = 4;
@@ -397,19 +393,17 @@ public int getSpeechEventTypeValue() {
   }
   /**
    * 
-   * *Output-only* Indicates the type of speech event.
+   * Output only. Indicates the type of speech event.
    * 

    *
    * .google.cloud.speech.v1.StreamingRecognizeResponse.SpeechEventType speech_event_type = 4;
    */
   public com.google.cloud.speech.v1.StreamingRecognizeResponse.SpeechEventType getSpeechEventType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.speech.v1.StreamingRecognizeResponse.SpeechEventType result = com.google.cloud.speech.v1.StreamingRecognizeResponse.SpeechEventType.valueOf(speechEventType_);
     return result == null ? com.google.cloud.speech.v1.StreamingRecognizeResponse.SpeechEventType.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -419,7 +413,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (error_ != null) {
@@ -434,7 +427,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -572,7 +564,6 @@ public static com.google.cloud.speech.v1.StreamingRecognizeResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -580,7 +571,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.speech.v1.StreamingRecognizeResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -643,7 +633,6 @@ public static final class Builder extends
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_StreamingRecognizeResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_StreamingRecognizeResponse_fieldAccessorTable
@@ -667,7 +656,6 @@ private void maybeForceBuilderInitialization() {
         getResultsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (errorBuilder_ == null) {
@@ -687,18 +675,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_StreamingRecognizeResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.StreamingRecognizeResponse getDefaultInstanceForType() {
       return com.google.cloud.speech.v1.StreamingRecognizeResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.StreamingRecognizeResponse build() {
       com.google.cloud.speech.v1.StreamingRecognizeResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -707,7 +692,6 @@ public com.google.cloud.speech.v1.StreamingRecognizeResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.StreamingRecognizeResponse buildPartial() {
       com.google.cloud.speech.v1.StreamingRecognizeResponse result = new com.google.cloud.speech.v1.StreamingRecognizeResponse(this);
       int from_bitField0_ = bitField0_;
@@ -732,39 +716,32 @@ public com.google.cloud.speech.v1.StreamingRecognizeResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.speech.v1.StreamingRecognizeResponse) {
         return mergeFrom((com.google.cloud.speech.v1.StreamingRecognizeResponse)other);
@@ -813,12 +790,10 @@ public Builder mergeFrom(com.google.cloud.speech.v1.StreamingRecognizeResponse o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -843,7 +818,7 @@ public Builder mergeFrom(
         com.google.rpc.Status, com.google.rpc.Status.Builder, com.google.rpc.StatusOrBuilder> errorBuilder_;
     /**
      * 
-     * *Output-only* If set, returns a [google.rpc.Status][google.rpc.Status] message that
+     * Output only. If set, returns a [google.rpc.Status][google.rpc.Status] message that
      * specifies the error for the operation.
      * 

      *
@@ -854,7 +829,7 @@ public boolean hasError() {
     }
     /**
      * 
-     * *Output-only* If set, returns a [google.rpc.Status][google.rpc.Status] message that
+     * Output only. If set, returns a [google.rpc.Status][google.rpc.Status] message that
      * specifies the error for the operation.
      * 

      *
@@ -869,7 +844,7 @@ public com.google.rpc.Status getError() {
     }
     /**
      * 
-     * *Output-only* If set, returns a [google.rpc.Status][google.rpc.Status] message that
+     * Output only. If set, returns a [google.rpc.Status][google.rpc.Status] message that
      * specifies the error for the operation.
      * 

      *
@@ -890,7 +865,7 @@ public Builder setError(com.google.rpc.Status value) {
     }
     /**
      * 
-     * *Output-only* If set, returns a [google.rpc.Status][google.rpc.Status] message that
+     * Output only. If set, returns a [google.rpc.Status][google.rpc.Status] message that
      * specifies the error for the operation.
      * 

      *
@@ -909,7 +884,7 @@ public Builder setError(
     }
     /**
      * 
-     * *Output-only* If set, returns a [google.rpc.Status][google.rpc.Status] message that
+     * Output only. If set, returns a [google.rpc.Status][google.rpc.Status] message that
      * specifies the error for the operation.
      * 

      *
@@ -932,7 +907,7 @@ public Builder mergeError(com.google.rpc.Status value) {
     }
     /**
      * 
-     * *Output-only* If set, returns a [google.rpc.Status][google.rpc.Status] message that
+     * Output only. If set, returns a [google.rpc.Status][google.rpc.Status] message that
      * specifies the error for the operation.
      * 

      *
@@ -951,7 +926,7 @@ public Builder clearError() {
     }
     /**
      * 
-     * *Output-only* If set, returns a [google.rpc.Status][google.rpc.Status] message that
+     * Output only. If set, returns a [google.rpc.Status][google.rpc.Status] message that
      * specifies the error for the operation.
      * 

      *
@@ -964,7 +939,7 @@ public com.google.rpc.Status.Builder getErrorBuilder() {
     }
     /**
      * 
-     * *Output-only* If set, returns a [google.rpc.Status][google.rpc.Status] message that
+     * Output only. If set, returns a [google.rpc.Status][google.rpc.Status] message that
      * specifies the error for the operation.
      * 

      *
@@ -980,7 +955,7 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() {
     }
     /**
      * 
-     * *Output-only* If set, returns a [google.rpc.Status][google.rpc.Status] message that
+     * Output only. If set, returns a [google.rpc.Status][google.rpc.Status] message that
      * specifies the error for the operation.
      * 

      *
@@ -1014,10 +989,10 @@ private void ensureResultsIsMutable() {
 
     /**
      * 
-     * *Output-only* This repeated list contains zero or more results that
+     * Output only. This repeated list contains zero or more results that
      * correspond to consecutive portions of the audio currently being processed.
-     * It contains zero or more `is_final=false` results followed by zero or one
-     * `is_final=true` result (the newly settled portion).
+     * It contains zero or one `is_final=true` result (the newly settled portion),
+     * followed by zero or more `is_final=false` results (the interim results).
      * 

      *
      * repeated .google.cloud.speech.v1.StreamingRecognitionResult results = 2;
@@ -1031,10 +1006,10 @@ public java.util.List get
     }
     /**
      * 
-     * *Output-only* This repeated list contains zero or more results that
+     * Output only. This repeated list contains zero or more results that
      * correspond to consecutive portions of the audio currently being processed.
-     * It contains zero or more `is_final=false` results followed by zero or one
-     * `is_final=true` result (the newly settled portion).
+     * It contains zero or one `is_final=true` result (the newly settled portion),
+     * followed by zero or more `is_final=false` results (the interim results).
      * 

      *
      * repeated .google.cloud.speech.v1.StreamingRecognitionResult results = 2;
@@ -1048,10 +1023,10 @@ public int getResultsCount() {
     }
     /**
      * 
-     * *Output-only* This repeated list contains zero or more results that
+     * Output only. This repeated list contains zero or more results that
      * correspond to consecutive portions of the audio currently being processed.
-     * It contains zero or more `is_final=false` results followed by zero or one
-     * `is_final=true` result (the newly settled portion).
+     * It contains zero or one `is_final=true` result (the newly settled portion),
+     * followed by zero or more `is_final=false` results (the interim results).
      * 

      *
      * repeated .google.cloud.speech.v1.StreamingRecognitionResult results = 2;
@@ -1065,10 +1040,10 @@ public com.google.cloud.speech.v1.StreamingRecognitionResult getResults(int inde
     }
     /**
      * 
-     * *Output-only* This repeated list contains zero or more results that
+     * Output only. This repeated list contains zero or more results that
      * correspond to consecutive portions of the audio currently being processed.
-     * It contains zero or more `is_final=false` results followed by zero or one
-     * `is_final=true` result (the newly settled portion).
+     * It contains zero or one `is_final=true` result (the newly settled portion),
+     * followed by zero or more `is_final=false` results (the interim results).
      * 

      *
      * repeated .google.cloud.speech.v1.StreamingRecognitionResult results = 2;
@@ -1089,10 +1064,10 @@ public Builder setResults(
     }
     /**
      * 
-     * *Output-only* This repeated list contains zero or more results that
+     * Output only. This repeated list contains zero or more results that
      * correspond to consecutive portions of the audio currently being processed.
-     * It contains zero or more `is_final=false` results followed by zero or one
-     * `is_final=true` result (the newly settled portion).
+     * It contains zero or one `is_final=true` result (the newly settled portion),
+     * followed by zero or more `is_final=false` results (the interim results).
      * 

      *
      * repeated .google.cloud.speech.v1.StreamingRecognitionResult results = 2;
@@ -1110,10 +1085,10 @@ public Builder setResults(
     }
     /**
      * 
-     * *Output-only* This repeated list contains zero or more results that
+     * Output only. This repeated list contains zero or more results that
      * correspond to consecutive portions of the audio currently being processed.
-     * It contains zero or more `is_final=false` results followed by zero or one
-     * `is_final=true` result (the newly settled portion).
+     * It contains zero or one `is_final=true` result (the newly settled portion),
+     * followed by zero or more `is_final=false` results (the interim results).
      * 

      *
      * repeated .google.cloud.speech.v1.StreamingRecognitionResult results = 2;
@@ -1133,10 +1108,10 @@ public Builder addResults(com.google.cloud.speech.v1.StreamingRecognitionResult
     }
     /**
      * 
-     * *Output-only* This repeated list contains zero or more results that
+     * Output only. This repeated list contains zero or more results that
      * correspond to consecutive portions of the audio currently being processed.
-     * It contains zero or more `is_final=false` results followed by zero or one
-     * `is_final=true` result (the newly settled portion).
+     * It contains zero or one `is_final=true` result (the newly settled portion),
+     * followed by zero or more `is_final=false` results (the interim results).
      * 

      *
      * repeated .google.cloud.speech.v1.StreamingRecognitionResult results = 2;
@@ -1157,10 +1132,10 @@ public Builder addResults(
     }
     /**
      * 
-     * *Output-only* This repeated list contains zero or more results that
+     * Output only. This repeated list contains zero or more results that
      * correspond to consecutive portions of the audio currently being processed.
-     * It contains zero or more `is_final=false` results followed by zero or one
-     * `is_final=true` result (the newly settled portion).
+     * It contains zero or one `is_final=true` result (the newly settled portion),
+     * followed by zero or more `is_final=false` results (the interim results).
      * 

      *
      * repeated .google.cloud.speech.v1.StreamingRecognitionResult results = 2;
@@ -1178,10 +1153,10 @@ public Builder addResults(
     }
     /**
      * 
-     * *Output-only* This repeated list contains zero or more results that
+     * Output only. This repeated list contains zero or more results that
      * correspond to consecutive portions of the audio currently being processed.
-     * It contains zero or more `is_final=false` results followed by zero or one
-     * `is_final=true` result (the newly settled portion).
+     * It contains zero or one `is_final=true` result (the newly settled portion),
+     * followed by zero or more `is_final=false` results (the interim results).
      * 

      *
      * repeated .google.cloud.speech.v1.StreamingRecognitionResult results = 2;
@@ -1199,10 +1174,10 @@ public Builder addResults(
     }
     /**
      * 
-     * *Output-only* This repeated list contains zero or more results that
+     * Output only. This repeated list contains zero or more results that
      * correspond to consecutive portions of the audio currently being processed.
-     * It contains zero or more `is_final=false` results followed by zero or one
-     * `is_final=true` result (the newly settled portion).
+     * It contains zero or one `is_final=true` result (the newly settled portion),
+     * followed by zero or more `is_final=false` results (the interim results).
      * 

      *
      * repeated .google.cloud.speech.v1.StreamingRecognitionResult results = 2;
@@ -1221,10 +1196,10 @@ public Builder addAllResults(
     }
     /**
      * 
-     * *Output-only* This repeated list contains zero or more results that
+     * Output only. This repeated list contains zero or more results that
      * correspond to consecutive portions of the audio currently being processed.
-     * It contains zero or more `is_final=false` results followed by zero or one
-     * `is_final=true` result (the newly settled portion).
+     * It contains zero or one `is_final=true` result (the newly settled portion),
+     * followed by zero or more `is_final=false` results (the interim results).
      * 

      *
      * repeated .google.cloud.speech.v1.StreamingRecognitionResult results = 2;
@@ -1241,10 +1216,10 @@ public Builder clearResults() {
     }
     /**
      * 
-     * *Output-only* This repeated list contains zero or more results that
+     * Output only. This repeated list contains zero or more results that
      * correspond to consecutive portions of the audio currently being processed.
-     * It contains zero or more `is_final=false` results followed by zero or one
-     * `is_final=true` result (the newly settled portion).
+     * It contains zero or one `is_final=true` result (the newly settled portion),
+     * followed by zero or more `is_final=false` results (the interim results).
      * 

      *
      * repeated .google.cloud.speech.v1.StreamingRecognitionResult results = 2;
@@ -1261,10 +1236,10 @@ public Builder removeResults(int index) {
     }
     /**
      * 
-     * *Output-only* This repeated list contains zero or more results that
+     * Output only. This repeated list contains zero or more results that
      * correspond to consecutive portions of the audio currently being processed.
-     * It contains zero or more `is_final=false` results followed by zero or one
-     * `is_final=true` result (the newly settled portion).
+     * It contains zero or one `is_final=true` result (the newly settled portion),
+     * followed by zero or more `is_final=false` results (the interim results).
      * 

      *
      * repeated .google.cloud.speech.v1.StreamingRecognitionResult results = 2;
@@ -1275,10 +1250,10 @@ public com.google.cloud.speech.v1.StreamingRecognitionResult.Builder getResultsB
     }
     /**
      * 
-     * *Output-only* This repeated list contains zero or more results that
+     * Output only. This repeated list contains zero or more results that
      * correspond to consecutive portions of the audio currently being processed.
-     * It contains zero or more `is_final=false` results followed by zero or one
-     * `is_final=true` result (the newly settled portion).
+     * It contains zero or one `is_final=true` result (the newly settled portion),
+     * followed by zero or more `is_final=false` results (the interim results).
      * 

      *
      * repeated .google.cloud.speech.v1.StreamingRecognitionResult results = 2;
@@ -1292,10 +1267,10 @@ public com.google.cloud.speech.v1.StreamingRecognitionResultOrBuilder getResults
     }
     /**
      * 
-     * *Output-only* This repeated list contains zero or more results that
+     * Output only. This repeated list contains zero or more results that
      * correspond to consecutive portions of the audio currently being processed.
-     * It contains zero or more `is_final=false` results followed by zero or one
-     * `is_final=true` result (the newly settled portion).
+     * It contains zero or one `is_final=true` result (the newly settled portion),
+     * followed by zero or more `is_final=false` results (the interim results).
      * 

      *
      * repeated .google.cloud.speech.v1.StreamingRecognitionResult results = 2;
@@ -1310,10 +1285,10 @@ public com.google.cloud.speech.v1.StreamingRecognitionResultOrBuilder getResults
     }
     /**
      * 
-     * *Output-only* This repeated list contains zero or more results that
+     * Output only. This repeated list contains zero or more results that
      * correspond to consecutive portions of the audio currently being processed.
-     * It contains zero or more `is_final=false` results followed by zero or one
-     * `is_final=true` result (the newly settled portion).
+     * It contains zero or one `is_final=true` result (the newly settled portion),
+     * followed by zero or more `is_final=false` results (the interim results).
      * 

      *
      * repeated .google.cloud.speech.v1.StreamingRecognitionResult results = 2;
@@ -1324,10 +1299,10 @@ public com.google.cloud.speech.v1.StreamingRecognitionResult.Builder addResultsB
     }
     /**
      * 
-     * *Output-only* This repeated list contains zero or more results that
+     * Output only. This repeated list contains zero or more results that
      * correspond to consecutive portions of the audio currently being processed.
-     * It contains zero or more `is_final=false` results followed by zero or one
-     * `is_final=true` result (the newly settled portion).
+     * It contains zero or one `is_final=true` result (the newly settled portion),
+     * followed by zero or more `is_final=false` results (the interim results).
      * 

      *
      * repeated .google.cloud.speech.v1.StreamingRecognitionResult results = 2;
@@ -1339,10 +1314,10 @@ public com.google.cloud.speech.v1.StreamingRecognitionResult.Builder addResultsB
     }
     /**
      * 
-     * *Output-only* This repeated list contains zero or more results that
+     * Output only. This repeated list contains zero or more results that
      * correspond to consecutive portions of the audio currently being processed.
-     * It contains zero or more `is_final=false` results followed by zero or one
-     * `is_final=true` result (the newly settled portion).
+     * It contains zero or one `is_final=true` result (the newly settled portion),
+     * followed by zero or more `is_final=false` results (the interim results).
      * 

      *
      * repeated .google.cloud.speech.v1.StreamingRecognitionResult results = 2;
@@ -1369,7 +1344,7 @@ public com.google.cloud.speech.v1.StreamingRecognitionResult.Builder addResultsB
     private int speechEventType_ = 0;
     /**
      * 
-     * *Output-only* Indicates the type of speech event.
+     * Output only. Indicates the type of speech event.
      * 

      *
      * .google.cloud.speech.v1.StreamingRecognizeResponse.SpeechEventType speech_event_type = 4;
@@ -1379,7 +1354,7 @@ public int getSpeechEventTypeValue() {
     }
     /**
      * 
-     * *Output-only* Indicates the type of speech event.
+     * Output only. Indicates the type of speech event.
      * 

      *
      * .google.cloud.speech.v1.StreamingRecognizeResponse.SpeechEventType speech_event_type = 4;
@@ -1391,19 +1366,18 @@ public Builder setSpeechEventTypeValue(int value) {
     }
     /**
      * 
-     * *Output-only* Indicates the type of speech event.
+     * Output only. Indicates the type of speech event.
      * 

      *
      * .google.cloud.speech.v1.StreamingRecognizeResponse.SpeechEventType speech_event_type = 4;
      */
     public com.google.cloud.speech.v1.StreamingRecognizeResponse.SpeechEventType getSpeechEventType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.speech.v1.StreamingRecognizeResponse.SpeechEventType result = com.google.cloud.speech.v1.StreamingRecognizeResponse.SpeechEventType.valueOf(speechEventType_);
       return result == null ? com.google.cloud.speech.v1.StreamingRecognizeResponse.SpeechEventType.UNRECOGNIZED : result;
     }
     /**
      * 
-     * *Output-only* Indicates the type of speech event.
+     * Output only. Indicates the type of speech event.
      * 

      *
      * .google.cloud.speech.v1.StreamingRecognizeResponse.SpeechEventType speech_event_type = 4;
@@ -1419,7 +1393,7 @@ public Builder setSpeechEventType(com.google.cloud.speech.v1.StreamingRecognizeR
     }
     /**
      * 
-     * *Output-only* Indicates the type of speech event.
+     * Output only. Indicates the type of speech event.
      * 

      *
      * .google.cloud.speech.v1.StreamingRecognizeResponse.SpeechEventType speech_event_type = 4;
@@ -1430,13 +1404,11 @@ public Builder clearSpeechEventType() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1458,12 +1430,11 @@ public static com.google.cloud.speech.v1.StreamingRecognizeResponse getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public StreamingRecognizeResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StreamingRecognizeResponse(input, extensionRegistry);
+        return new StreamingRecognizeResponse(input, extensionRegistry);
     }
   };
 
@@ -1476,7 +1447,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.speech.v1.StreamingRecognizeResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeResponseOrBuilder.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeResponseOrBuilder.java
index 3ecad5640416..21d2b78c6072 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeResponseOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/StreamingRecognizeResponseOrBuilder.java
@@ -9,7 +9,7 @@ public interface StreamingRecognizeResponseOrBuilder extends
 
   /**
    * 
-   * *Output-only* If set, returns a [google.rpc.Status][google.rpc.Status] message that
+   * Output only. If set, returns a [google.rpc.Status][google.rpc.Status] message that
    * specifies the error for the operation.
    * 

    *
@@ -18,7 +18,7 @@ public interface StreamingRecognizeResponseOrBuilder extends
   boolean hasError();
   /**
    * 
-   * *Output-only* If set, returns a [google.rpc.Status][google.rpc.Status] message that
+   * Output only. If set, returns a [google.rpc.Status][google.rpc.Status] message that
    * specifies the error for the operation.
    * 

    *
@@ -27,7 +27,7 @@ public interface StreamingRecognizeResponseOrBuilder extends
   com.google.rpc.Status getError();
   /**
    * 
-   * *Output-only* If set, returns a [google.rpc.Status][google.rpc.Status] message that
+   * Output only. If set, returns a [google.rpc.Status][google.rpc.Status] message that
    * specifies the error for the operation.
    * 

    *
@@ -37,10 +37,10 @@ public interface StreamingRecognizeResponseOrBuilder extends
 
   /**
    * 
-   * *Output-only* This repeated list contains zero or more results that
+   * Output only. This repeated list contains zero or more results that
    * correspond to consecutive portions of the audio currently being processed.
-   * It contains zero or more `is_final=false` results followed by zero or one
-   * `is_final=true` result (the newly settled portion).
+   * It contains zero or one `is_final=true` result (the newly settled portion),
+   * followed by zero or more `is_final=false` results (the interim results).
    * 

    *
    * repeated .google.cloud.speech.v1.StreamingRecognitionResult results = 2;
@@ -49,10 +49,10 @@ public interface StreamingRecognizeResponseOrBuilder extends
       getResultsList();
   /**
    * 
-   * *Output-only* This repeated list contains zero or more results that
+   * Output only. This repeated list contains zero or more results that
    * correspond to consecutive portions of the audio currently being processed.
-   * It contains zero or more `is_final=false` results followed by zero or one
-   * `is_final=true` result (the newly settled portion).
+   * It contains zero or one `is_final=true` result (the newly settled portion),
+   * followed by zero or more `is_final=false` results (the interim results).
    * 

    *
    * repeated .google.cloud.speech.v1.StreamingRecognitionResult results = 2;
@@ -60,10 +60,10 @@ public interface StreamingRecognizeResponseOrBuilder extends
   com.google.cloud.speech.v1.StreamingRecognitionResult getResults(int index);
   /**
    * 
-   * *Output-only* This repeated list contains zero or more results that
+   * Output only. This repeated list contains zero or more results that
    * correspond to consecutive portions of the audio currently being processed.
-   * It contains zero or more `is_final=false` results followed by zero or one
-   * `is_final=true` result (the newly settled portion).
+   * It contains zero or one `is_final=true` result (the newly settled portion),
+   * followed by zero or more `is_final=false` results (the interim results).
    * 

    *
    * repeated .google.cloud.speech.v1.StreamingRecognitionResult results = 2;
@@ -71,10 +71,10 @@ public interface StreamingRecognizeResponseOrBuilder extends
   int getResultsCount();
   /**
    * 
-   * *Output-only* This repeated list contains zero or more results that
+   * Output only. This repeated list contains zero or more results that
    * correspond to consecutive portions of the audio currently being processed.
-   * It contains zero or more `is_final=false` results followed by zero or one
-   * `is_final=true` result (the newly settled portion).
+   * It contains zero or one `is_final=true` result (the newly settled portion),
+   * followed by zero or more `is_final=false` results (the interim results).
    * 

    *
    * repeated .google.cloud.speech.v1.StreamingRecognitionResult results = 2;
@@ -83,10 +83,10 @@ public interface StreamingRecognizeResponseOrBuilder extends
       getResultsOrBuilderList();
   /**
    * 
-   * *Output-only* This repeated list contains zero or more results that
+   * Output only. This repeated list contains zero or more results that
    * correspond to consecutive portions of the audio currently being processed.
-   * It contains zero or more `is_final=false` results followed by zero or one
-   * `is_final=true` result (the newly settled portion).
+   * It contains zero or one `is_final=true` result (the newly settled portion),
+   * followed by zero or more `is_final=false` results (the interim results).
    * 

    *
    * repeated .google.cloud.speech.v1.StreamingRecognitionResult results = 2;
@@ -96,7 +96,7 @@ com.google.cloud.speech.v1.StreamingRecognitionResultOrBuilder getResultsOrBuild
 
   /**
    * 
-   * *Output-only* Indicates the type of speech event.
+   * Output only. Indicates the type of speech event.
    * 

    *
    * .google.cloud.speech.v1.StreamingRecognizeResponse.SpeechEventType speech_event_type = 4;
@@ -104,7 +104,7 @@ com.google.cloud.speech.v1.StreamingRecognitionResultOrBuilder getResultsOrBuild
   int getSpeechEventTypeValue();
   /**
    * 
-   * *Output-only* Indicates the type of speech event.
+   * Output only. Indicates the type of speech event.
    * 

    *
    * .google.cloud.speech.v1.StreamingRecognizeResponse.SpeechEventType speech_event_type = 4;
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/WordInfo.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/WordInfo.java
index d0035ebeee92..de6dbe23e6ea 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/WordInfo.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/WordInfo.java
@@ -5,9 +5,7 @@
 
 /**
  * 
- * Word-specific information for recognized words. Word information is only
- * included in the response when certain request parameters are set, such
- * as `enable_word_time_offsets`.
+ * Word-specific information for recognized words.
  * 

  *
  * Protobuf type {@code google.cloud.speech.v1.WordInfo}
@@ -35,9 +33,6 @@ private WordInfo(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +44,13 @@ private WordInfo(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.protobuf.Duration.Builder subBuilder = null;
             if (startTime_ != null) {
@@ -81,13 +83,6 @@ private WordInfo(
             word_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -105,7 +100,6 @@ private WordInfo(
     return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_WordInfo_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_WordInfo_fieldAccessorTable
@@ -117,7 +111,7 @@ private WordInfo(
   private com.google.protobuf.Duration startTime_;
   /**
    * 
-   * *Output-only* Time offset relative to the beginning of the audio,
+   * Output only. Time offset relative to the beginning of the audio,
    * and corresponding to the start of the spoken word.
    * This field is only set if `enable_word_time_offsets=true` and only
    * in the top hypothesis.
@@ -132,7 +126,7 @@ public boolean hasStartTime() {
   }
   /**
    * 
-   * *Output-only* Time offset relative to the beginning of the audio,
+   * Output only. Time offset relative to the beginning of the audio,
    * and corresponding to the start of the spoken word.
    * This field is only set if `enable_word_time_offsets=true` and only
    * in the top hypothesis.
@@ -147,7 +141,7 @@ public com.google.protobuf.Duration getStartTime() {
   }
   /**
    * 
-   * *Output-only* Time offset relative to the beginning of the audio,
+   * Output only. Time offset relative to the beginning of the audio,
    * and corresponding to the start of the spoken word.
    * This field is only set if `enable_word_time_offsets=true` and only
    * in the top hypothesis.
@@ -165,7 +159,7 @@ public com.google.protobuf.DurationOrBuilder getStartTimeOrBuilder() {
   private com.google.protobuf.Duration endTime_;
   /**
    * 
-   * *Output-only* Time offset relative to the beginning of the audio,
+   * Output only. Time offset relative to the beginning of the audio,
    * and corresponding to the end of the spoken word.
    * This field is only set if `enable_word_time_offsets=true` and only
    * in the top hypothesis.
@@ -180,7 +174,7 @@ public boolean hasEndTime() {
   }
   /**
    * 
-   * *Output-only* Time offset relative to the beginning of the audio,
+   * Output only. Time offset relative to the beginning of the audio,
    * and corresponding to the end of the spoken word.
    * This field is only set if `enable_word_time_offsets=true` and only
    * in the top hypothesis.
@@ -195,7 +189,7 @@ public com.google.protobuf.Duration getEndTime() {
   }
   /**
    * 
-   * *Output-only* Time offset relative to the beginning of the audio,
+   * Output only. Time offset relative to the beginning of the audio,
    * and corresponding to the end of the spoken word.
    * This field is only set if `enable_word_time_offsets=true` and only
    * in the top hypothesis.
@@ -213,7 +207,7 @@ public com.google.protobuf.DurationOrBuilder getEndTimeOrBuilder() {
   private volatile java.lang.Object word_;
   /**
    * 
-   * *Output-only* The word corresponding to this set of information.
+   * Output only. The word corresponding to this set of information.
    * 

    *
    * string word = 3;
@@ -232,7 +226,7 @@ public java.lang.String getWord() {
   }
   /**
    * 
-   * *Output-only* The word corresponding to this set of information.
+   * Output only. The word corresponding to this set of information.
    * 

    *
    * string word = 3;
@@ -252,7 +246,6 @@ public java.lang.String getWord() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -262,7 +255,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (startTime_ != null) {
@@ -277,7 +269,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -418,7 +409,6 @@ public static com.google.cloud.speech.v1.WordInfo parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -426,7 +416,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.speech.v1.WordInfo prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -440,9 +429,7 @@ protected Builder newBuilderForType(
   }
   /**
    * 
-   * Word-specific information for recognized words. Word information is only
-   * included in the response when certain request parameters are set, such
-   * as `enable_word_time_offsets`.
+   * Word-specific information for recognized words.
    * 

    *
    * Protobuf type {@code google.cloud.speech.v1.WordInfo}
@@ -456,7 +443,6 @@ public static final class Builder extends
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_WordInfo_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_WordInfo_fieldAccessorTable
@@ -479,7 +465,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (startTimeBuilder_ == null) {
@@ -499,18 +484,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.speech.v1.SpeechProto.internal_static_google_cloud_speech_v1_WordInfo_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.WordInfo getDefaultInstanceForType() {
       return com.google.cloud.speech.v1.WordInfo.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.WordInfo build() {
       com.google.cloud.speech.v1.WordInfo result = buildPartial();
       if (!result.isInitialized()) {
@@ -519,7 +501,6 @@ public com.google.cloud.speech.v1.WordInfo build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1.WordInfo buildPartial() {
       com.google.cloud.speech.v1.WordInfo result = new com.google.cloud.speech.v1.WordInfo(this);
       if (startTimeBuilder_ == null) {
@@ -537,39 +518,32 @@ public com.google.cloud.speech.v1.WordInfo buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.speech.v1.WordInfo) {
         return mergeFrom((com.google.cloud.speech.v1.WordInfo)other);
@@ -596,12 +570,10 @@ public Builder mergeFrom(com.google.cloud.speech.v1.WordInfo other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -625,7 +597,7 @@ public Builder mergeFrom(
         com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder> startTimeBuilder_;
     /**
      * 
-     * *Output-only* Time offset relative to the beginning of the audio,
+     * Output only. Time offset relative to the beginning of the audio,
      * and corresponding to the start of the spoken word.
      * This field is only set if `enable_word_time_offsets=true` and only
      * in the top hypothesis.
@@ -640,7 +612,7 @@ public boolean hasStartTime() {
     }
     /**
      * 
-     * *Output-only* Time offset relative to the beginning of the audio,
+     * Output only. Time offset relative to the beginning of the audio,
      * and corresponding to the start of the spoken word.
      * This field is only set if `enable_word_time_offsets=true` and only
      * in the top hypothesis.
@@ -659,7 +631,7 @@ public com.google.protobuf.Duration getStartTime() {
     }
     /**
      * 
-     * *Output-only* Time offset relative to the beginning of the audio,
+     * Output only. Time offset relative to the beginning of the audio,
      * and corresponding to the start of the spoken word.
      * This field is only set if `enable_word_time_offsets=true` and only
      * in the top hypothesis.
@@ -684,7 +656,7 @@ public Builder setStartTime(com.google.protobuf.Duration value) {
     }
     /**
      * 
-     * *Output-only* Time offset relative to the beginning of the audio,
+     * Output only. Time offset relative to the beginning of the audio,
      * and corresponding to the start of the spoken word.
      * This field is only set if `enable_word_time_offsets=true` and only
      * in the top hypothesis.
@@ -707,7 +679,7 @@ public Builder setStartTime(
     }
     /**
      * 
-     * *Output-only* Time offset relative to the beginning of the audio,
+     * Output only. Time offset relative to the beginning of the audio,
      * and corresponding to the start of the spoken word.
      * This field is only set if `enable_word_time_offsets=true` and only
      * in the top hypothesis.
@@ -734,7 +706,7 @@ public Builder mergeStartTime(com.google.protobuf.Duration value) {
     }
     /**
      * 
-     * *Output-only* Time offset relative to the beginning of the audio,
+     * Output only. Time offset relative to the beginning of the audio,
      * and corresponding to the start of the spoken word.
      * This field is only set if `enable_word_time_offsets=true` and only
      * in the top hypothesis.
@@ -757,7 +729,7 @@ public Builder clearStartTime() {
     }
     /**
      * 
-     * *Output-only* Time offset relative to the beginning of the audio,
+     * Output only. Time offset relative to the beginning of the audio,
      * and corresponding to the start of the spoken word.
      * This field is only set if `enable_word_time_offsets=true` and only
      * in the top hypothesis.
@@ -774,7 +746,7 @@ public com.google.protobuf.Duration.Builder getStartTimeBuilder() {
     }
     /**
      * 
-     * *Output-only* Time offset relative to the beginning of the audio,
+     * Output only. Time offset relative to the beginning of the audio,
      * and corresponding to the start of the spoken word.
      * This field is only set if `enable_word_time_offsets=true` and only
      * in the top hypothesis.
@@ -794,7 +766,7 @@ public com.google.protobuf.DurationOrBuilder getStartTimeOrBuilder() {
     }
     /**
      * 
-     * *Output-only* Time offset relative to the beginning of the audio,
+     * Output only. Time offset relative to the beginning of the audio,
      * and corresponding to the start of the spoken word.
      * This field is only set if `enable_word_time_offsets=true` and only
      * in the top hypothesis.
@@ -823,7 +795,7 @@ public com.google.protobuf.DurationOrBuilder getStartTimeOrBuilder() {
         com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, com.google.protobuf.DurationOrBuilder> endTimeBuilder_;
     /**
      * 
-     * *Output-only* Time offset relative to the beginning of the audio,
+     * Output only. Time offset relative to the beginning of the audio,
      * and corresponding to the end of the spoken word.
      * This field is only set if `enable_word_time_offsets=true` and only
      * in the top hypothesis.
@@ -838,7 +810,7 @@ public boolean hasEndTime() {
     }
     /**
      * 
-     * *Output-only* Time offset relative to the beginning of the audio,
+     * Output only. Time offset relative to the beginning of the audio,
      * and corresponding to the end of the spoken word.
      * This field is only set if `enable_word_time_offsets=true` and only
      * in the top hypothesis.
@@ -857,7 +829,7 @@ public com.google.protobuf.Duration getEndTime() {
     }
     /**
      * 
-     * *Output-only* Time offset relative to the beginning of the audio,
+     * Output only. Time offset relative to the beginning of the audio,
      * and corresponding to the end of the spoken word.
      * This field is only set if `enable_word_time_offsets=true` and only
      * in the top hypothesis.
@@ -882,7 +854,7 @@ public Builder setEndTime(com.google.protobuf.Duration value) {
     }
     /**
      * 
-     * *Output-only* Time offset relative to the beginning of the audio,
+     * Output only. Time offset relative to the beginning of the audio,
      * and corresponding to the end of the spoken word.
      * This field is only set if `enable_word_time_offsets=true` and only
      * in the top hypothesis.
@@ -905,7 +877,7 @@ public Builder setEndTime(
     }
     /**
      * 
-     * *Output-only* Time offset relative to the beginning of the audio,
+     * Output only. Time offset relative to the beginning of the audio,
      * and corresponding to the end of the spoken word.
      * This field is only set if `enable_word_time_offsets=true` and only
      * in the top hypothesis.
@@ -932,7 +904,7 @@ public Builder mergeEndTime(com.google.protobuf.Duration value) {
     }
     /**
      * 
-     * *Output-only* Time offset relative to the beginning of the audio,
+     * Output only. Time offset relative to the beginning of the audio,
      * and corresponding to the end of the spoken word.
      * This field is only set if `enable_word_time_offsets=true` and only
      * in the top hypothesis.
@@ -955,7 +927,7 @@ public Builder clearEndTime() {
     }
     /**
      * 
-     * *Output-only* Time offset relative to the beginning of the audio,
+     * Output only. Time offset relative to the beginning of the audio,
      * and corresponding to the end of the spoken word.
      * This field is only set if `enable_word_time_offsets=true` and only
      * in the top hypothesis.
@@ -972,7 +944,7 @@ public com.google.protobuf.Duration.Builder getEndTimeBuilder() {
     }
     /**
      * 
-     * *Output-only* Time offset relative to the beginning of the audio,
+     * Output only. Time offset relative to the beginning of the audio,
      * and corresponding to the end of the spoken word.
      * This field is only set if `enable_word_time_offsets=true` and only
      * in the top hypothesis.
@@ -992,7 +964,7 @@ public com.google.protobuf.DurationOrBuilder getEndTimeOrBuilder() {
     }
     /**
      * 
-     * *Output-only* Time offset relative to the beginning of the audio,
+     * Output only. Time offset relative to the beginning of the audio,
      * and corresponding to the end of the spoken word.
      * This field is only set if `enable_word_time_offsets=true` and only
      * in the top hypothesis.
@@ -1019,7 +991,7 @@ public com.google.protobuf.DurationOrBuilder getEndTimeOrBuilder() {
     private java.lang.Object word_ = "";
     /**
      * 
-     * *Output-only* The word corresponding to this set of information.
+     * Output only. The word corresponding to this set of information.
      * 

      *
      * string word = 3;
@@ -1038,7 +1010,7 @@ public java.lang.String getWord() {
     }
     /**
      * 
-     * *Output-only* The word corresponding to this set of information.
+     * Output only. The word corresponding to this set of information.
      * 

      *
      * string word = 3;
@@ -1058,7 +1030,7 @@ public java.lang.String getWord() {
     }
     /**
      * 
-     * *Output-only* The word corresponding to this set of information.
+     * Output only. The word corresponding to this set of information.
      * 

      *
      * string word = 3;
@@ -1075,7 +1047,7 @@ public Builder setWord(
     }
     /**
      * 
-     * *Output-only* The word corresponding to this set of information.
+     * Output only. The word corresponding to this set of information.
      * 

      *
      * string word = 3;
@@ -1088,7 +1060,7 @@ public Builder clearWord() {
     }
     /**
      * 
-     * *Output-only* The word corresponding to this set of information.
+     * Output only. The word corresponding to this set of information.
      * 

      *
      * string word = 3;
@@ -1104,13 +1076,11 @@ public Builder setWordBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1132,12 +1102,11 @@ public static com.google.cloud.speech.v1.WordInfo getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public WordInfo parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WordInfo(input, extensionRegistry);
+        return new WordInfo(input, extensionRegistry);
     }
   };
 
@@ -1150,7 +1119,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.speech.v1.WordInfo getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/WordInfoOrBuilder.java b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/WordInfoOrBuilder.java
index 647a439c7025..30a3f6613cc4 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/WordInfoOrBuilder.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/java/com/google/cloud/speech/v1/WordInfoOrBuilder.java
@@ -9,7 +9,7 @@ public interface WordInfoOrBuilder extends
 
   /**
    * 
-   * *Output-only* Time offset relative to the beginning of the audio,
+   * Output only. Time offset relative to the beginning of the audio,
    * and corresponding to the start of the spoken word.
    * This field is only set if `enable_word_time_offsets=true` and only
    * in the top hypothesis.
@@ -22,7 +22,7 @@ public interface WordInfoOrBuilder extends
   boolean hasStartTime();
   /**
    * 
-   * *Output-only* Time offset relative to the beginning of the audio,
+   * Output only. Time offset relative to the beginning of the audio,
    * and corresponding to the start of the spoken word.
    * This field is only set if `enable_word_time_offsets=true` and only
    * in the top hypothesis.
@@ -35,7 +35,7 @@ public interface WordInfoOrBuilder extends
   com.google.protobuf.Duration getStartTime();
   /**
    * 
-   * *Output-only* Time offset relative to the beginning of the audio,
+   * Output only. Time offset relative to the beginning of the audio,
    * and corresponding to the start of the spoken word.
    * This field is only set if `enable_word_time_offsets=true` and only
    * in the top hypothesis.
@@ -49,7 +49,7 @@ public interface WordInfoOrBuilder extends
 
   /**
    * 
-   * *Output-only* Time offset relative to the beginning of the audio,
+   * Output only. Time offset relative to the beginning of the audio,
    * and corresponding to the end of the spoken word.
    * This field is only set if `enable_word_time_offsets=true` and only
    * in the top hypothesis.
@@ -62,7 +62,7 @@ public interface WordInfoOrBuilder extends
   boolean hasEndTime();
   /**
    * 
-   * *Output-only* Time offset relative to the beginning of the audio,
+   * Output only. Time offset relative to the beginning of the audio,
    * and corresponding to the end of the spoken word.
    * This field is only set if `enable_word_time_offsets=true` and only
    * in the top hypothesis.
@@ -75,7 +75,7 @@ public interface WordInfoOrBuilder extends
   com.google.protobuf.Duration getEndTime();
   /**
    * 
-   * *Output-only* Time offset relative to the beginning of the audio,
+   * Output only. Time offset relative to the beginning of the audio,
    * and corresponding to the end of the spoken word.
    * This field is only set if `enable_word_time_offsets=true` and only
    * in the top hypothesis.
@@ -89,7 +89,7 @@ public interface WordInfoOrBuilder extends
 
   /**
    * 
-   * *Output-only* The word corresponding to this set of information.
+   * Output only. The word corresponding to this set of information.
    * 

    *
    * string word = 3;
@@ -97,7 +97,7 @@ public interface WordInfoOrBuilder extends
   java.lang.String getWord();
   /**
    * 
-   * *Output-only* The word corresponding to this set of information.
+   * Output only. The word corresponding to this set of information.
    * 

    *
    * string word = 3;
diff --git a/google-api-grpc/proto-google-cloud-speech-v1/src/main/proto/google/cloud/speech/v1/cloud_speech.proto b/google-api-grpc/proto-google-cloud-speech-v1/src/main/proto/google/cloud/speech/v1/cloud_speech.proto
index b1bac7df2b0f..001d54b3c17c 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1/src/main/proto/google/cloud/speech/v1/cloud_speech.proto
+++ b/google-api-grpc/proto-google-cloud-speech-v1/src/main/proto/google/cloud/speech/v1/cloud_speech.proto
@@ -1,4 +1,4 @@
-// Copyright 2017 Google Inc.
+// Copyright 2018 Google LLC.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//
 
 syntax = "proto3";
 
@@ -20,6 +21,7 @@ import "google/api/annotations.proto";
 import "google/longrunning/operations.proto";
 import "google/protobuf/any.proto";
 import "google/protobuf/duration.proto";
+import "google/protobuf/empty.proto";
 import "google/protobuf/timestamp.proto";
 import "google/rpc/status.proto";
 
@@ -35,7 +37,10 @@ service Speech {
   // Performs synchronous speech recognition: receive results after all audio
   // has been sent and processed.
   rpc Recognize(RecognizeRequest) returns (RecognizeResponse) {
-    option (google.api.http) = { post: "/v1/speech:recognize" body: "*" };
+    option (google.api.http) = {
+      post: "/v1/speech:recognize"
+      body: "*"
+    };
   }
 
   // Performs asynchronous speech recognition: receive results via the
@@ -43,12 +48,16 @@ service Speech {
   // `Operation.error` or an `Operation.response` which contains
   // a `LongRunningRecognizeResponse` message.
   rpc LongRunningRecognize(LongRunningRecognizeRequest) returns (google.longrunning.Operation) {
-    option (google.api.http) = { post: "/v1/speech:longrunningrecognize" body: "*" };
+    option (google.api.http) = {
+      post: "/v1/speech:longrunningrecognize"
+      body: "*"
+    };
   }
 
   // Performs bidirectional streaming speech recognition: receive results while
   // sending audio. This method is only available via the gRPC API (not REST).
-  rpc StreamingRecognize(stream StreamingRecognizeRequest) returns (stream StreamingRecognizeResponse);
+  rpc StreamingRecognize(stream StreamingRecognizeRequest) returns (stream StreamingRecognizeResponse) {
+  }
 }
 
 // The top-level message sent by the client for the `Recognize` method.
@@ -92,7 +101,7 @@ message StreamingRecognizeRequest {
     // `audio_content` data. The audio bytes must be encoded as specified in
     // `RecognitionConfig`. Note: as with all bytes fields, protobuffers use a
     // pure binary representation (not base64). See
-    // [audio limits](https://cloud.google.com/speech/limits#content).
+    // [content limits](/speech-to-text/quotas#content).
     bytes audio_content = 2;
   }
 }
@@ -127,24 +136,34 @@ message StreamingRecognitionConfig {
 // Provides information to the recognizer that specifies how to process the
 // request.
 message RecognitionConfig {
-  // Audio encoding of the data sent in the audio message. All encodings support
-  // only 1 channel (mono) audio. Only `FLAC` and `WAV` include a header that
-  // describes the bytes of audio that follow the header. The other encodings
-  // are raw audio bytes with no header.
+  // The encoding of the audio data sent in the request.
+  //
+  // All encodings support only 1 channel (mono) audio.
   //
   // For best results, the audio source should be captured and transmitted using
-  // a lossless encoding (`FLAC` or `LINEAR16`). Recognition accuracy may be
-  // reduced if lossy codecs, which include the other codecs listed in
-  // this section, are used to capture or transmit the audio, particularly if
-  // background noise is present.
+  // a lossless encoding (`FLAC` or `LINEAR16`). The accuracy of the speech
+  // recognition can be reduced if lossy codecs are used to capture or transmit
+  // audio, particularly if background noise is present. Lossy codecs include
+  // `MULAW`, `AMR`, `AMR_WB`, `OGG_OPUS`, and `SPEEX_WITH_HEADER_BYTE`.
+  //
+  // The `FLAC` and `WAV` audio file formats include a header that describes the
+  // included audio content. You can request recognition for `WAV` files that
+  // contain either `LINEAR16` or `MULAW` encoded audio.
+  // If you send `FLAC` or `WAV` audio file format in
+  // your request, you do not need to specify an `AudioEncoding`; the audio
+  // encoding format is determined from the file header. If you specify
+  // an `AudioEncoding` when you send  send `FLAC` or `WAV` audio, the
+  // encoding configuration must match the encoding described in the audio
+  // header; otherwise the request returns an
+  // [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT] error code.
   enum AudioEncoding {
-    // Not specified. Will return result [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT].
+    // Not specified.
     ENCODING_UNSPECIFIED = 0;
 
     // Uncompressed 16-bit signed little-endian samples (Linear PCM).
     LINEAR16 = 1;
 
-    // [`FLAC`](https://xiph.org/flac/documentation.html) (Free Lossless Audio
+    // `FLAC` (Free Lossless Audio
     // Codec) is the recommended encoding because it is
     // lossless--therefore recognition is not compromised--and
     // requires only about half the bandwidth of `LINEAR16`. `FLAC` stream
@@ -163,7 +182,7 @@ message RecognitionConfig {
 
     // Opus encoded audio frames in Ogg container
     // ([OggOpus](https://wiki.xiph.org/OggOpus)).
-    // `sample_rate_hertz` must be 16000.
+    // `sample_rate_hertz` must be one of 8000, 12000, 16000, 24000, or 48000.
     OGG_OPUS = 6;
 
     // Although the use of lossy encodings is not recommended, if a very low
@@ -182,20 +201,24 @@ message RecognitionConfig {
     SPEEX_WITH_HEADER_BYTE = 7;
   }
 
-  // *Required* Encoding of audio data sent in all `RecognitionAudio` messages.
+  // Encoding of audio data sent in all `RecognitionAudio` messages.
+  // This field is optional for `FLAC` and `WAV` audio files and required
+  // for all other audio formats. For details, see [AudioEncoding][google.cloud.speech.v1.RecognitionConfig.AudioEncoding].
   AudioEncoding encoding = 1;
 
-  // *Required* Sample rate in Hertz of the audio data sent in all
+  // Sample rate in Hertz of the audio data sent in all
   // `RecognitionAudio` messages. Valid values are: 8000-48000.
   // 16000 is optimal. For best results, set the sampling rate of the audio
   // source to 16000 Hz. If that's not possible, use the native sample rate of
   // the audio source (instead of re-sampling).
+  // This field is optional for `FLAC` and `WAV` audio files and required
+  // for all other audio formats. For details, see [AudioEncoding][google.cloud.speech.v1.RecognitionConfig.AudioEncoding].
   int32 sample_rate_hertz = 2;
 
   // *Required* The language of the supplied audio as a
   // [BCP-47](https://www.rfc-editor.org/rfc/bcp/bcp47.txt) language tag.
   // Example: "en-US".
-  // See [Language Support](https://cloud.google.com/speech/docs/languages)
+  // See [Language Support](/speech-to-text/docs/languages)
   // for a list of the currently supported language codes.
   string language_code = 3;
 
@@ -213,7 +236,9 @@ message RecognitionConfig {
   // won't be filtered out.
   bool profanity_filter = 5;
 
-  // *Optional* A means to provide context to assist the speech recognition.
+  // *Optional* array of [SpeechContext][google.cloud.speech.v1.SpeechContext].
+  // A means to provide context to assist the speech recognition. For more
+  // information, see [Phrase Hints](/speech-to-text/docs/basics#phrase-hints).
   repeated SpeechContext speech_contexts = 6;
 
   // *Optional* If `true`, the top result includes a list of words and
@@ -221,6 +246,62 @@ message RecognitionConfig {
   // `false`, no word-level time offset information is returned. The default is
   // `false`.
   bool enable_word_time_offsets = 8;
+
+  // *Optional* If 'true', adds punctuation to recognition result hypotheses.
+  // This feature is only available in select languages. Setting this for
+  // requests in other languages has no effect at all.
+  // The default 'false' value does not add punctuation to result hypotheses.
+  // Note: This is currently offered as an experimental service, complimentary
+  // to all users. In the future this may be exclusively available as a
+  // premium feature.
+  bool enable_automatic_punctuation = 11;
+
+  // *Optional* Which model to select for the given request. Select the model
+  // best suited to your domain to get best results. If a model is not
+  // explicitly specified, then we auto-select a model based on the parameters
+  // in the RecognitionConfig.
+  // 

+  //   
+  //     
+  //     
+  //   
+  //   
+  //     
+  //     
+  //   
+  //   
+  //     
+  //     
+  //   
+  //   
+  //     
+  //     
+  //   
+  //   
+  //     
+  //     
+  //   
+  // 
ModelDescription
command_and_searchBest for short queries such as voice commands or voice search.
phone_callBest for audio that originated from a phone call (typically
+  //     recorded at an 8khz sampling rate).
videoBest for audio that originated from from video or includes multiple
+  //         speakers. Ideally the audio is recorded at a 16khz or greater
+  //         sampling rate. This is a premium model that costs more than the
+  //         standard rate.
defaultBest for audio that is not one of the specific audio models.
+  //         For example, long-form audio. Ideally the audio is high-fidelity,
+  //         recorded at a 16khz or greater sampling rate.

+  string model = 13;
+
+  // *Optional* Set to true to use an enhanced model for speech recognition.
+  // You must also set the `model` field to a valid, enhanced model. If
+  // `use_enhanced` is set to true and the `model` field is not set, then
+  // `use_enhanced` is ignored. If `use_enhanced` is true and an enhanced
+  // version of the specified model does not exist, then the speech is
+  // recognized using the standard version of the specified model.
+  //
+  // Enhanced speech models require that you opt-in to data logging using
+  // instructions in the [documentation](/speech-to-text/enable-data-logging).
+  // If you set `use_enhanced` to true and you have not enabled audio logging,
+  // then you will receive an error.
+  bool use_enhanced = 14;
 }
 
 // Provides "hints" to the speech recognizer to favor specific words and phrases
@@ -231,14 +312,14 @@ message SpeechContext {
   // to improve the accuracy for specific words and phrases, for example, if
   // specific commands are typically spoken by the user. This can also be used
   // to add additional words to the vocabulary of the recognizer. See
-  // [usage limits](https://cloud.google.com/speech/limits#content).
+  // [usage limits](/speech-to-text/quotas#content).
   repeated string phrases = 1;
 }
 
 // Contains audio data in the encoding specified in the `RecognitionConfig`.
 // Either `content` or `uri` must be supplied. Supplying both or neither
 // returns [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT]. See
-// [audio limits](https://cloud.google.com/speech/limits#content).
+// [content limits](/speech-to-text/quotas#content).
 message RecognitionAudio {
   // The audio source, which is either inline content or a Google Cloud
   // Storage uri.
@@ -249,7 +330,8 @@ message RecognitionAudio {
     bytes content = 1;
 
     // URI that points to a file that contains audio data bytes as specified in
-    // `RecognitionConfig`. Currently, only Google Cloud Storage URIs are
+    // `RecognitionConfig`. The file must not be compressed (for example, gzip).
+    // Currently, only Google Cloud Storage URIs are
     // supported, which must be specified in the following format:
     // `gs://bucket_name/object_name` (other URI formats return
     // [google.rpc.Code.INVALID_ARGUMENT][google.rpc.Code.INVALID_ARGUMENT]). For more information, see
@@ -262,7 +344,7 @@ message RecognitionAudio {
 // contains the result as zero or more sequential `SpeechRecognitionResult`
 // messages.
 message RecognizeResponse {
-  // *Output-only* Sequential list of transcription results corresponding to
+  // Output only. Sequential list of transcription results corresponding to
   // sequential portions of audio.
   repeated SpeechRecognitionResult results = 2;
 }
@@ -273,7 +355,7 @@ message RecognizeResponse {
 // returned by the `GetOperation` call of the `google::longrunning::Operations`
 // service.
 message LongRunningRecognizeResponse {
-  // *Output-only* Sequential list of transcription results corresponding to
+  // Output only. Sequential list of transcription results corresponding to
   // sequential portions of audio.
   repeated SpeechRecognitionResult results = 2;
 }
@@ -358,35 +440,37 @@ message StreamingRecognizeResponse {
     END_OF_SINGLE_UTTERANCE = 1;
   }
 
-  // *Output-only* If set, returns a [google.rpc.Status][google.rpc.Status] message that
+  // Output only. If set, returns a [google.rpc.Status][google.rpc.Status] message that
   // specifies the error for the operation.
   google.rpc.Status error = 1;
 
-  // *Output-only* This repeated list contains zero or more results that
+  // Output only. This repeated list contains zero or more results that
   // correspond to consecutive portions of the audio currently being processed.
-  // It contains zero or more `is_final=false` results followed by zero or one
-  // `is_final=true` result (the newly settled portion).
+  // It contains zero or one `is_final=true` result (the newly settled portion),
+  // followed by zero or more `is_final=false` results (the interim results).
   repeated StreamingRecognitionResult results = 2;
 
-  // *Output-only* Indicates the type of speech event.
+  // Output only. Indicates the type of speech event.
   SpeechEventType speech_event_type = 4;
 }
 
 // A streaming speech recognition result corresponding to a portion of the audio
 // that is currently being processed.
 message StreamingRecognitionResult {
-  // *Output-only* May contain one or more recognition hypotheses (up to the
+  // Output only. May contain one or more recognition hypotheses (up to the
   // maximum specified in `max_alternatives`).
+  // These alternatives are ordered in terms of accuracy, with the top (first)
+  // alternative being the most probable, as ranked by the recognizer.
   repeated SpeechRecognitionAlternative alternatives = 1;
 
-  // *Output-only* If `false`, this `StreamingRecognitionResult` represents an
+  // Output only. If `false`, this `StreamingRecognitionResult` represents an
   // interim result that may change. If `true`, this is the final time the
   // speech service will return this particular `StreamingRecognitionResult`,
   // the recognizer will not return any further hypotheses for this portion of
   // the transcript and corresponding audio.
   bool is_final = 2;
 
-  // *Output-only* An estimate of the likelihood that the recognizer will not
+  // Output only. An estimate of the likelihood that the recognizer will not
   // change its guess about this interim result. Values range from 0.0
   // (completely unstable) to 1.0 (completely stable).
   // This field is only provided for interim results (`is_final=false`).
@@ -396,7 +480,7 @@ message StreamingRecognitionResult {
 
 // A speech recognition result corresponding to a portion of the audio.
 message SpeechRecognitionResult {
-  // *Output-only* May contain one or more recognition hypotheses (up to the
+  // Output only. May contain one or more recognition hypotheses (up to the
   // maximum specified in `max_alternatives`).
   // These alternatives are ordered in terms of accuracy, with the top (first)
   // alternative being the most probable, as ranked by the recognizer.
@@ -405,26 +489,25 @@ message SpeechRecognitionResult {
 
 // Alternative hypotheses (a.k.a. n-best list).
 message SpeechRecognitionAlternative {
-  // *Output-only* Transcript text representing the words that the user spoke.
+  // Output only. Transcript text representing the words that the user spoke.
   string transcript = 1;
 
-  // *Output-only* The confidence estimate between 0.0 and 1.0. A higher number
+  // Output only. The confidence estimate between 0.0 and 1.0. A higher number
   // indicates an estimated greater likelihood that the recognized words are
-  // correct. This field is typically provided only for the top hypothesis, and
-  // only for `is_final=true` results. Clients should not rely on the
-  // `confidence` field as it is not guaranteed to be accurate or consistent.
+  // correct. This field is set only for the top alternative of a non-streaming
+  // result or, of a streaming result where `is_final=true`.
+  // This field is not guaranteed to be accurate and users should not rely on it
+  // to be always provided.
   // The default of 0.0 is a sentinel value indicating `confidence` was not set.
   float confidence = 2;
 
-  // *Output-only* A list of word-specific information for each recognized word.
+  // Output only. A list of word-specific information for each recognized word.
   repeated WordInfo words = 3;
 }
 
-// Word-specific information for recognized words. Word information is only
-// included in the response when certain request parameters are set, such
-// as `enable_word_time_offsets`.
+// Word-specific information for recognized words.
 message WordInfo {
-  // *Output-only* Time offset relative to the beginning of the audio,
+  // Output only. Time offset relative to the beginning of the audio,
   // and corresponding to the start of the spoken word.
   // This field is only set if `enable_word_time_offsets=true` and only
   // in the top hypothesis.
@@ -432,7 +515,7 @@ message WordInfo {
   // vary.
   google.protobuf.Duration start_time = 1;
 
-  // *Output-only* Time offset relative to the beginning of the audio,
+  // Output only. Time offset relative to the beginning of the audio,
   // and corresponding to the end of the spoken word.
   // This field is only set if `enable_word_time_offsets=true` and only
   // in the top hypothesis.
@@ -440,6 +523,6 @@ message WordInfo {
   // vary.
   google.protobuf.Duration end_time = 2;
 
-  // *Output-only* The word corresponding to this set of information.
+  // Output only. The word corresponding to this set of information.
   string word = 3;
 }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/LongRunningRecognizeMetadata.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/LongRunningRecognizeMetadata.java
index 999c0ab5e5a0..b2d53d7e66bb 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/LongRunningRecognizeMetadata.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/LongRunningRecognizeMetadata.java
@@ -35,9 +35,6 @@ private LongRunningRecognizeMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private LongRunningRecognizeMetadata(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
 
             progressPercent_ = input.readInt32();
@@ -80,13 +84,6 @@ private LongRunningRecognizeMetadata(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -104,7 +101,6 @@ private LongRunningRecognizeMetadata(
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_LongRunningRecognizeMetadata_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_LongRunningRecognizeMetadata_fieldAccessorTable
@@ -193,7 +189,6 @@ public com.google.protobuf.TimestampOrBuilder getLastUpdateTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -203,7 +198,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (progressPercent_ != 0) {
@@ -218,7 +212,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -360,7 +353,6 @@ public static com.google.cloud.speech.v1p1beta1.LongRunningRecognizeMetadata par
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -368,7 +360,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.speech.v1p1beta1.LongRunningRecognizeMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -398,7 +389,6 @@ public static final class Builder extends
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_LongRunningRecognizeMetadata_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_LongRunningRecognizeMetadata_fieldAccessorTable
@@ -421,7 +411,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       progressPercent_ = 0;
@@ -441,18 +430,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_LongRunningRecognizeMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.LongRunningRecognizeMetadata getDefaultInstanceForType() {
       return com.google.cloud.speech.v1p1beta1.LongRunningRecognizeMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.LongRunningRecognizeMetadata build() {
       com.google.cloud.speech.v1p1beta1.LongRunningRecognizeMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -461,7 +447,6 @@ public com.google.cloud.speech.v1p1beta1.LongRunningRecognizeMetadata build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.LongRunningRecognizeMetadata buildPartial() {
       com.google.cloud.speech.v1p1beta1.LongRunningRecognizeMetadata result = new com.google.cloud.speech.v1p1beta1.LongRunningRecognizeMetadata(this);
       result.progressPercent_ = progressPercent_;
@@ -479,39 +464,32 @@ public com.google.cloud.speech.v1p1beta1.LongRunningRecognizeMetadata buildParti
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.speech.v1p1beta1.LongRunningRecognizeMetadata) {
         return mergeFrom((com.google.cloud.speech.v1p1beta1.LongRunningRecognizeMetadata)other);
@@ -537,12 +515,10 @@ public Builder mergeFrom(com.google.cloud.speech.v1p1beta1.LongRunningRecognizeM
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -907,13 +883,11 @@ public com.google.protobuf.TimestampOrBuilder getLastUpdateTimeOrBuilder() {
       }
       return lastUpdateTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -935,12 +909,11 @@ public static com.google.cloud.speech.v1p1beta1.LongRunningRecognizeMetadata get
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LongRunningRecognizeMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LongRunningRecognizeMetadata(input, extensionRegistry);
+        return new LongRunningRecognizeMetadata(input, extensionRegistry);
     }
   };
 
@@ -953,7 +926,6 @@ public com.google.protobuf.Parser getParserForType
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.speech.v1p1beta1.LongRunningRecognizeMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/LongRunningRecognizeRequest.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/LongRunningRecognizeRequest.java
index bb27e6779bd2..9c4b70f48d5e 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/LongRunningRecognizeRequest.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/LongRunningRecognizeRequest.java
@@ -33,9 +33,6 @@ private LongRunningRecognizeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private LongRunningRecognizeRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.speech.v1p1beta1.RecognitionConfig.Builder subBuilder = null;
             if (config_ != null) {
@@ -73,13 +77,6 @@ private LongRunningRecognizeRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private LongRunningRecognizeRequest(
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_LongRunningRecognizeRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_LongRunningRecognizeRequest_fieldAccessorTable
@@ -175,7 +171,6 @@ public com.google.cloud.speech.v1p1beta1.RecognitionAudioOrBuilder getAudioOrBui
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -185,7 +180,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (config_ != null) {
@@ -197,7 +191,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -331,7 +324,6 @@ public static com.google.cloud.speech.v1p1beta1.LongRunningRecognizeRequest pars
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -339,7 +331,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.speech.v1p1beta1.LongRunningRecognizeRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -368,7 +359,6 @@ public static final class Builder extends
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_LongRunningRecognizeRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_LongRunningRecognizeRequest_fieldAccessorTable
@@ -391,7 +381,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (configBuilder_ == null) {
@@ -409,18 +398,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_LongRunningRecognizeRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.LongRunningRecognizeRequest getDefaultInstanceForType() {
       return com.google.cloud.speech.v1p1beta1.LongRunningRecognizeRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.LongRunningRecognizeRequest build() {
       com.google.cloud.speech.v1p1beta1.LongRunningRecognizeRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -429,7 +415,6 @@ public com.google.cloud.speech.v1p1beta1.LongRunningRecognizeRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.LongRunningRecognizeRequest buildPartial() {
       com.google.cloud.speech.v1p1beta1.LongRunningRecognizeRequest result = new com.google.cloud.speech.v1p1beta1.LongRunningRecognizeRequest(this);
       if (configBuilder_ == null) {
@@ -446,39 +431,32 @@ public com.google.cloud.speech.v1p1beta1.LongRunningRecognizeRequest buildPartia
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.speech.v1p1beta1.LongRunningRecognizeRequest) {
         return mergeFrom((com.google.cloud.speech.v1p1beta1.LongRunningRecognizeRequest)other);
@@ -501,12 +479,10 @@ public Builder mergeFrom(com.google.cloud.speech.v1p1beta1.LongRunningRecognizeR
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -839,13 +815,11 @@ public com.google.cloud.speech.v1p1beta1.RecognitionAudioOrBuilder getAudioOrBui
       }
       return audioBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -867,12 +841,11 @@ public static com.google.cloud.speech.v1p1beta1.LongRunningRecognizeRequest getD
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LongRunningRecognizeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LongRunningRecognizeRequest(input, extensionRegistry);
+        return new LongRunningRecognizeRequest(input, extensionRegistry);
     }
   };
 
@@ -885,7 +858,6 @@ public com.google.protobuf.Parser getParserForType(
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.speech.v1p1beta1.LongRunningRecognizeRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/LongRunningRecognizeResponse.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/LongRunningRecognizeResponse.java
index c213955cacee..88c0ee7cdffb 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/LongRunningRecognizeResponse.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/LongRunningRecognizeResponse.java
@@ -37,9 +37,6 @@ private LongRunningRecognizeResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private LongRunningRecognizeResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               results_ = new java.util.ArrayList();
@@ -60,13 +64,6 @@ private LongRunningRecognizeResponse(
                 input.readMessage(com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -87,7 +84,6 @@ private LongRunningRecognizeResponse(
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_LongRunningRecognizeResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_LongRunningRecognizeResponse_fieldAccessorTable
@@ -156,7 +152,6 @@ public com.google.cloud.speech.v1p1beta1.SpeechRecognitionResultOrBuilder getRes
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -166,7 +161,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < results_.size(); i++) {
@@ -175,7 +169,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -293,7 +286,6 @@ public static com.google.cloud.speech.v1p1beta1.LongRunningRecognizeResponse par
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -301,7 +293,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.speech.v1p1beta1.LongRunningRecognizeResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -333,7 +324,6 @@ public static final class Builder extends
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_LongRunningRecognizeResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_LongRunningRecognizeResponse_fieldAccessorTable
@@ -357,7 +347,6 @@ private void maybeForceBuilderInitialization() {
         getResultsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (resultsBuilder_ == null) {
@@ -369,18 +358,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_LongRunningRecognizeResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.LongRunningRecognizeResponse getDefaultInstanceForType() {
       return com.google.cloud.speech.v1p1beta1.LongRunningRecognizeResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.LongRunningRecognizeResponse build() {
       com.google.cloud.speech.v1p1beta1.LongRunningRecognizeResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -389,7 +375,6 @@ public com.google.cloud.speech.v1p1beta1.LongRunningRecognizeResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.LongRunningRecognizeResponse buildPartial() {
       com.google.cloud.speech.v1p1beta1.LongRunningRecognizeResponse result = new com.google.cloud.speech.v1p1beta1.LongRunningRecognizeResponse(this);
       int from_bitField0_ = bitField0_;
@@ -406,39 +391,32 @@ public com.google.cloud.speech.v1p1beta1.LongRunningRecognizeResponse buildParti
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.speech.v1p1beta1.LongRunningRecognizeResponse) {
         return mergeFrom((com.google.cloud.speech.v1p1beta1.LongRunningRecognizeResponse)other);
@@ -481,12 +459,10 @@ public Builder mergeFrom(com.google.cloud.speech.v1p1beta1.LongRunningRecognizeR
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -835,13 +811,11 @@ public com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult.Builder addResu
       }
       return resultsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -863,12 +837,11 @@ public static com.google.cloud.speech.v1p1beta1.LongRunningRecognizeResponse get
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LongRunningRecognizeResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LongRunningRecognizeResponse(input, extensionRegistry);
+        return new LongRunningRecognizeResponse(input, extensionRegistry);
     }
   };
 
@@ -881,7 +854,6 @@ public com.google.protobuf.Parser getParserForType
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.speech.v1p1beta1.LongRunningRecognizeResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionAudio.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionAudio.java
index cf2b2ac1e08c..6f0c458067f2 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionAudio.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionAudio.java
@@ -35,9 +35,6 @@ private RecognitionAudio(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private RecognitionAudio(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             audioSourceCase_ = 1;
             audioSource_ = input.readBytes();
@@ -60,13 +64,6 @@ private RecognitionAudio(
             audioSource_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private RecognitionAudio(
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_RecognitionAudio_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_RecognitionAudio_fieldAccessorTable
@@ -209,7 +205,6 @@ public java.lang.String getUri() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -219,7 +214,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (audioSourceCase_ == 1) {
@@ -232,7 +226,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -375,7 +368,6 @@ public static com.google.cloud.speech.v1p1beta1.RecognitionAudio parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -383,7 +375,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.speech.v1p1beta1.RecognitionAudio prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -414,7 +405,6 @@ public static final class Builder extends
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_RecognitionAudio_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_RecognitionAudio_fieldAccessorTable
@@ -437,7 +427,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       audioSourceCase_ = 0;
@@ -445,18 +434,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_RecognitionAudio_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.RecognitionAudio getDefaultInstanceForType() {
       return com.google.cloud.speech.v1p1beta1.RecognitionAudio.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.RecognitionAudio build() {
       com.google.cloud.speech.v1p1beta1.RecognitionAudio result = buildPartial();
       if (!result.isInitialized()) {
@@ -465,7 +451,6 @@ public com.google.cloud.speech.v1p1beta1.RecognitionAudio build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.RecognitionAudio buildPartial() {
       com.google.cloud.speech.v1p1beta1.RecognitionAudio result = new com.google.cloud.speech.v1p1beta1.RecognitionAudio(this);
       if (audioSourceCase_ == 1) {
@@ -479,39 +464,32 @@ public com.google.cloud.speech.v1p1beta1.RecognitionAudio buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.speech.v1p1beta1.RecognitionAudio) {
         return mergeFrom((com.google.cloud.speech.v1p1beta1.RecognitionAudio)other);
@@ -543,12 +521,10 @@ public Builder mergeFrom(com.google.cloud.speech.v1p1beta1.RecognitionAudio othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -757,13 +733,11 @@ public Builder setUriBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -785,12 +759,11 @@ public static com.google.cloud.speech.v1p1beta1.RecognitionAudio getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RecognitionAudio parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RecognitionAudio(input, extensionRegistry);
+        return new RecognitionAudio(input, extensionRegistry);
     }
   };
 
@@ -803,7 +776,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.speech.v1p1beta1.RecognitionAudio getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionConfig.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionConfig.java
index 16a15615eba4..192cb0735458 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionConfig.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionConfig.java
@@ -49,9 +49,6 @@ private RecognitionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -63,6 +60,13 @@ private RecognitionConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -167,13 +171,6 @@ private RecognitionConfig(
             alternativeLanguageCodes_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -197,7 +194,6 @@ private RecognitionConfig(
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_RecognitionConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_RecognitionConfig_fieldAccessorTable
@@ -504,7 +500,6 @@ public int getEncodingValue() {
    * .google.cloud.speech.v1p1beta1.RecognitionConfig.AudioEncoding encoding = 1;
    */
   public com.google.cloud.speech.v1p1beta1.RecognitionConfig.AudioEncoding getEncoding() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.speech.v1p1beta1.RecognitionConfig.AudioEncoding result = com.google.cloud.speech.v1p1beta1.RecognitionConfig.AudioEncoding.valueOf(encoding_);
     return result == null ? com.google.cloud.speech.v1p1beta1.RecognitionConfig.AudioEncoding.UNRECOGNIZED : result;
   }
@@ -1040,7 +1035,6 @@ public boolean getUseEnhanced() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1050,7 +1044,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (encoding_ != com.google.cloud.speech.v1p1beta1.RecognitionConfig.AudioEncoding.ENCODING_UNSPECIFIED.getNumber()) {
@@ -1107,7 +1100,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1368,7 +1360,6 @@ public static com.google.cloud.speech.v1p1beta1.RecognitionConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1376,7 +1367,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.speech.v1p1beta1.RecognitionConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1405,7 +1395,6 @@ public static final class Builder extends
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_RecognitionConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_RecognitionConfig_fieldAccessorTable
@@ -1429,7 +1418,6 @@ private void maybeForceBuilderInitialization() {
         getSpeechContextsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       encoding_ = 0;
@@ -1477,18 +1465,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_RecognitionConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.RecognitionConfig getDefaultInstanceForType() {
       return com.google.cloud.speech.v1p1beta1.RecognitionConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.RecognitionConfig build() {
       com.google.cloud.speech.v1p1beta1.RecognitionConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -1497,7 +1482,6 @@ public com.google.cloud.speech.v1p1beta1.RecognitionConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.RecognitionConfig buildPartial() {
       com.google.cloud.speech.v1p1beta1.RecognitionConfig result = new com.google.cloud.speech.v1p1beta1.RecognitionConfig(this);
       int from_bitField0_ = bitField0_;
@@ -1540,39 +1524,32 @@ public com.google.cloud.speech.v1p1beta1.RecognitionConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.speech.v1p1beta1.RecognitionConfig) {
         return mergeFrom((com.google.cloud.speech.v1p1beta1.RecognitionConfig)other);
@@ -1672,12 +1649,10 @@ public Builder mergeFrom(com.google.cloud.speech.v1p1beta1.RecognitionConfig oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1734,7 +1709,6 @@ public Builder setEncodingValue(int value) {
      * .google.cloud.speech.v1p1beta1.RecognitionConfig.AudioEncoding encoding = 1;
      */
     public com.google.cloud.speech.v1p1beta1.RecognitionConfig.AudioEncoding getEncoding() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.speech.v1p1beta1.RecognitionConfig.AudioEncoding result = com.google.cloud.speech.v1p1beta1.RecognitionConfig.AudioEncoding.valueOf(encoding_);
       return result == null ? com.google.cloud.speech.v1p1beta1.RecognitionConfig.AudioEncoding.UNRECOGNIZED : result;
     }
@@ -3404,13 +3378,11 @@ public Builder clearUseEnhanced() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -3432,12 +3404,11 @@ public static com.google.cloud.speech.v1p1beta1.RecognitionConfig getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RecognitionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RecognitionConfig(input, extensionRegistry);
+        return new RecognitionConfig(input, extensionRegistry);
     }
   };
 
@@ -3450,7 +3421,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.speech.v1p1beta1.RecognitionConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionMetadata.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionMetadata.java
index 6270b423b341..2ba591550ca8 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionMetadata.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognitionMetadata.java
@@ -41,9 +41,6 @@ private RecognitionMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -55,6 +52,13 @@ private RecognitionMetadata(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -107,13 +111,6 @@ private RecognitionMetadata(
             audioTopic_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -131,7 +128,6 @@ private RecognitionMetadata(
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_RecognitionMetadata_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_RecognitionMetadata_fieldAccessorTable
@@ -905,7 +901,6 @@ public int getInteractionTypeValue() {
    * .google.cloud.speech.v1p1beta1.RecognitionMetadata.InteractionType interaction_type = 1;
    */
   public com.google.cloud.speech.v1p1beta1.RecognitionMetadata.InteractionType getInteractionType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.speech.v1p1beta1.RecognitionMetadata.InteractionType result = com.google.cloud.speech.v1p1beta1.RecognitionMetadata.InteractionType.valueOf(interactionType_);
     return result == null ? com.google.cloud.speech.v1p1beta1.RecognitionMetadata.InteractionType.UNRECOGNIZED : result;
   }
@@ -946,7 +941,6 @@ public int getMicrophoneDistanceValue() {
    * .google.cloud.speech.v1p1beta1.RecognitionMetadata.MicrophoneDistance microphone_distance = 4;
    */
   public com.google.cloud.speech.v1p1beta1.RecognitionMetadata.MicrophoneDistance getMicrophoneDistance() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.speech.v1p1beta1.RecognitionMetadata.MicrophoneDistance result = com.google.cloud.speech.v1p1beta1.RecognitionMetadata.MicrophoneDistance.valueOf(microphoneDistance_);
     return result == null ? com.google.cloud.speech.v1p1beta1.RecognitionMetadata.MicrophoneDistance.UNRECOGNIZED : result;
   }
@@ -971,7 +965,6 @@ public int getOriginalMediaTypeValue() {
    * .google.cloud.speech.v1p1beta1.RecognitionMetadata.OriginalMediaType original_media_type = 5;
    */
   public com.google.cloud.speech.v1p1beta1.RecognitionMetadata.OriginalMediaType getOriginalMediaType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.speech.v1p1beta1.RecognitionMetadata.OriginalMediaType result = com.google.cloud.speech.v1p1beta1.RecognitionMetadata.OriginalMediaType.valueOf(originalMediaType_);
     return result == null ? com.google.cloud.speech.v1p1beta1.RecognitionMetadata.OriginalMediaType.UNRECOGNIZED : result;
   }
@@ -996,7 +989,6 @@ public int getRecordingDeviceTypeValue() {
    * .google.cloud.speech.v1p1beta1.RecognitionMetadata.RecordingDeviceType recording_device_type = 6;
    */
   public com.google.cloud.speech.v1p1beta1.RecognitionMetadata.RecordingDeviceType getRecordingDeviceType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.speech.v1p1beta1.RecognitionMetadata.RecordingDeviceType result = com.google.cloud.speech.v1p1beta1.RecognitionMetadata.RecordingDeviceType.valueOf(recordingDeviceType_);
     return result == null ? com.google.cloud.speech.v1p1beta1.RecognitionMetadata.RecordingDeviceType.UNRECOGNIZED : result;
   }
@@ -1154,7 +1146,6 @@ public java.lang.String getAudioTopic() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1164,7 +1155,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (interactionType_ != com.google.cloud.speech.v1p1beta1.RecognitionMetadata.InteractionType.INTERACTION_TYPE_UNSPECIFIED.getNumber()) {
@@ -1197,7 +1187,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1371,7 +1360,6 @@ public static com.google.cloud.speech.v1p1beta1.RecognitionMetadata parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1379,7 +1367,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.speech.v1p1beta1.RecognitionMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1407,7 +1394,6 @@ public static final class Builder extends
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_RecognitionMetadata_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_RecognitionMetadata_fieldAccessorTable
@@ -1430,7 +1416,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       interactionType_ = 0;
@@ -1454,18 +1439,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_RecognitionMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.RecognitionMetadata getDefaultInstanceForType() {
       return com.google.cloud.speech.v1p1beta1.RecognitionMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.RecognitionMetadata build() {
       com.google.cloud.speech.v1p1beta1.RecognitionMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -1474,7 +1456,6 @@ public com.google.cloud.speech.v1p1beta1.RecognitionMetadata build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.RecognitionMetadata buildPartial() {
       com.google.cloud.speech.v1p1beta1.RecognitionMetadata result = new com.google.cloud.speech.v1p1beta1.RecognitionMetadata(this);
       result.interactionType_ = interactionType_;
@@ -1490,39 +1471,32 @@ public com.google.cloud.speech.v1p1beta1.RecognitionMetadata buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.speech.v1p1beta1.RecognitionMetadata) {
         return mergeFrom((com.google.cloud.speech.v1p1beta1.RecognitionMetadata)other);
@@ -1569,12 +1543,10 @@ public Builder mergeFrom(com.google.cloud.speech.v1p1beta1.RecognitionMetadata o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1624,7 +1596,6 @@ public Builder setInteractionTypeValue(int value) {
      * .google.cloud.speech.v1p1beta1.RecognitionMetadata.InteractionType interaction_type = 1;
      */
     public com.google.cloud.speech.v1p1beta1.RecognitionMetadata.InteractionType getInteractionType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.speech.v1p1beta1.RecognitionMetadata.InteractionType result = com.google.cloud.speech.v1p1beta1.RecognitionMetadata.InteractionType.valueOf(interactionType_);
       return result == null ? com.google.cloud.speech.v1p1beta1.RecognitionMetadata.InteractionType.UNRECOGNIZED : result;
     }
@@ -1736,7 +1707,6 @@ public Builder setMicrophoneDistanceValue(int value) {
      * .google.cloud.speech.v1p1beta1.RecognitionMetadata.MicrophoneDistance microphone_distance = 4;
      */
     public com.google.cloud.speech.v1p1beta1.RecognitionMetadata.MicrophoneDistance getMicrophoneDistance() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.speech.v1p1beta1.RecognitionMetadata.MicrophoneDistance result = com.google.cloud.speech.v1p1beta1.RecognitionMetadata.MicrophoneDistance.valueOf(microphoneDistance_);
       return result == null ? com.google.cloud.speech.v1p1beta1.RecognitionMetadata.MicrophoneDistance.UNRECOGNIZED : result;
     }
@@ -1801,7 +1771,6 @@ public Builder setOriginalMediaTypeValue(int value) {
      * .google.cloud.speech.v1p1beta1.RecognitionMetadata.OriginalMediaType original_media_type = 5;
      */
     public com.google.cloud.speech.v1p1beta1.RecognitionMetadata.OriginalMediaType getOriginalMediaType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.speech.v1p1beta1.RecognitionMetadata.OriginalMediaType result = com.google.cloud.speech.v1p1beta1.RecognitionMetadata.OriginalMediaType.valueOf(originalMediaType_);
       return result == null ? com.google.cloud.speech.v1p1beta1.RecognitionMetadata.OriginalMediaType.UNRECOGNIZED : result;
     }
@@ -1866,7 +1835,6 @@ public Builder setRecordingDeviceTypeValue(int value) {
      * .google.cloud.speech.v1p1beta1.RecognitionMetadata.RecordingDeviceType recording_device_type = 6;
      */
     public com.google.cloud.speech.v1p1beta1.RecognitionMetadata.RecordingDeviceType getRecordingDeviceType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.speech.v1p1beta1.RecognitionMetadata.RecordingDeviceType result = com.google.cloud.speech.v1p1beta1.RecognitionMetadata.RecordingDeviceType.valueOf(recordingDeviceType_);
       return result == null ? com.google.cloud.speech.v1p1beta1.RecognitionMetadata.RecordingDeviceType.UNRECOGNIZED : result;
     }
@@ -2237,13 +2205,11 @@ public Builder setAudioTopicBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2265,12 +2231,11 @@ public static com.google.cloud.speech.v1p1beta1.RecognitionMetadata getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RecognitionMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RecognitionMetadata(input, extensionRegistry);
+        return new RecognitionMetadata(input, extensionRegistry);
     }
   };
 
@@ -2283,7 +2248,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.speech.v1p1beta1.RecognitionMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognizeRequest.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognizeRequest.java
index a0bc09d8ac4d..1c0e2e6b8a38 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognizeRequest.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognizeRequest.java
@@ -32,9 +32,6 @@ private RecognizeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private RecognizeRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.speech.v1p1beta1.RecognitionConfig.Builder subBuilder = null;
             if (config_ != null) {
@@ -72,13 +76,6 @@ private RecognizeRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private RecognizeRequest(
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_RecognizeRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_RecognizeRequest_fieldAccessorTable
@@ -174,7 +170,6 @@ public com.google.cloud.speech.v1p1beta1.RecognitionAudioOrBuilder getAudioOrBui
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -184,7 +179,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (config_ != null) {
@@ -196,7 +190,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -330,7 +323,6 @@ public static com.google.cloud.speech.v1p1beta1.RecognizeRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -338,7 +330,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.speech.v1p1beta1.RecognizeRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -366,7 +357,6 @@ public static final class Builder extends
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_RecognizeRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_RecognizeRequest_fieldAccessorTable
@@ -389,7 +379,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (configBuilder_ == null) {
@@ -407,18 +396,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_RecognizeRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.RecognizeRequest getDefaultInstanceForType() {
       return com.google.cloud.speech.v1p1beta1.RecognizeRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.RecognizeRequest build() {
       com.google.cloud.speech.v1p1beta1.RecognizeRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -427,7 +413,6 @@ public com.google.cloud.speech.v1p1beta1.RecognizeRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.RecognizeRequest buildPartial() {
       com.google.cloud.speech.v1p1beta1.RecognizeRequest result = new com.google.cloud.speech.v1p1beta1.RecognizeRequest(this);
       if (configBuilder_ == null) {
@@ -444,39 +429,32 @@ public com.google.cloud.speech.v1p1beta1.RecognizeRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.speech.v1p1beta1.RecognizeRequest) {
         return mergeFrom((com.google.cloud.speech.v1p1beta1.RecognizeRequest)other);
@@ -499,12 +477,10 @@ public Builder mergeFrom(com.google.cloud.speech.v1p1beta1.RecognizeRequest othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -837,13 +813,11 @@ public com.google.cloud.speech.v1p1beta1.RecognitionAudioOrBuilder getAudioOrBui
       }
       return audioBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -865,12 +839,11 @@ public static com.google.cloud.speech.v1p1beta1.RecognizeRequest getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RecognizeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RecognizeRequest(input, extensionRegistry);
+        return new RecognizeRequest(input, extensionRegistry);
     }
   };
 
@@ -883,7 +856,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.speech.v1p1beta1.RecognizeRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognizeResponse.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognizeResponse.java
index 6b1524ee05bc..6b5d43ebcb90 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognizeResponse.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/RecognizeResponse.java
@@ -35,9 +35,6 @@ private RecognizeResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private RecognizeResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               results_ = new java.util.ArrayList();
@@ -58,13 +62,6 @@ private RecognizeResponse(
                 input.readMessage(com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -85,7 +82,6 @@ private RecognizeResponse(
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_RecognizeResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_RecognizeResponse_fieldAccessorTable
@@ -154,7 +150,6 @@ public com.google.cloud.speech.v1p1beta1.SpeechRecognitionResultOrBuilder getRes
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -164,7 +159,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < results_.size(); i++) {
@@ -173,7 +167,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -291,7 +284,6 @@ public static com.google.cloud.speech.v1p1beta1.RecognizeResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -299,7 +291,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.speech.v1p1beta1.RecognizeResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -329,7 +320,6 @@ public static final class Builder extends
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_RecognizeResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_RecognizeResponse_fieldAccessorTable
@@ -353,7 +343,6 @@ private void maybeForceBuilderInitialization() {
         getResultsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (resultsBuilder_ == null) {
@@ -365,18 +354,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_RecognizeResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.RecognizeResponse getDefaultInstanceForType() {
       return com.google.cloud.speech.v1p1beta1.RecognizeResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.RecognizeResponse build() {
       com.google.cloud.speech.v1p1beta1.RecognizeResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -385,7 +371,6 @@ public com.google.cloud.speech.v1p1beta1.RecognizeResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.RecognizeResponse buildPartial() {
       com.google.cloud.speech.v1p1beta1.RecognizeResponse result = new com.google.cloud.speech.v1p1beta1.RecognizeResponse(this);
       int from_bitField0_ = bitField0_;
@@ -402,39 +387,32 @@ public com.google.cloud.speech.v1p1beta1.RecognizeResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.speech.v1p1beta1.RecognizeResponse) {
         return mergeFrom((com.google.cloud.speech.v1p1beta1.RecognizeResponse)other);
@@ -477,12 +455,10 @@ public Builder mergeFrom(com.google.cloud.speech.v1p1beta1.RecognizeResponse oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -831,13 +807,11 @@ public com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult.Builder addResu
       }
       return resultsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -859,12 +833,11 @@ public static com.google.cloud.speech.v1p1beta1.RecognizeResponse getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RecognizeResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RecognizeResponse(input, extensionRegistry);
+        return new RecognizeResponse(input, extensionRegistry);
     }
   };
 
@@ -877,7 +850,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.speech.v1p1beta1.RecognizeResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechContext.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechContext.java
index 88bf669987cb..8a601189e1a8 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechContext.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechContext.java
@@ -34,9 +34,6 @@ private SpeechContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private SpeechContext(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -57,13 +61,6 @@ private SpeechContext(
             phrases_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private SpeechContext(
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_SpeechContext_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_SpeechContext_fieldAccessorTable
@@ -158,7 +154,6 @@ public java.lang.String getPhrases(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -168,7 +163,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < phrases_.size(); i++) {
@@ -177,7 +171,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -299,7 +292,6 @@ public static com.google.cloud.speech.v1p1beta1.SpeechContext parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -307,7 +299,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.speech.v1p1beta1.SpeechContext prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -336,7 +327,6 @@ public static final class Builder extends
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_SpeechContext_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_SpeechContext_fieldAccessorTable
@@ -359,7 +349,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       phrases_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -367,18 +356,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_SpeechContext_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.SpeechContext getDefaultInstanceForType() {
       return com.google.cloud.speech.v1p1beta1.SpeechContext.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.SpeechContext build() {
       com.google.cloud.speech.v1p1beta1.SpeechContext result = buildPartial();
       if (!result.isInitialized()) {
@@ -387,7 +373,6 @@ public com.google.cloud.speech.v1p1beta1.SpeechContext build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.SpeechContext buildPartial() {
       com.google.cloud.speech.v1p1beta1.SpeechContext result = new com.google.cloud.speech.v1p1beta1.SpeechContext(this);
       int from_bitField0_ = bitField0_;
@@ -400,39 +385,32 @@ public com.google.cloud.speech.v1p1beta1.SpeechContext buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.speech.v1p1beta1.SpeechContext) {
         return mergeFrom((com.google.cloud.speech.v1p1beta1.SpeechContext)other);
@@ -459,12 +437,10 @@ public Builder mergeFrom(com.google.cloud.speech.v1p1beta1.SpeechContext other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -658,13 +634,11 @@ public Builder addPhrasesBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -686,12 +660,11 @@ public static com.google.cloud.speech.v1p1beta1.SpeechContext getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SpeechContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SpeechContext(input, extensionRegistry);
+        return new SpeechContext(input, extensionRegistry);
     }
   };
 
@@ -704,7 +677,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.speech.v1p1beta1.SpeechContext getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechProto.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechProto.java
index f64d1ab6b196..445143d7447e 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechProto.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechProto.java
@@ -112,7 +112,7 @@ public static void registerAllExtensions(
       "\032\027google/rpc/status.proto\"\224\001\n\020RecognizeR" +
       "equest\022@\n\006config\030\001 \001(\01320.google.cloud.sp" +
       "eech.v1p1beta1.RecognitionConfig\022>\n\005audi" +
-      "o\030\002 \001(\0132/.google.cloud.speech.v1p1beta1." +
+      "o\030\002 \001(\0132/.google.cloud.speech.v1p1beta1.",
       "RecognitionAudio\"\237\001\n\033LongRunningRecogniz" +
       "eRequest\022@\n\006config\030\001 \001(\01320.google.cloud." +
       "speech.v1p1beta1.RecognitionConfig\022>\n\005au" +
@@ -122,7 +122,7 @@ public static void registerAllExtensions(
       "gle.cloud.speech.v1p1beta1.StreamingReco" +
       "gnitionConfigH\000\022\027\n\raudio_content\030\002 \001(\014H\000" +
       "B\023\n\021streaming_request\"\221\001\n\032StreamingRecog" +
-      "nitionConfig\022@\n\006config\030\001 \001(\01320.google.cl" +
+      "nitionConfig\022@\n\006config\030\001 \001(\01320.google.cl",
       "oud.speech.v1p1beta1.RecognitionConfig\022\030" +
       "\n\020single_utterance\030\002 \001(\010\022\027\n\017interim_resu" +
       "lts\030\003 \001(\010\"\254\006\n\021RecognitionConfig\022P\n\010encod" +
@@ -132,7 +132,7 @@ public static void registerAllExtensions(
       "unt\030\007 \001(\005\022/\n\'enable_separate_recognition" +
       "_per_channel\030\014 \001(\010\022\025\n\rlanguage_code\030\003 \001(" +
       "\t\022\"\n\032alternative_language_codes\030\022 \003(\t\022\030\n" +
-      "\020max_alternatives\030\004 \001(\005\022\030\n\020profanity_fil" +
+      "\020max_alternatives\030\004 \001(\005\022\030\n\020profanity_fil",
       "ter\030\005 \001(\010\022E\n\017speech_contexts\030\006 \003(\0132,.goo" +
       "gle.cloud.speech.v1p1beta1.SpeechContext" +
       "\022 \n\030enable_word_time_offsets\030\010 \001(\010\022\036\n\026en" +
@@ -142,7 +142,7 @@ public static void registerAllExtensions(
       "ker_count\030\021 \001(\005\022D\n\010metadata\030\t \001(\01322.goog" +
       "le.cloud.speech.v1p1beta1.RecognitionMet" +
       "adata\022\r\n\005model\030\r \001(\t\022\024\n\014use_enhanced\030\016 \001" +
-      "(\010\"\213\001\n\rAudioEncoding\022\030\n\024ENCODING_UNSPECI" +
+      "(\010\"\213\001\n\rAudioEncoding\022\030\n\024ENCODING_UNSPECI",
       "FIED\020\000\022\014\n\010LINEAR16\020\001\022\010\n\004FLAC\020\002\022\t\n\005MULAW\020" +
       "\003\022\007\n\003AMR\020\004\022\n\n\006AMR_WB\020\005\022\014\n\010OGG_OPUS\020\006\022\032\n\026" +
       "SPEEX_WITH_HEADER_BYTE\020\007\"\323\010\n\023Recognition" +
@@ -152,7 +152,7 @@ public static void registerAllExtensions(
       "_code_of_audio\030\003 \001(\r\022b\n\023microphone_dista" +
       "nce\030\004 \001(\0162E.google.cloud.speech.v1p1beta" +
       "1.RecognitionMetadata.MicrophoneDistance" +
-      "\022a\n\023original_media_type\030\005 \001(\0162D.google.c" +
+      "\022a\n\023original_media_type\030\005 \001(\0162D.google.c",
       "loud.speech.v1p1beta1.RecognitionMetadat" +
       "a.OriginalMediaType\022e\n\025recording_device_" +
       "type\030\006 \001(\0162F.google.cloud.speech.v1p1bet" +
@@ -162,7 +162,7 @@ public static void registerAllExtensions(
       " \001(\003\022\023\n\013audio_topic\030\n \001(\t\"\305\001\n\017Interactio" +
       "nType\022 \n\034INTERACTION_TYPE_UNSPECIFIED\020\000\022" +
       "\016\n\nDISCUSSION\020\001\022\020\n\014PRESENTATION\020\002\022\016\n\nPHO" +
-      "NE_CALL\020\003\022\r\n\tVOICEMAIL\020\004\022\033\n\027PROFESSIONAL" +
+      "NE_CALL\020\003\022\r\n\tVOICEMAIL\020\004\022\033\n\027PROFESSIONAL",
       "LY_PRODUCED\020\005\022\020\n\014VOICE_SEARCH\020\006\022\021\n\rVOICE" +
       "_COMMAND\020\007\022\r\n\tDICTATION\020\010\"d\n\022MicrophoneD" +
       "istance\022#\n\037MICROPHONE_DISTANCE_UNSPECIFI" +
@@ -172,7 +172,7 @@ public static void registerAllExtensions(
       "VIDEO\020\002\"\244\001\n\023RecordingDeviceType\022%\n!RECOR" +
       "DING_DEVICE_TYPE_UNSPECIFIED\020\000\022\016\n\nSMARTP" +
       "HONE\020\001\022\006\n\002PC\020\002\022\016\n\nPHONE_LINE\020\003\022\013\n\007VEHICL" +
-      "E\020\004\022\030\n\024OTHER_OUTDOOR_DEVICE\020\005\022\027\n\023OTHER_I" +
+      "E\020\004\022\030\n\024OTHER_OUTDOOR_DEVICE\020\005\022\027\n\023OTHER_I",
       "NDOOR_DEVICE\020\006\" \n\rSpeechContext\022\017\n\007phras" +
       "es\030\001 \003(\t\"D\n\020RecognitionAudio\022\021\n\007content\030" +
       "\001 \001(\014H\000\022\r\n\003uri\030\002 \001(\tH\000B\016\n\014audio_source\"\\" +
@@ -182,7 +182,7 @@ public static void registerAllExtensions(
       "onse\022G\n\007results\030\002 \003(\01326.google.cloud.spe" +
       "ech.v1p1beta1.SpeechRecognitionResult\"\236\001" +
       "\n\034LongRunningRecognizeMetadata\022\030\n\020progre" +
-      "ss_percent\030\001 \001(\005\022.\n\nstart_time\030\002 \001(\0132\032.g" +
+      "ss_percent\030\001 \001(\005\022.\n\nstart_time\030\002 \001(\0132\032.g",
       "oogle.protobuf.Timestamp\0224\n\020last_update_" +
       "time\030\003 \001(\0132\032.google.protobuf.Timestamp\"\277" +
       "\002\n\032StreamingRecognizeResponse\022!\n\005error\030\001" +
@@ -192,7 +192,7 @@ public static void registerAllExtensions(
       "e\030\004 \001(\0162I.google.cloud.speech.v1p1beta1." +
       "StreamingRecognizeResponse.SpeechEventTy" +
       "pe\"L\n\017SpeechEventType\022\034\n\030SPEECH_EVENT_UN" +
-      "SPECIFIED\020\000\022\033\n\027END_OF_SINGLE_UTTERANCE\020\001" +
+      "SPECIFIED\020\000\022\033\n\027END_OF_SINGLE_UTTERANCE\020\001",
       "\"\300\001\n\032StreamingRecognitionResult\022Q\n\014alter" +
       "natives\030\001 \003(\0132;.google.cloud.speech.v1p1" +
       "beta1.SpeechRecognitionAlternative\022\020\n\010is" +
@@ -202,7 +202,7 @@ public static void registerAllExtensions(
       "\001 \003(\0132;.google.cloud.speech.v1p1beta1.Sp" +
       "eechRecognitionAlternative\022\023\n\013channel_ta" +
       "g\030\002 \001(\005\022\025\n\rlanguage_code\030\005 \001(\t\"~\n\034Speech" +
-      "RecognitionAlternative\022\022\n\ntranscript\030\001 \001" +
+      "RecognitionAlternative\022\022\n\ntranscript\030\001 \001",
       "(\t\022\022\n\nconfidence\030\002 \001(\002\0226\n\005words\030\003 \003(\0132\'." +
       "google.cloud.speech.v1p1beta1.WordInfo\"\235" +
       "\001\n\010WordInfo\022-\n\nstart_time\030\001 \001(\0132\031.google" +
@@ -212,7 +212,7 @@ public static void registerAllExtensions(
       "\003\n\006Speech\022\226\001\n\tRecognize\022/.google.cloud.s" +
       "peech.v1p1beta1.RecognizeRequest\0320.googl" +
       "e.cloud.speech.v1p1beta1.RecognizeRespon" +
-      "se\"&\202\323\344\223\002 \"\033/v1p1beta1/speech:recognize:" +
+      "se\"&\202\323\344\223\002 \"\033/v1p1beta1/speech:recognize:",
       "\001*\022\244\001\n\024LongRunningRecognize\022:.google.clo" +
       "ud.speech.v1p1beta1.LongRunningRecognize" +
       "Request\032\035.google.longrunning.Operation\"1" +
@@ -222,7 +222,7 @@ public static void registerAllExtensions(
       "izeRequest\0329.google.cloud.speech.v1p1bet" +
       "a1.StreamingRecognizeResponse(\0010\001Bz\n!com" +
       ".google.cloud.speech.v1p1beta1B\013SpeechPr" +
-      "otoP\001ZCgoogle.golang.org/genproto/google" +
+      "otoP\001ZCgoogle.golang.org/genproto/google",
       "apis/cloud/speech/v1p1beta1;speech\370\001\001b\006p" +
       "roto3"
     };
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechRecognitionAlternative.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechRecognitionAlternative.java
index 2e53e4a1e11b..f601824e39c3 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechRecognitionAlternative.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechRecognitionAlternative.java
@@ -35,9 +35,6 @@ private SpeechRecognitionAlternative(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private SpeechRecognitionAlternative(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -69,13 +73,6 @@ private SpeechRecognitionAlternative(
                 input.readMessage(com.google.cloud.speech.v1p1beta1.WordInfo.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private SpeechRecognitionAlternative(
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_SpeechRecognitionAlternative_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_SpeechRecognitionAlternative_fieldAccessorTable
@@ -232,7 +228,6 @@ public com.google.cloud.speech.v1p1beta1.WordInfoOrBuilder getWordsOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -242,7 +237,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getTranscriptBytes().isEmpty()) {
@@ -257,7 +251,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -393,7 +386,6 @@ public static com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternative par
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -401,7 +393,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternative prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -429,7 +420,6 @@ public static final class Builder extends
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_SpeechRecognitionAlternative_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_SpeechRecognitionAlternative_fieldAccessorTable
@@ -453,7 +443,6 @@ private void maybeForceBuilderInitialization() {
         getWordsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       transcript_ = "";
@@ -469,18 +458,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_SpeechRecognitionAlternative_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternative getDefaultInstanceForType() {
       return com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternative.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternative build() {
       com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternative result = buildPartial();
       if (!result.isInitialized()) {
@@ -489,7 +475,6 @@ public com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternative build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternative buildPartial() {
       com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternative result = new com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternative(this);
       int from_bitField0_ = bitField0_;
@@ -510,39 +495,32 @@ public com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternative buildParti
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternative) {
         return mergeFrom((com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternative)other);
@@ -592,12 +570,10 @@ public Builder mergeFrom(com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlte
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1109,13 +1085,11 @@ public com.google.cloud.speech.v1p1beta1.WordInfo.Builder addWordsBuilder(
       }
       return wordsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1137,12 +1111,11 @@ public static com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternative get
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SpeechRecognitionAlternative parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SpeechRecognitionAlternative(input, extensionRegistry);
+        return new SpeechRecognitionAlternative(input, extensionRegistry);
     }
   };
 
@@ -1155,7 +1128,6 @@ public com.google.protobuf.Parser getParserForType
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.speech.v1p1beta1.SpeechRecognitionAlternative getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechRecognitionResult.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechRecognitionResult.java
index 030a679f6706..1708290e3a61 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechRecognitionResult.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/SpeechRecognitionResult.java
@@ -35,9 +35,6 @@ private SpeechRecognitionResult(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private SpeechRecognitionResult(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               alternatives_ = new java.util.ArrayList();
@@ -69,13 +73,6 @@ private SpeechRecognitionResult(
             languageCode_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private SpeechRecognitionResult(
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_SpeechRecognitionResult_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_SpeechRecognitionResult_fieldAccessorTable
@@ -239,7 +235,6 @@ public java.lang.String getLanguageCode() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -249,7 +244,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < alternatives_.size(); i++) {
@@ -264,7 +258,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -397,7 +390,6 @@ public static com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -405,7 +397,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -433,7 +424,6 @@ public static final class Builder extends
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_SpeechRecognitionResult_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_SpeechRecognitionResult_fieldAccessorTable
@@ -457,7 +447,6 @@ private void maybeForceBuilderInitialization() {
         getAlternativesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (alternativesBuilder_ == null) {
@@ -473,18 +462,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_SpeechRecognitionResult_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult getDefaultInstanceForType() {
       return com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult build() {
       com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult result = buildPartial();
       if (!result.isInitialized()) {
@@ -493,7 +479,6 @@ public com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult buildPartial() {
       com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult result = new com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult(this);
       int from_bitField0_ = bitField0_;
@@ -514,39 +499,32 @@ public com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult) {
         return mergeFrom((com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult)other);
@@ -596,12 +574,10 @@ public Builder mergeFrom(com.google.cloud.speech.v1p1beta1.SpeechRecognitionResu
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1134,13 +1110,11 @@ public Builder setLanguageCodeBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1162,12 +1136,11 @@ public static com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult getDefau
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SpeechRecognitionResult parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SpeechRecognitionResult(input, extensionRegistry);
+        return new SpeechRecognitionResult(input, extensionRegistry);
     }
   };
 
@@ -1180,7 +1153,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.speech.v1p1beta1.SpeechRecognitionResult getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionConfig.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionConfig.java
index 9b005ea127a2..773cf6aee71a 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionConfig.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionConfig.java
@@ -35,9 +35,6 @@ private StreamingRecognitionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private StreamingRecognitionConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.speech.v1p1beta1.RecognitionConfig.Builder subBuilder = null;
             if (config_ != null) {
@@ -72,13 +76,6 @@ private StreamingRecognitionConfig(
             interimResults_ = input.readBool();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private StreamingRecognitionConfig(
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_StreamingRecognitionConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_StreamingRecognitionConfig_fieldAccessorTable
@@ -179,7 +175,6 @@ public boolean getInterimResults() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -189,7 +184,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (config_ != null) {
@@ -204,7 +198,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -343,7 +336,6 @@ public static com.google.cloud.speech.v1p1beta1.StreamingRecognitionConfig parse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -351,7 +343,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.speech.v1p1beta1.StreamingRecognitionConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -380,7 +371,6 @@ public static final class Builder extends
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_StreamingRecognitionConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_StreamingRecognitionConfig_fieldAccessorTable
@@ -403,7 +393,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (configBuilder_ == null) {
@@ -419,18 +408,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_StreamingRecognitionConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.StreamingRecognitionConfig getDefaultInstanceForType() {
       return com.google.cloud.speech.v1p1beta1.StreamingRecognitionConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.StreamingRecognitionConfig build() {
       com.google.cloud.speech.v1p1beta1.StreamingRecognitionConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -439,7 +425,6 @@ public com.google.cloud.speech.v1p1beta1.StreamingRecognitionConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.StreamingRecognitionConfig buildPartial() {
       com.google.cloud.speech.v1p1beta1.StreamingRecognitionConfig result = new com.google.cloud.speech.v1p1beta1.StreamingRecognitionConfig(this);
       if (configBuilder_ == null) {
@@ -453,39 +438,32 @@ public com.google.cloud.speech.v1p1beta1.StreamingRecognitionConfig buildPartial
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.speech.v1p1beta1.StreamingRecognitionConfig) {
         return mergeFrom((com.google.cloud.speech.v1p1beta1.StreamingRecognitionConfig)other);
@@ -511,12 +489,10 @@ public Builder mergeFrom(com.google.cloud.speech.v1p1beta1.StreamingRecognitionC
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -808,13 +784,11 @@ public Builder clearInterimResults() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -836,12 +810,11 @@ public static com.google.cloud.speech.v1p1beta1.StreamingRecognitionConfig getDe
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public StreamingRecognitionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StreamingRecognitionConfig(input, extensionRegistry);
+        return new StreamingRecognitionConfig(input, extensionRegistry);
     }
   };
 
@@ -854,7 +827,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.speech.v1p1beta1.StreamingRecognitionConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionResult.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionResult.java
index e4e45bd2b3b6..d4d79044dc29 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionResult.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognitionResult.java
@@ -38,9 +38,6 @@ private StreamingRecognitionResult(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private StreamingRecognitionResult(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               alternatives_ = new java.util.ArrayList();
@@ -82,13 +86,6 @@ private StreamingRecognitionResult(
             languageCode_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -109,7 +106,6 @@ private StreamingRecognitionResult(
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_StreamingRecognitionResult_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_StreamingRecognitionResult_fieldAccessorTable
@@ -286,7 +282,6 @@ public java.lang.String getLanguageCode() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -296,7 +291,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < alternatives_.size(); i++) {
@@ -317,7 +311,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -470,7 +463,6 @@ public static com.google.cloud.speech.v1p1beta1.StreamingRecognitionResult parse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -478,7 +470,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.speech.v1p1beta1.StreamingRecognitionResult prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -507,7 +498,6 @@ public static final class Builder extends
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_StreamingRecognitionResult_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_StreamingRecognitionResult_fieldAccessorTable
@@ -531,7 +521,6 @@ private void maybeForceBuilderInitialization() {
         getAlternativesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (alternativesBuilder_ == null) {
@@ -551,18 +540,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_StreamingRecognitionResult_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.StreamingRecognitionResult getDefaultInstanceForType() {
       return com.google.cloud.speech.v1p1beta1.StreamingRecognitionResult.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.StreamingRecognitionResult build() {
       com.google.cloud.speech.v1p1beta1.StreamingRecognitionResult result = buildPartial();
       if (!result.isInitialized()) {
@@ -571,7 +557,6 @@ public com.google.cloud.speech.v1p1beta1.StreamingRecognitionResult build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.StreamingRecognitionResult buildPartial() {
       com.google.cloud.speech.v1p1beta1.StreamingRecognitionResult result = new com.google.cloud.speech.v1p1beta1.StreamingRecognitionResult(this);
       int from_bitField0_ = bitField0_;
@@ -594,39 +579,32 @@ public com.google.cloud.speech.v1p1beta1.StreamingRecognitionResult buildPartial
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.speech.v1p1beta1.StreamingRecognitionResult) {
         return mergeFrom((com.google.cloud.speech.v1p1beta1.StreamingRecognitionResult)other);
@@ -682,12 +660,10 @@ public Builder mergeFrom(com.google.cloud.speech.v1p1beta1.StreamingRecognitionR
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1320,13 +1296,11 @@ public Builder setLanguageCodeBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1348,12 +1322,11 @@ public static com.google.cloud.speech.v1p1beta1.StreamingRecognitionResult getDe
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public StreamingRecognitionResult parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StreamingRecognitionResult(input, extensionRegistry);
+        return new StreamingRecognitionResult(input, extensionRegistry);
     }
   };
 
@@ -1366,7 +1339,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.speech.v1p1beta1.StreamingRecognitionResult getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognizeRequest.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognizeRequest.java
index 5fa3c577f017..e5c359880e33 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognizeRequest.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognizeRequest.java
@@ -36,9 +36,6 @@ private StreamingRecognizeRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private StreamingRecognizeRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.speech.v1p1beta1.StreamingRecognitionConfig.Builder subBuilder = null;
             if (streamingRequestCase_ == 1) {
@@ -69,13 +73,6 @@ private StreamingRecognizeRequest(
             streamingRequest_ = input.readBytes();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -93,7 +90,6 @@ private StreamingRecognizeRequest(
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_StreamingRecognizeRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_StreamingRecognizeRequest_fieldAccessorTable
@@ -206,7 +202,6 @@ public com.google.protobuf.ByteString getAudioContent() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -216,7 +211,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (streamingRequestCase_ == 1) {
@@ -229,7 +223,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -373,7 +366,6 @@ public static com.google.cloud.speech.v1p1beta1.StreamingRecognizeRequest parseF
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -381,7 +373,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.speech.v1p1beta1.StreamingRecognizeRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -413,7 +404,6 @@ public static final class Builder extends
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_StreamingRecognizeRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_StreamingRecognizeRequest_fieldAccessorTable
@@ -436,7 +426,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       streamingRequestCase_ = 0;
@@ -444,18 +433,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_StreamingRecognizeRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.StreamingRecognizeRequest getDefaultInstanceForType() {
       return com.google.cloud.speech.v1p1beta1.StreamingRecognizeRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.StreamingRecognizeRequest build() {
       com.google.cloud.speech.v1p1beta1.StreamingRecognizeRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -464,7 +450,6 @@ public com.google.cloud.speech.v1p1beta1.StreamingRecognizeRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.StreamingRecognizeRequest buildPartial() {
       com.google.cloud.speech.v1p1beta1.StreamingRecognizeRequest result = new com.google.cloud.speech.v1p1beta1.StreamingRecognizeRequest(this);
       if (streamingRequestCase_ == 1) {
@@ -482,39 +467,32 @@ public com.google.cloud.speech.v1p1beta1.StreamingRecognizeRequest buildPartial(
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.speech.v1p1beta1.StreamingRecognizeRequest) {
         return mergeFrom((com.google.cloud.speech.v1p1beta1.StreamingRecognizeRequest)other);
@@ -544,12 +522,10 @@ public Builder mergeFrom(com.google.cloud.speech.v1p1beta1.StreamingRecognizeReq
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -838,13 +814,11 @@ public Builder clearAudioContent() {
       }
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -866,12 +840,11 @@ public static com.google.cloud.speech.v1p1beta1.StreamingRecognizeRequest getDef
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public StreamingRecognizeRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StreamingRecognizeRequest(input, extensionRegistry);
+        return new StreamingRecognizeRequest(input, extensionRegistry);
     }
   };
 
@@ -884,7 +857,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.speech.v1p1beta1.StreamingRecognizeRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognizeResponse.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognizeResponse.java
index 77b057902a9f..b4d150845c4e 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognizeResponse.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/StreamingRecognizeResponse.java
@@ -69,9 +69,6 @@ private StreamingRecognizeResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -83,6 +80,13 @@ private StreamingRecognizeResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.rpc.Status.Builder subBuilder = null;
             if (error_ != null) {
@@ -111,13 +115,6 @@ private StreamingRecognizeResponse(
             speechEventType_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -138,7 +135,6 @@ private StreamingRecognizeResponse(
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_StreamingRecognizeResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_StreamingRecognizeResponse_fieldAccessorTable
@@ -403,13 +399,11 @@ public int getSpeechEventTypeValue() {
    * .google.cloud.speech.v1p1beta1.StreamingRecognizeResponse.SpeechEventType speech_event_type = 4;
    */
   public com.google.cloud.speech.v1p1beta1.StreamingRecognizeResponse.SpeechEventType getSpeechEventType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.speech.v1p1beta1.StreamingRecognizeResponse.SpeechEventType result = com.google.cloud.speech.v1p1beta1.StreamingRecognizeResponse.SpeechEventType.valueOf(speechEventType_);
     return result == null ? com.google.cloud.speech.v1p1beta1.StreamingRecognizeResponse.SpeechEventType.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -419,7 +413,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (error_ != null) {
@@ -434,7 +427,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -572,7 +564,6 @@ public static com.google.cloud.speech.v1p1beta1.StreamingRecognizeResponse parse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -580,7 +571,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.speech.v1p1beta1.StreamingRecognizeResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -643,7 +633,6 @@ public static final class Builder extends
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_StreamingRecognizeResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_StreamingRecognizeResponse_fieldAccessorTable
@@ -667,7 +656,6 @@ private void maybeForceBuilderInitialization() {
         getResultsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (errorBuilder_ == null) {
@@ -687,18 +675,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_StreamingRecognizeResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.StreamingRecognizeResponse getDefaultInstanceForType() {
       return com.google.cloud.speech.v1p1beta1.StreamingRecognizeResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.StreamingRecognizeResponse build() {
       com.google.cloud.speech.v1p1beta1.StreamingRecognizeResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -707,7 +692,6 @@ public com.google.cloud.speech.v1p1beta1.StreamingRecognizeResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.StreamingRecognizeResponse buildPartial() {
       com.google.cloud.speech.v1p1beta1.StreamingRecognizeResponse result = new com.google.cloud.speech.v1p1beta1.StreamingRecognizeResponse(this);
       int from_bitField0_ = bitField0_;
@@ -732,39 +716,32 @@ public com.google.cloud.speech.v1p1beta1.StreamingRecognizeResponse buildPartial
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.speech.v1p1beta1.StreamingRecognizeResponse) {
         return mergeFrom((com.google.cloud.speech.v1p1beta1.StreamingRecognizeResponse)other);
@@ -813,12 +790,10 @@ public Builder mergeFrom(com.google.cloud.speech.v1p1beta1.StreamingRecognizeRes
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1397,7 +1372,6 @@ public Builder setSpeechEventTypeValue(int value) {
      * .google.cloud.speech.v1p1beta1.StreamingRecognizeResponse.SpeechEventType speech_event_type = 4;
      */
     public com.google.cloud.speech.v1p1beta1.StreamingRecognizeResponse.SpeechEventType getSpeechEventType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.speech.v1p1beta1.StreamingRecognizeResponse.SpeechEventType result = com.google.cloud.speech.v1p1beta1.StreamingRecognizeResponse.SpeechEventType.valueOf(speechEventType_);
       return result == null ? com.google.cloud.speech.v1p1beta1.StreamingRecognizeResponse.SpeechEventType.UNRECOGNIZED : result;
     }
@@ -1430,13 +1404,11 @@ public Builder clearSpeechEventType() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1458,12 +1430,11 @@ public static com.google.cloud.speech.v1p1beta1.StreamingRecognizeResponse getDe
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public StreamingRecognizeResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StreamingRecognizeResponse(input, extensionRegistry);
+        return new StreamingRecognizeResponse(input, extensionRegistry);
     }
   };
 
@@ -1476,7 +1447,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.speech.v1p1beta1.StreamingRecognizeResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/WordInfo.java b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/WordInfo.java
index 3f0359b694a1..6692b4e184b1 100644
--- a/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/WordInfo.java
+++ b/google-api-grpc/proto-google-cloud-speech-v1p1beta1/src/main/java/com/google/cloud/speech/v1p1beta1/WordInfo.java
@@ -35,9 +35,6 @@ private WordInfo(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private WordInfo(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.protobuf.Duration.Builder subBuilder = null;
             if (startTime_ != null) {
@@ -91,13 +95,6 @@ private WordInfo(
             speakerTag_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -115,7 +112,6 @@ private WordInfo(
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_WordInfo_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_WordInfo_fieldAccessorTable
@@ -298,7 +294,6 @@ public int getSpeakerTag() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -308,7 +303,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (startTime_ != null) {
@@ -329,7 +323,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -489,7 +482,6 @@ public static com.google.cloud.speech.v1p1beta1.WordInfo parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -497,7 +489,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.speech.v1p1beta1.WordInfo prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -525,7 +516,6 @@ public static final class Builder extends
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_WordInfo_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_WordInfo_fieldAccessorTable
@@ -548,7 +538,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (startTimeBuilder_ == null) {
@@ -572,18 +561,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.speech.v1p1beta1.SpeechProto.internal_static_google_cloud_speech_v1p1beta1_WordInfo_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.WordInfo getDefaultInstanceForType() {
       return com.google.cloud.speech.v1p1beta1.WordInfo.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.WordInfo build() {
       com.google.cloud.speech.v1p1beta1.WordInfo result = buildPartial();
       if (!result.isInitialized()) {
@@ -592,7 +578,6 @@ public com.google.cloud.speech.v1p1beta1.WordInfo build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.speech.v1p1beta1.WordInfo buildPartial() {
       com.google.cloud.speech.v1p1beta1.WordInfo result = new com.google.cloud.speech.v1p1beta1.WordInfo(this);
       if (startTimeBuilder_ == null) {
@@ -612,39 +597,32 @@ public com.google.cloud.speech.v1p1beta1.WordInfo buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.speech.v1p1beta1.WordInfo) {
         return mergeFrom((com.google.cloud.speech.v1p1beta1.WordInfo)other);
@@ -677,12 +655,10 @@ public Builder mergeFrom(com.google.cloud.speech.v1p1beta1.WordInfo other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1291,13 +1267,11 @@ public Builder clearSpeakerTag() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1319,12 +1293,11 @@ public static com.google.cloud.speech.v1p1beta1.WordInfo getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public WordInfo parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WordInfo(input, extensionRegistry);
+        return new WordInfo(input, extensionRegistry);
     }
   };
 
@@ -1337,7 +1310,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.speech.v1p1beta1.WordInfo getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/AcknowledgeTaskRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/AcknowledgeTaskRequest.java
index 3cda36e37ad5..0e243e405adb 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/AcknowledgeTaskRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/AcknowledgeTaskRequest.java
@@ -34,9 +34,6 @@ private AcknowledgeTaskRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private AcknowledgeTaskRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -67,13 +71,6 @@ private AcknowledgeTaskRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private AcknowledgeTaskRequest(
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_AcknowledgeTaskRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_AcknowledgeTaskRequest_fieldAccessorTable
@@ -194,7 +190,6 @@ public com.google.protobuf.TimestampOrBuilder getScheduleTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -204,7 +199,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -216,7 +210,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -344,7 +337,6 @@ public static com.google.cloud.tasks.v2beta2.AcknowledgeTaskRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -352,7 +344,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta2.AcknowledgeTaskRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -381,7 +372,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_AcknowledgeTaskRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_AcknowledgeTaskRequest_fieldAccessorTable
@@ -404,7 +394,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -418,18 +407,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_AcknowledgeTaskRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.AcknowledgeTaskRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta2.AcknowledgeTaskRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.AcknowledgeTaskRequest build() {
       com.google.cloud.tasks.v2beta2.AcknowledgeTaskRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -438,7 +424,6 @@ public com.google.cloud.tasks.v2beta2.AcknowledgeTaskRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.AcknowledgeTaskRequest buildPartial() {
       com.google.cloud.tasks.v2beta2.AcknowledgeTaskRequest result = new com.google.cloud.tasks.v2beta2.AcknowledgeTaskRequest(this);
       result.name_ = name_;
@@ -451,39 +436,32 @@ public com.google.cloud.tasks.v2beta2.AcknowledgeTaskRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta2.AcknowledgeTaskRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta2.AcknowledgeTaskRequest)other);
@@ -507,12 +485,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta2.AcknowledgeTaskRequest o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -827,13 +803,11 @@ public com.google.protobuf.TimestampOrBuilder getScheduleTimeOrBuilder() {
       }
       return scheduleTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -855,12 +829,11 @@ public static com.google.cloud.tasks.v2beta2.AcknowledgeTaskRequest getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AcknowledgeTaskRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AcknowledgeTaskRequest(input, extensionRegistry);
+        return new AcknowledgeTaskRequest(input, extensionRegistry);
     }
   };
 
@@ -873,7 +846,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta2.AcknowledgeTaskRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/AppEngineHttpRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/AppEngineHttpRequest.java
index c7e06f8e08f1..747247b5f116 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/AppEngineHttpRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/AppEngineHttpRequest.java
@@ -66,9 +66,6 @@ private AppEngineHttpRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -80,6 +77,13 @@ private AppEngineHttpRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -123,13 +127,6 @@ private AppEngineHttpRequest(
             payload_ = input.readBytes();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -148,7 +145,6 @@ private AppEngineHttpRequest(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -159,7 +155,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta2.TargetProto.internal_static_google_cloud_tasks_v2beta2_AppEngineHttpRequest_fieldAccessorTable
@@ -202,7 +197,6 @@ public int getHttpMethodValue() {
    * .google.cloud.tasks.v2beta2.HttpMethod http_method = 1;
    */
   public com.google.cloud.tasks.v2beta2.HttpMethod getHttpMethod() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.tasks.v2beta2.HttpMethod result = com.google.cloud.tasks.v2beta2.HttpMethod.valueOf(httpMethod_);
     return result == null ? com.google.cloud.tasks.v2beta2.HttpMethod.UNRECOGNIZED : result;
   }
@@ -536,7 +530,6 @@ public com.google.protobuf.ByteString getPayload() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -546,7 +539,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (httpMethod_ != com.google.cloud.tasks.v2beta2.HttpMethod.HTTP_METHOD_UNSPECIFIED.getNumber()) {
@@ -570,7 +562,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -729,7 +720,6 @@ public static com.google.cloud.tasks.v2beta2.AppEngineHttpRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -737,7 +727,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta2.AppEngineHttpRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -818,7 +807,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta2.TargetProto.internal_static_google_cloud_tasks_v2beta2_AppEngineHttpRequest_fieldAccessorTable
@@ -841,7 +829,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       httpMethod_ = 0;
@@ -860,18 +847,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta2.TargetProto.internal_static_google_cloud_tasks_v2beta2_AppEngineHttpRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.AppEngineHttpRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta2.AppEngineHttpRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.AppEngineHttpRequest build() {
       com.google.cloud.tasks.v2beta2.AppEngineHttpRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -880,7 +864,6 @@ public com.google.cloud.tasks.v2beta2.AppEngineHttpRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.AppEngineHttpRequest buildPartial() {
       com.google.cloud.tasks.v2beta2.AppEngineHttpRequest result = new com.google.cloud.tasks.v2beta2.AppEngineHttpRequest(this);
       int from_bitField0_ = bitField0_;
@@ -900,39 +883,32 @@ public com.google.cloud.tasks.v2beta2.AppEngineHttpRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta2.AppEngineHttpRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta2.AppEngineHttpRequest)other);
@@ -964,12 +940,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta2.AppEngineHttpRequest oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1041,7 +1015,6 @@ public Builder setHttpMethodValue(int value) {
      * .google.cloud.tasks.v2beta2.HttpMethod http_method = 1;
      */
     public com.google.cloud.tasks.v2beta2.HttpMethod getHttpMethod() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.tasks.v2beta2.HttpMethod result = com.google.cloud.tasks.v2beta2.HttpMethod.valueOf(httpMethod_);
       return result == null ? com.google.cloud.tasks.v2beta2.HttpMethod.UNRECOGNIZED : result;
     }
@@ -1807,13 +1780,11 @@ public Builder clearPayload() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1835,12 +1806,11 @@ public static com.google.cloud.tasks.v2beta2.AppEngineHttpRequest getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AppEngineHttpRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AppEngineHttpRequest(input, extensionRegistry);
+        return new AppEngineHttpRequest(input, extensionRegistry);
     }
   };
 
@@ -1853,7 +1823,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta2.AppEngineHttpRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/AppEngineHttpTarget.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/AppEngineHttpTarget.java
index a88c2b1fb410..114d796ad852 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/AppEngineHttpTarget.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/AppEngineHttpTarget.java
@@ -41,9 +41,6 @@ private AppEngineHttpTarget(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -55,6 +52,13 @@ private AppEngineHttpTarget(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.tasks.v2beta2.AppEngineRouting.Builder subBuilder = null;
             if (appEngineRoutingOverride_ != null) {
@@ -68,13 +72,6 @@ private AppEngineHttpTarget(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -92,7 +89,6 @@ private AppEngineHttpTarget(
     return com.google.cloud.tasks.v2beta2.TargetProto.internal_static_google_cloud_tasks_v2beta2_AppEngineHttpTarget_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta2.TargetProto.internal_static_google_cloud_tasks_v2beta2_AppEngineHttpTarget_fieldAccessorTable
@@ -146,7 +142,6 @@ public com.google.cloud.tasks.v2beta2.AppEngineRoutingOrBuilder getAppEngineRout
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -156,7 +151,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (appEngineRoutingOverride_ != null) {
@@ -165,7 +159,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -286,7 +279,6 @@ public static com.google.cloud.tasks.v2beta2.AppEngineHttpTarget parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -294,7 +286,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta2.AppEngineHttpTarget prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -331,7 +322,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta2.TargetProto.internal_static_google_cloud_tasks_v2beta2_AppEngineHttpTarget_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta2.TargetProto.internal_static_google_cloud_tasks_v2beta2_AppEngineHttpTarget_fieldAccessorTable
@@ -354,7 +344,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (appEngineRoutingOverrideBuilder_ == null) {
@@ -366,18 +355,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta2.TargetProto.internal_static_google_cloud_tasks_v2beta2_AppEngineHttpTarget_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.AppEngineHttpTarget getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta2.AppEngineHttpTarget.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.AppEngineHttpTarget build() {
       com.google.cloud.tasks.v2beta2.AppEngineHttpTarget result = buildPartial();
       if (!result.isInitialized()) {
@@ -386,7 +372,6 @@ public com.google.cloud.tasks.v2beta2.AppEngineHttpTarget build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.AppEngineHttpTarget buildPartial() {
       com.google.cloud.tasks.v2beta2.AppEngineHttpTarget result = new com.google.cloud.tasks.v2beta2.AppEngineHttpTarget(this);
       if (appEngineRoutingOverrideBuilder_ == null) {
@@ -398,39 +383,32 @@ public com.google.cloud.tasks.v2beta2.AppEngineHttpTarget buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta2.AppEngineHttpTarget) {
         return mergeFrom((com.google.cloud.tasks.v2beta2.AppEngineHttpTarget)other);
@@ -450,12 +428,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta2.AppEngineHttpTarget othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -662,13 +638,11 @@ public com.google.cloud.tasks.v2beta2.AppEngineRoutingOrBuilder getAppEngineRout
       }
       return appEngineRoutingOverrideBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -690,12 +664,11 @@ public static com.google.cloud.tasks.v2beta2.AppEngineHttpTarget getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AppEngineHttpTarget parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AppEngineHttpTarget(input, extensionRegistry);
+        return new AppEngineHttpTarget(input, extensionRegistry);
     }
   };
 
@@ -708,7 +681,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta2.AppEngineHttpTarget getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/AppEngineRouting.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/AppEngineRouting.java
index cb0a44561b35..5dbd6f7b5d3a 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/AppEngineRouting.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/AppEngineRouting.java
@@ -41,9 +41,6 @@ private AppEngineRouting(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -55,6 +52,13 @@ private AppEngineRouting(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -79,13 +83,6 @@ private AppEngineRouting(
             host_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private AppEngineRouting(
     return com.google.cloud.tasks.v2beta2.TargetProto.internal_static_google_cloud_tasks_v2beta2_AppEngineRouting_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta2.TargetProto.internal_static_google_cloud_tasks_v2beta2_AppEngineRouting_fieldAccessorTable
@@ -432,7 +428,6 @@ public java.lang.String getHost() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -442,7 +437,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getServiceBytes().isEmpty()) {
@@ -460,7 +454,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -596,7 +589,6 @@ public static com.google.cloud.tasks.v2beta2.AppEngineRouting parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -604,7 +596,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta2.AppEngineRouting prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -637,7 +628,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta2.TargetProto.internal_static_google_cloud_tasks_v2beta2_AppEngineRouting_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta2.TargetProto.internal_static_google_cloud_tasks_v2beta2_AppEngineRouting_fieldAccessorTable
@@ -660,7 +650,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       service_ = "";
@@ -674,18 +663,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta2.TargetProto.internal_static_google_cloud_tasks_v2beta2_AppEngineRouting_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.AppEngineRouting getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta2.AppEngineRouting.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.AppEngineRouting build() {
       com.google.cloud.tasks.v2beta2.AppEngineRouting result = buildPartial();
       if (!result.isInitialized()) {
@@ -694,7 +680,6 @@ public com.google.cloud.tasks.v2beta2.AppEngineRouting build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.AppEngineRouting buildPartial() {
       com.google.cloud.tasks.v2beta2.AppEngineRouting result = new com.google.cloud.tasks.v2beta2.AppEngineRouting(this);
       result.service_ = service_;
@@ -705,39 +690,32 @@ public com.google.cloud.tasks.v2beta2.AppEngineRouting buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta2.AppEngineRouting) {
         return mergeFrom((com.google.cloud.tasks.v2beta2.AppEngineRouting)other);
@@ -770,12 +748,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta2.AppEngineRouting other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1529,13 +1505,11 @@ public Builder setHostBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1557,12 +1531,11 @@ public static com.google.cloud.tasks.v2beta2.AppEngineRouting getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AppEngineRouting parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AppEngineRouting(input, extensionRegistry);
+        return new AppEngineRouting(input, extensionRegistry);
     }
   };
 
@@ -1575,7 +1548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta2.AppEngineRouting getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/AttemptStatus.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/AttemptStatus.java
index d6e8d2c647ca..33839e633883 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/AttemptStatus.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/AttemptStatus.java
@@ -32,9 +32,6 @@ private AttemptStatus(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private AttemptStatus(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.protobuf.Timestamp.Builder subBuilder = null;
             if (scheduleTime_ != null) {
@@ -98,13 +102,6 @@ private AttemptStatus(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -122,7 +119,6 @@ private AttemptStatus(
     return com.google.cloud.tasks.v2beta2.TaskProto.internal_static_google_cloud_tasks_v2beta2_AttemptStatus_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta2.TaskProto.internal_static_google_cloud_tasks_v2beta2_AttemptStatus_fieldAccessorTable
@@ -278,7 +274,6 @@ public com.google.rpc.StatusOrBuilder getResponseStatusOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -288,7 +283,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (scheduleTime_ != null) {
@@ -306,7 +300,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -466,7 +459,6 @@ public static com.google.cloud.tasks.v2beta2.AttemptStatus parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -474,7 +466,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta2.AttemptStatus prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -502,7 +493,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta2.TaskProto.internal_static_google_cloud_tasks_v2beta2_AttemptStatus_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta2.TaskProto.internal_static_google_cloud_tasks_v2beta2_AttemptStatus_fieldAccessorTable
@@ -525,7 +515,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (scheduleTimeBuilder_ == null) {
@@ -555,18 +544,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta2.TaskProto.internal_static_google_cloud_tasks_v2beta2_AttemptStatus_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.AttemptStatus getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta2.AttemptStatus.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.AttemptStatus build() {
       com.google.cloud.tasks.v2beta2.AttemptStatus result = buildPartial();
       if (!result.isInitialized()) {
@@ -575,7 +561,6 @@ public com.google.cloud.tasks.v2beta2.AttemptStatus build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.AttemptStatus buildPartial() {
       com.google.cloud.tasks.v2beta2.AttemptStatus result = new com.google.cloud.tasks.v2beta2.AttemptStatus(this);
       if (scheduleTimeBuilder_ == null) {
@@ -602,39 +587,32 @@ public com.google.cloud.tasks.v2beta2.AttemptStatus buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta2.AttemptStatus) {
         return mergeFrom((com.google.cloud.tasks.v2beta2.AttemptStatus)other);
@@ -663,12 +641,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta2.AttemptStatus other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1343,13 +1319,11 @@ public com.google.rpc.StatusOrBuilder getResponseStatusOrBuilder() {
       }
       return responseStatusBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1371,12 +1345,11 @@ public static com.google.cloud.tasks.v2beta2.AttemptStatus getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AttemptStatus parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AttemptStatus(input, extensionRegistry);
+        return new AttemptStatus(input, extensionRegistry);
     }
   };
 
@@ -1389,7 +1362,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta2.AttemptStatus getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/CancelLeaseRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/CancelLeaseRequest.java
index d63f3e7070dc..905619ed841f 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/CancelLeaseRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/CancelLeaseRequest.java
@@ -35,9 +35,6 @@ private CancelLeaseRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private CancelLeaseRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -74,13 +78,6 @@ private CancelLeaseRequest(
             responseView_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -98,7 +95,6 @@ private CancelLeaseRequest(
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_CancelLeaseRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_CancelLeaseRequest_fieldAccessorTable
@@ -238,13 +234,11 @@ public int getResponseViewValue() {
    * .google.cloud.tasks.v2beta2.Task.View response_view = 3;
    */
   public com.google.cloud.tasks.v2beta2.Task.View getResponseView() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.tasks.v2beta2.Task.View result = com.google.cloud.tasks.v2beta2.Task.View.valueOf(responseView_);
     return result == null ? com.google.cloud.tasks.v2beta2.Task.View.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -254,7 +248,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -269,7 +262,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -404,7 +396,6 @@ public static com.google.cloud.tasks.v2beta2.CancelLeaseRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -412,7 +403,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta2.CancelLeaseRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -441,7 +431,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_CancelLeaseRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_CancelLeaseRequest_fieldAccessorTable
@@ -464,7 +453,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -480,18 +468,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_CancelLeaseRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.CancelLeaseRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta2.CancelLeaseRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.CancelLeaseRequest build() {
       com.google.cloud.tasks.v2beta2.CancelLeaseRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -500,7 +485,6 @@ public com.google.cloud.tasks.v2beta2.CancelLeaseRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.CancelLeaseRequest buildPartial() {
       com.google.cloud.tasks.v2beta2.CancelLeaseRequest result = new com.google.cloud.tasks.v2beta2.CancelLeaseRequest(this);
       result.name_ = name_;
@@ -514,39 +498,32 @@ public com.google.cloud.tasks.v2beta2.CancelLeaseRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta2.CancelLeaseRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta2.CancelLeaseRequest)other);
@@ -573,12 +550,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta2.CancelLeaseRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -952,7 +927,6 @@ public Builder setResponseViewValue(int value) {
      * .google.cloud.tasks.v2beta2.Task.View response_view = 3;
      */
     public com.google.cloud.tasks.v2beta2.Task.View getResponseView() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.tasks.v2beta2.Task.View result = com.google.cloud.tasks.v2beta2.Task.View.valueOf(responseView_);
       return result == null ? com.google.cloud.tasks.v2beta2.Task.View.UNRECOGNIZED : result;
     }
@@ -1003,13 +977,11 @@ public Builder clearResponseView() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1031,12 +1003,11 @@ public static com.google.cloud.tasks.v2beta2.CancelLeaseRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CancelLeaseRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CancelLeaseRequest(input, extensionRegistry);
+        return new CancelLeaseRequest(input, extensionRegistry);
     }
   };
 
@@ -1049,7 +1020,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta2.CancelLeaseRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/CloudTasksProto.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/CloudTasksProto.java
index 73dd9e403309..487e45ecb1ff 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/CloudTasksProto.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/CloudTasksProto.java
@@ -132,7 +132,7 @@ public static void registerAllExtensions(
       "to\032\036google/protobuf/duration.proto\032\033goog" +
       "le/protobuf/empty.proto\032 google/protobuf" +
       "/field_mask.proto\032\037google/protobuf/times" +
-      "tamp.proto\032\025google/rpc/code.proto\"Z\n\021Lis" +
+      "tamp.proto\032\025google/rpc/code.proto\"Z\n\021Lis",
       "tQueuesRequest\022\016\n\006parent\030\001 \001(\t\022\016\n\006filter" +
       "\030\002 \001(\t\022\021\n\tpage_size\030\003 \001(\005\022\022\n\npage_token\030" +
       "\004 \001(\t\"`\n\022ListQueuesResponse\0221\n\006queues\030\001 " +
@@ -142,7 +142,7 @@ public static void registerAllExtensions(
       "\n\006parent\030\001 \001(\t\0220\n\005queue\030\002 \001(\0132!.google.c" +
       "loud.tasks.v2beta2.Queue\"w\n\022UpdateQueueR" +
       "equest\0220\n\005queue\030\001 \001(\0132!.google.cloud.tas" +
-      "ks.v2beta2.Queue\022/\n\013update_mask\030\002 \001(\0132\032." +
+      "ks.v2beta2.Queue\022/\n\013update_mask\030\002 \001(\0132\032.",
       "google.protobuf.FieldMask\"\"\n\022DeleteQueue" +
       "Request\022\014\n\004name\030\001 \001(\t\"!\n\021PurgeQueueReque" +
       "st\022\014\n\004name\030\001 \001(\t\"!\n\021PauseQueueRequest\022\014\n" +
@@ -152,7 +152,7 @@ public static void registerAllExtensions(
       "ud.tasks.v2beta2.Task.View\022\021\n\tpage_size\030" +
       "\004 \001(\005\022\022\n\npage_token\030\005 \001(\t\"]\n\021ListTasksRe" +
       "sponse\022/\n\005tasks\030\001 \003(\0132 .google.cloud.tas" +
-      "ks.v2beta2.Task\022\027\n\017next_page_token\030\002 \001(\t" +
+      "ks.v2beta2.Task\022\027\n\017next_page_token\030\002 \001(\t",
       "\"\\\n\016GetTaskRequest\022\014\n\004name\030\001 \001(\t\022<\n\rresp" +
       "onse_view\030\002 \001(\0162%.google.cloud.tasks.v2b" +
       "eta2.Task.View\"\221\001\n\021CreateTaskRequest\022\016\n\006" +
@@ -162,7 +162,7 @@ public static void registerAllExtensions(
       "ew\"!\n\021DeleteTaskRequest\022\014\n\004name\030\001 \001(\t\"\267\001" +
       "\n\021LeaseTasksRequest\022\016\n\006parent\030\001 \001(\t\022\021\n\tm" +
       "ax_tasks\030\002 \001(\005\0221\n\016lease_duration\030\003 \001(\0132\031" +
-      ".google.protobuf.Duration\022<\n\rresponse_vi" +
+      ".google.protobuf.Duration\022<\n\rresponse_vi",
       "ew\030\004 \001(\0162%.google.cloud.tasks.v2beta2.Ta" +
       "sk.View\022\016\n\006filter\030\005 \001(\t\"E\n\022LeaseTasksRes" +
       "ponse\022/\n\005tasks\030\001 \003(\0132 .google.cloud.task" +
@@ -172,7 +172,7 @@ public static void registerAllExtensions(
       "Request\022\014\n\004name\030\001 \001(\t\0221\n\rschedule_time\030\002" +
       " \001(\0132\032.google.protobuf.Timestamp\0221\n\016leas" +
       "e_duration\030\003 \001(\0132\031.google.protobuf.Durat" +
-      "ion\022<\n\rresponse_view\030\004 \001(\0162%.google.clou" +
+      "ion\022<\n\rresponse_view\030\004 \001(\0162%.google.clou",
       "d.tasks.v2beta2.Task.View\"\223\001\n\022CancelLeas" +
       "eRequest\022\014\n\004name\030\001 \001(\t\0221\n\rschedule_time\030" +
       "\002 \001(\0132\032.google.protobuf.Timestamp\022<\n\rres" +
@@ -182,7 +182,7 @@ public static void registerAllExtensions(
       "cloud.tasks.v2beta2.Task.View2\360\031\n\nCloudT" +
       "asks\022\244\001\n\nListQueues\022-.google.cloud.tasks" +
       ".v2beta2.ListQueuesRequest\032..google.clou" +
-      "d.tasks.v2beta2.ListQueuesResponse\"7\202\323\344\223" +
+      "d.tasks.v2beta2.ListQueuesResponse\"7\202\323\344\223",
       "\0021\022//v2beta2/{parent=projects/*/location" +
       "s/*}/queues\022\223\001\n\010GetQueue\022+.google.cloud." +
       "tasks.v2beta2.GetQueueRequest\032!.google.c" +
@@ -192,7 +192,7 @@ public static void registerAllExtensions(
       "2beta2.CreateQueueRequest\032!.google.cloud" +
       ".tasks.v2beta2.Queue\">\202\323\344\223\0028\"//v2beta2/{" +
       "parent=projects/*/locations/*}/queues:\005q" +
-      "ueue\022\246\001\n\013UpdateQueue\022..google.cloud.task" +
+      "ueue\022\246\001\n\013UpdateQueue\022..google.cloud.task",
       "s.v2beta2.UpdateQueueRequest\032!.google.cl" +
       "oud.tasks.v2beta2.Queue\"D\202\323\344\223\002>25/v2beta" +
       "2/{queue.name=projects/*/locations/*/que" +
@@ -202,7 +202,7 @@ public static void registerAllExtensions(
       "{name=projects/*/locations/*/queues/*}\022\240" +
       "\001\n\nPurgeQueue\022-.google.cloud.tasks.v2bet" +
       "a2.PurgeQueueRequest\032!.google.cloud.task" +
-      "s.v2beta2.Queue\"@\202\323\344\223\002:\"5/v2beta2/{name=" +
+      "s.v2beta2.Queue\"@\202\323\344\223\002:\"5/v2beta2/{name=",
       "projects/*/locations/*/queues/*}:purge:\001" +
       "*\022\240\001\n\nPauseQueue\022-.google.cloud.tasks.v2" +
       "beta2.PauseQueueRequest\032!.google.cloud.t" +
@@ -212,7 +212,7 @@ public static void registerAllExtensions(
       "s.v2beta2.ResumeQueueRequest\032!.google.cl" +
       "oud.tasks.v2beta2.Queue\"A\202\323\344\223\002;\"6/v2beta" +
       "2/{name=projects/*/locations/*/queues/*}" +
-      ":resume:\001*\022\226\001\n\014GetIamPolicy\022\".google.iam" +
+      ":resume:\001*\022\226\001\n\014GetIamPolicy\022\".google.iam",
       ".v1.GetIamPolicyRequest\032\025.google.iam.v1." +
       "Policy\"K\202\323\344\223\002E\"@/v2beta2/{resource=proje" +
       "cts/*/locations/*/queues/*}:getIamPolicy" +
@@ -222,7 +222,7 @@ public static void registerAllExtensions(
       "ocations/*/queues/*}:setIamPolicy:\001*\022\274\001\n" +
       "\022TestIamPermissions\022(.google.iam.v1.Test" +
       "IamPermissionsRequest\032).google.iam.v1.Te" +
-      "stIamPermissionsResponse\"Q\202\323\344\223\002K\"F/v2bet" +
+      "stIamPermissionsResponse\"Q\202\323\344\223\002K\"F/v2bet",
       "a2/{resource=projects/*/locations/*/queu" +
       "es/*}:testIamPermissions:\001*\022\251\001\n\tListTask" +
       "s\022,.google.cloud.tasks.v2beta2.ListTasks" +
@@ -232,7 +232,7 @@ public static void registerAllExtensions(
       "\230\001\n\007GetTask\022*.google.cloud.tasks.v2beta2" +
       ".GetTaskRequest\032 .google.cloud.tasks.v2b" +
       "eta2.Task\"?\202\323\344\223\0029\0227/v2beta2/{name=projec" +
-      "ts/*/locations/*/queues/*/tasks/*}\022\241\001\n\nC" +
+      "ts/*/locations/*/queues/*/tasks/*}\022\241\001\n\nC",
       "reateTask\022-.google.cloud.tasks.v2beta2.C" +
       "reateTaskRequest\032 .google.cloud.tasks.v2" +
       "beta2.Task\"B\202\323\344\223\002<\"7/v2beta2/{parent=pro" +
@@ -242,7 +242,7 @@ public static void registerAllExtensions(
       "mpty\"?\202\323\344\223\0029*7/v2beta2/{name=projects/*/" +
       "locations/*/queues/*/tasks/*}\022\265\001\n\nLeaseT" +
       "asks\022-.google.cloud.tasks.v2beta2.LeaseT" +
-      "asksRequest\032..google.cloud.tasks.v2beta2" +
+      "asksRequest\032..google.cloud.tasks.v2beta2",
       ".LeaseTasksResponse\"H\202\323\344\223\002B\"=/v2beta2/{p" +
       "arent=projects/*/locations/*/queues/*}/t" +
       "asks:lease:\001*\022\255\001\n\017AcknowledgeTask\0222.goog" +
@@ -252,7 +252,7 @@ public static void registerAllExtensions(
       "ues/*/tasks/*}:acknowledge:\001*\022\254\001\n\nRenewL" +
       "ease\022-.google.cloud.tasks.v2beta2.RenewL" +
       "easeRequest\032 .google.cloud.tasks.v2beta2" +
-      ".Task\"M\202\323\344\223\002G\"B/v2beta2/{name=projects/*" +
+      ".Task\"M\202\323\344\223\002G\"B/v2beta2/{name=projects/*",
       "/locations/*/queues/*/tasks/*}:renewLeas" +
       "e:\001*\022\257\001\n\013CancelLease\022..google.cloud.task" +
       "s.v2beta2.CancelLeaseRequest\032 .google.cl" +
@@ -262,7 +262,7 @@ public static void registerAllExtensions(
       "gle.cloud.tasks.v2beta2.RunTaskRequest\032 " +
       ".google.cloud.tasks.v2beta2.Task\"F\202\323\344\223\002@" +
       "\";/v2beta2/{name=projects/*/locations/*/" +
-      "queues/*/tasks/*}:run:\001*B|\n\036com.google.c" +
+      "queues/*/tasks/*}:run:\001*B|\n\036com.google.c",
       "loud.tasks.v2beta2B\017CloudTasksProtoP\001Z?g" +
       "oogle.golang.org/genproto/googleapis/clo" +
       "ud/tasks/v2beta2;tasks\242\002\005TASKSb\006proto3"
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/CreateQueueRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/CreateQueueRequest.java
index 9011297e1150..ab77579527ff 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/CreateQueueRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/CreateQueueRequest.java
@@ -33,9 +33,6 @@ private CreateQueueRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private CreateQueueRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private CreateQueueRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private CreateQueueRequest(
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_CreateQueueRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_CreateQueueRequest_fieldAccessorTable
@@ -190,7 +186,6 @@ public com.google.cloud.tasks.v2beta2.QueueOrBuilder getQueueOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -200,7 +195,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -212,7 +206,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -340,7 +333,6 @@ public static com.google.cloud.tasks.v2beta2.CreateQueueRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -348,7 +340,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta2.CreateQueueRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -376,7 +367,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_CreateQueueRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_CreateQueueRequest_fieldAccessorTable
@@ -399,7 +389,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -413,18 +402,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_CreateQueueRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.CreateQueueRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta2.CreateQueueRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.CreateQueueRequest build() {
       com.google.cloud.tasks.v2beta2.CreateQueueRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -433,7 +419,6 @@ public com.google.cloud.tasks.v2beta2.CreateQueueRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.CreateQueueRequest buildPartial() {
       com.google.cloud.tasks.v2beta2.CreateQueueRequest result = new com.google.cloud.tasks.v2beta2.CreateQueueRequest(this);
       result.parent_ = parent_;
@@ -446,39 +431,32 @@ public com.google.cloud.tasks.v2beta2.CreateQueueRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta2.CreateQueueRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta2.CreateQueueRequest)other);
@@ -502,12 +480,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta2.CreateQueueRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -810,13 +786,11 @@ public com.google.cloud.tasks.v2beta2.QueueOrBuilder getQueueOrBuilder() {
       }
       return queueBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -838,12 +812,11 @@ public static com.google.cloud.tasks.v2beta2.CreateQueueRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateQueueRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateQueueRequest(input, extensionRegistry);
+        return new CreateQueueRequest(input, extensionRegistry);
     }
   };
 
@@ -856,7 +829,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta2.CreateQueueRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/CreateTaskRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/CreateTaskRequest.java
index 0e7377aa6255..61c8baf330f4 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/CreateTaskRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/CreateTaskRequest.java
@@ -34,9 +34,6 @@ private CreateTaskRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private CreateTaskRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private CreateTaskRequest(
             responseView_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private CreateTaskRequest(
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_CreateTaskRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_CreateTaskRequest_fieldAccessorTable
@@ -308,13 +304,11 @@ public int getResponseViewValue() {
    * .google.cloud.tasks.v2beta2.Task.View response_view = 3;
    */
   public com.google.cloud.tasks.v2beta2.Task.View getResponseView() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.tasks.v2beta2.Task.View result = com.google.cloud.tasks.v2beta2.Task.View.valueOf(responseView_);
     return result == null ? com.google.cloud.tasks.v2beta2.Task.View.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -324,7 +318,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -339,7 +332,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -474,7 +466,6 @@ public static com.google.cloud.tasks.v2beta2.CreateTaskRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -482,7 +473,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta2.CreateTaskRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -510,7 +500,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_CreateTaskRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_CreateTaskRequest_fieldAccessorTable
@@ -533,7 +522,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -549,18 +537,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_CreateTaskRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.CreateTaskRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta2.CreateTaskRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.CreateTaskRequest build() {
       com.google.cloud.tasks.v2beta2.CreateTaskRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -569,7 +554,6 @@ public com.google.cloud.tasks.v2beta2.CreateTaskRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.CreateTaskRequest buildPartial() {
       com.google.cloud.tasks.v2beta2.CreateTaskRequest result = new com.google.cloud.tasks.v2beta2.CreateTaskRequest(this);
       result.parent_ = parent_;
@@ -583,39 +567,32 @@ public com.google.cloud.tasks.v2beta2.CreateTaskRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta2.CreateTaskRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta2.CreateTaskRequest)other);
@@ -642,12 +619,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta2.CreateTaskRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1233,7 +1208,6 @@ public Builder setResponseViewValue(int value) {
      * .google.cloud.tasks.v2beta2.Task.View response_view = 3;
      */
     public com.google.cloud.tasks.v2beta2.Task.View getResponseView() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.tasks.v2beta2.Task.View result = com.google.cloud.tasks.v2beta2.Task.View.valueOf(responseView_);
       return result == null ? com.google.cloud.tasks.v2beta2.Task.View.UNRECOGNIZED : result;
     }
@@ -1284,13 +1258,11 @@ public Builder clearResponseView() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1312,12 +1284,11 @@ public static com.google.cloud.tasks.v2beta2.CreateTaskRequest getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateTaskRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateTaskRequest(input, extensionRegistry);
+        return new CreateTaskRequest(input, extensionRegistry);
     }
   };
 
@@ -1330,7 +1301,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta2.CreateTaskRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/DeleteQueueRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/DeleteQueueRequest.java
index 9b501bbcddbf..c626ef8927ad 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/DeleteQueueRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/DeleteQueueRequest.java
@@ -33,9 +33,6 @@ private DeleteQueueRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteQueueRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteQueueRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteQueueRequest(
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_DeleteQueueRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_DeleteQueueRequest_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.tasks.v2beta2.DeleteQueueRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta2.DeleteQueueRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_DeleteQueueRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_DeleteQueueRequest_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_DeleteQueueRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.DeleteQueueRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta2.DeleteQueueRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.DeleteQueueRequest build() {
       com.google.cloud.tasks.v2beta2.DeleteQueueRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.tasks.v2beta2.DeleteQueueRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.DeleteQueueRequest buildPartial() {
       com.google.cloud.tasks.v2beta2.DeleteQueueRequest result = new com.google.cloud.tasks.v2beta2.DeleteQueueRequest(this);
       result.name_ = name_;
@@ -361,39 +346,32 @@ public com.google.cloud.tasks.v2beta2.DeleteQueueRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta2.DeleteQueueRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta2.DeleteQueueRequest)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta2.DeleteQueueRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.tasks.v2beta2.DeleteQueueRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteQueueRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteQueueRequest(input, extensionRegistry);
+        return new DeleteQueueRequest(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta2.DeleteQueueRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/DeleteTaskRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/DeleteTaskRequest.java
index f889bce854ae..518aa7fbf63f 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/DeleteTaskRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/DeleteTaskRequest.java
@@ -34,9 +34,6 @@ private DeleteTaskRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,12 +45,6 @@ private DeleteTaskRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -61,6 +52,12 @@ private DeleteTaskRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -78,7 +75,6 @@ private DeleteTaskRequest(
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_DeleteTaskRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_DeleteTaskRequest_fieldAccessorTable
@@ -133,7 +129,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -143,7 +138,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -152,7 +146,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -267,7 +260,6 @@ public static com.google.cloud.tasks.v2beta2.DeleteTaskRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -275,7 +267,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta2.DeleteTaskRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -304,7 +295,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_DeleteTaskRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_DeleteTaskRequest_fieldAccessorTable
@@ -327,7 +317,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -335,18 +324,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_DeleteTaskRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.DeleteTaskRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta2.DeleteTaskRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.DeleteTaskRequest build() {
       com.google.cloud.tasks.v2beta2.DeleteTaskRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -355,7 +341,6 @@ public com.google.cloud.tasks.v2beta2.DeleteTaskRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.DeleteTaskRequest buildPartial() {
       com.google.cloud.tasks.v2beta2.DeleteTaskRequest result = new com.google.cloud.tasks.v2beta2.DeleteTaskRequest(this);
       result.name_ = name_;
@@ -363,39 +348,32 @@ public com.google.cloud.tasks.v2beta2.DeleteTaskRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta2.DeleteTaskRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta2.DeleteTaskRequest)other);
@@ -416,12 +394,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta2.DeleteTaskRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -538,13 +514,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -566,12 +540,11 @@ public static com.google.cloud.tasks.v2beta2.DeleteTaskRequest getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteTaskRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteTaskRequest(input, extensionRegistry);
+        return new DeleteTaskRequest(input, extensionRegistry);
     }
   };
 
@@ -584,7 +557,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta2.DeleteTaskRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/GetQueueRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/GetQueueRequest.java
index 84e003c48976..b04680b411c4 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/GetQueueRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/GetQueueRequest.java
@@ -33,9 +33,6 @@ private GetQueueRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetQueueRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetQueueRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetQueueRequest(
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_GetQueueRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_GetQueueRequest_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.tasks.v2beta2.GetQueueRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta2.GetQueueRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_GetQueueRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_GetQueueRequest_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_GetQueueRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.GetQueueRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta2.GetQueueRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.GetQueueRequest build() {
       com.google.cloud.tasks.v2beta2.GetQueueRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.tasks.v2beta2.GetQueueRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.GetQueueRequest buildPartial() {
       com.google.cloud.tasks.v2beta2.GetQueueRequest result = new com.google.cloud.tasks.v2beta2.GetQueueRequest(this);
       result.name_ = name_;
@@ -361,39 +346,32 @@ public com.google.cloud.tasks.v2beta2.GetQueueRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta2.GetQueueRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta2.GetQueueRequest)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta2.GetQueueRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.tasks.v2beta2.GetQueueRequest getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetQueueRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetQueueRequest(input, extensionRegistry);
+        return new GetQueueRequest(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta2.GetQueueRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/GetTaskRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/GetTaskRequest.java
index 246bd001a677..bdf731d2cf75 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/GetTaskRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/GetTaskRequest.java
@@ -34,9 +34,6 @@ private GetTaskRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private GetTaskRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private GetTaskRequest(
             responseView_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private GetTaskRequest(
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_GetTaskRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_GetTaskRequest_fieldAccessorTable
@@ -176,13 +172,11 @@ public int getResponseViewValue() {
    * .google.cloud.tasks.v2beta2.Task.View response_view = 2;
    */
   public com.google.cloud.tasks.v2beta2.Task.View getResponseView() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.tasks.v2beta2.Task.View result = com.google.cloud.tasks.v2beta2.Task.View.valueOf(responseView_);
     return result == null ? com.google.cloud.tasks.v2beta2.Task.View.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -192,7 +186,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -204,7 +197,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -326,7 +318,6 @@ public static com.google.cloud.tasks.v2beta2.GetTaskRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -334,7 +325,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta2.GetTaskRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -362,7 +352,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_GetTaskRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_GetTaskRequest_fieldAccessorTable
@@ -385,7 +374,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -395,18 +383,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_GetTaskRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.GetTaskRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta2.GetTaskRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.GetTaskRequest build() {
       com.google.cloud.tasks.v2beta2.GetTaskRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -415,7 +400,6 @@ public com.google.cloud.tasks.v2beta2.GetTaskRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.GetTaskRequest buildPartial() {
       com.google.cloud.tasks.v2beta2.GetTaskRequest result = new com.google.cloud.tasks.v2beta2.GetTaskRequest(this);
       result.name_ = name_;
@@ -424,39 +408,32 @@ public com.google.cloud.tasks.v2beta2.GetTaskRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta2.GetTaskRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta2.GetTaskRequest)other);
@@ -480,12 +457,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta2.GetTaskRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -661,7 +636,6 @@ public Builder setResponseViewValue(int value) {
      * .google.cloud.tasks.v2beta2.Task.View response_view = 2;
      */
     public com.google.cloud.tasks.v2beta2.Task.View getResponseView() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.tasks.v2beta2.Task.View result = com.google.cloud.tasks.v2beta2.Task.View.valueOf(responseView_);
       return result == null ? com.google.cloud.tasks.v2beta2.Task.View.UNRECOGNIZED : result;
     }
@@ -712,13 +686,11 @@ public Builder clearResponseView() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -740,12 +712,11 @@ public static com.google.cloud.tasks.v2beta2.GetTaskRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetTaskRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetTaskRequest(input, extensionRegistry);
+        return new GetTaskRequest(input, extensionRegistry);
     }
   };
 
@@ -758,7 +729,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta2.GetTaskRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/LeaseTasksRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/LeaseTasksRequest.java
index 2447e4a68781..6153cee312eb 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/LeaseTasksRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/LeaseTasksRequest.java
@@ -36,9 +36,6 @@ private LeaseTasksRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private LeaseTasksRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -86,13 +90,6 @@ private LeaseTasksRequest(
             filter_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -110,7 +107,6 @@ private LeaseTasksRequest(
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_LeaseTasksRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_LeaseTasksRequest_fieldAccessorTable
@@ -272,7 +268,6 @@ public int getResponseViewValue() {
    * .google.cloud.tasks.v2beta2.Task.View response_view = 4;
    */
   public com.google.cloud.tasks.v2beta2.Task.View getResponseView() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.tasks.v2beta2.Task.View result = com.google.cloud.tasks.v2beta2.Task.View.valueOf(responseView_);
     return result == null ? com.google.cloud.tasks.v2beta2.Task.View.UNRECOGNIZED : result;
   }
@@ -360,7 +355,6 @@ public java.lang.String getFilter() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -370,7 +364,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -391,7 +384,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -541,7 +533,6 @@ public static com.google.cloud.tasks.v2beta2.LeaseTasksRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -549,7 +540,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta2.LeaseTasksRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -577,7 +567,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_LeaseTasksRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_LeaseTasksRequest_fieldAccessorTable
@@ -600,7 +589,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -620,18 +608,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_LeaseTasksRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.LeaseTasksRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta2.LeaseTasksRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.LeaseTasksRequest build() {
       com.google.cloud.tasks.v2beta2.LeaseTasksRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -640,7 +625,6 @@ public com.google.cloud.tasks.v2beta2.LeaseTasksRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.LeaseTasksRequest buildPartial() {
       com.google.cloud.tasks.v2beta2.LeaseTasksRequest result = new com.google.cloud.tasks.v2beta2.LeaseTasksRequest(this);
       result.parent_ = parent_;
@@ -656,39 +640,32 @@ public com.google.cloud.tasks.v2beta2.LeaseTasksRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta2.LeaseTasksRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta2.LeaseTasksRequest)other);
@@ -722,12 +699,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta2.LeaseTasksRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1166,7 +1141,6 @@ public Builder setResponseViewValue(int value) {
      * .google.cloud.tasks.v2beta2.Task.View response_view = 4;
      */
     public com.google.cloud.tasks.v2beta2.Task.View getResponseView() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.tasks.v2beta2.Task.View result = com.google.cloud.tasks.v2beta2.Task.View.valueOf(responseView_);
       return result == null ? com.google.cloud.tasks.v2beta2.Task.View.UNRECOGNIZED : result;
     }
@@ -1406,13 +1380,11 @@ public Builder setFilterBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1434,12 +1406,11 @@ public static com.google.cloud.tasks.v2beta2.LeaseTasksRequest getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LeaseTasksRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LeaseTasksRequest(input, extensionRegistry);
+        return new LeaseTasksRequest(input, extensionRegistry);
     }
   };
 
@@ -1452,7 +1423,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta2.LeaseTasksRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/LeaseTasksResponse.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/LeaseTasksResponse.java
index 4b9d41970c5d..3c7605a8a6c0 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/LeaseTasksResponse.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/LeaseTasksResponse.java
@@ -33,9 +33,6 @@ private LeaseTasksResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private LeaseTasksResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               tasks_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private LeaseTasksResponse(
                 input.readMessage(com.google.cloud.tasks.v2beta2.Task.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private LeaseTasksResponse(
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_LeaseTasksResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_LeaseTasksResponse_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.cloud.tasks.v2beta2.TaskOrBuilder getTasksOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < tasks_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.tasks.v2beta2.LeaseTasksResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta2.LeaseTasksResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_LeaseTasksResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_LeaseTasksResponse_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getTasksFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (tasksBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_LeaseTasksResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.LeaseTasksResponse getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta2.LeaseTasksResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.LeaseTasksResponse build() {
       com.google.cloud.tasks.v2beta2.LeaseTasksResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.cloud.tasks.v2beta2.LeaseTasksResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.LeaseTasksResponse buildPartial() {
       com.google.cloud.tasks.v2beta2.LeaseTasksResponse result = new com.google.cloud.tasks.v2beta2.LeaseTasksResponse(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.cloud.tasks.v2beta2.LeaseTasksResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta2.LeaseTasksResponse) {
         return mergeFrom((com.google.cloud.tasks.v2beta2.LeaseTasksResponse)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta2.LeaseTasksResponse other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.cloud.tasks.v2beta2.Task.Builder addTasksBuilder(
       }
       return tasksBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.cloud.tasks.v2beta2.LeaseTasksResponse getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LeaseTasksResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LeaseTasksResponse(input, extensionRegistry);
+        return new LeaseTasksResponse(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta2.LeaseTasksResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/ListQueuesRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/ListQueuesRequest.java
index 6cdbeccc52d9..bfce0a88567b 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/ListQueuesRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/ListQueuesRequest.java
@@ -36,9 +36,6 @@ private ListQueuesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private ListQueuesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private ListQueuesRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private ListQueuesRequest(
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_ListQueuesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_ListQueuesRequest_fieldAccessorTable
@@ -280,7 +276,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -290,7 +285,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -308,7 +302,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -445,7 +438,6 @@ public static com.google.cloud.tasks.v2beta2.ListQueuesRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -453,7 +445,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta2.ListQueuesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -481,7 +472,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_ListQueuesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_ListQueuesRequest_fieldAccessorTable
@@ -504,7 +494,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -518,18 +507,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_ListQueuesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.ListQueuesRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta2.ListQueuesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.ListQueuesRequest build() {
       com.google.cloud.tasks.v2beta2.ListQueuesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -538,7 +524,6 @@ public com.google.cloud.tasks.v2beta2.ListQueuesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.ListQueuesRequest buildPartial() {
       com.google.cloud.tasks.v2beta2.ListQueuesRequest result = new com.google.cloud.tasks.v2beta2.ListQueuesRequest(this);
       result.parent_ = parent_;
@@ -549,39 +534,32 @@ public com.google.cloud.tasks.v2beta2.ListQueuesRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta2.ListQueuesRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta2.ListQueuesRequest)other);
@@ -613,12 +591,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta2.ListQueuesRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1031,13 +1007,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1059,12 +1033,11 @@ public static com.google.cloud.tasks.v2beta2.ListQueuesRequest getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListQueuesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListQueuesRequest(input, extensionRegistry);
+        return new ListQueuesRequest(input, extensionRegistry);
     }
   };
 
@@ -1077,7 +1050,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta2.ListQueuesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/ListQueuesResponse.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/ListQueuesResponse.java
index f0930e2e9a59..b26ece7ee624 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/ListQueuesResponse.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/ListQueuesResponse.java
@@ -34,9 +34,6 @@ private ListQueuesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListQueuesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               queues_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListQueuesResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListQueuesResponse(
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_ListQueuesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_ListQueuesResponse_fieldAccessorTable
@@ -207,7 +203,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -217,7 +212,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < queues_.size(); i++) {
@@ -229,7 +223,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -354,7 +347,6 @@ public static com.google.cloud.tasks.v2beta2.ListQueuesResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -362,7 +354,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta2.ListQueuesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -390,7 +381,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_ListQueuesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_ListQueuesResponse_fieldAccessorTable
@@ -414,7 +404,6 @@ private void maybeForceBuilderInitialization() {
         getQueuesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (queuesBuilder_ == null) {
@@ -428,18 +417,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_ListQueuesResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.ListQueuesResponse getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta2.ListQueuesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.ListQueuesResponse build() {
       com.google.cloud.tasks.v2beta2.ListQueuesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -448,7 +434,6 @@ public com.google.cloud.tasks.v2beta2.ListQueuesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.ListQueuesResponse buildPartial() {
       com.google.cloud.tasks.v2beta2.ListQueuesResponse result = new com.google.cloud.tasks.v2beta2.ListQueuesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -468,39 +453,32 @@ public com.google.cloud.tasks.v2beta2.ListQueuesResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta2.ListQueuesResponse) {
         return mergeFrom((com.google.cloud.tasks.v2beta2.ListQueuesResponse)other);
@@ -547,12 +525,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta2.ListQueuesResponse other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -997,13 +973,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1025,12 +999,11 @@ public static com.google.cloud.tasks.v2beta2.ListQueuesResponse getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListQueuesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListQueuesResponse(input, extensionRegistry);
+        return new ListQueuesResponse(input, extensionRegistry);
     }
   };
 
@@ -1043,7 +1016,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta2.ListQueuesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/ListTasksRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/ListTasksRequest.java
index 54517893b95c..040a9a382798 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/ListTasksRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/ListTasksRequest.java
@@ -36,9 +36,6 @@ private ListTasksRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private ListTasksRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private ListTasksRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private ListTasksRequest(
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_ListTasksRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_ListTasksRequest_fieldAccessorTable
@@ -189,7 +185,6 @@ public int getResponseViewValue() {
    * .google.cloud.tasks.v2beta2.Task.View response_view = 2;
    */
   public com.google.cloud.tasks.v2beta2.Task.View getResponseView() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.tasks.v2beta2.Task.View result = com.google.cloud.tasks.v2beta2.Task.View.valueOf(responseView_);
     return result == null ? com.google.cloud.tasks.v2beta2.Task.View.UNRECOGNIZED : result;
   }
@@ -267,7 +262,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -277,7 +271,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -295,7 +288,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -432,7 +424,6 @@ public static com.google.cloud.tasks.v2beta2.ListTasksRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -440,7 +431,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta2.ListTasksRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -468,7 +458,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_ListTasksRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_ListTasksRequest_fieldAccessorTable
@@ -491,7 +480,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -505,18 +493,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_ListTasksRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.ListTasksRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta2.ListTasksRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.ListTasksRequest build() {
       com.google.cloud.tasks.v2beta2.ListTasksRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -525,7 +510,6 @@ public com.google.cloud.tasks.v2beta2.ListTasksRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.ListTasksRequest buildPartial() {
       com.google.cloud.tasks.v2beta2.ListTasksRequest result = new com.google.cloud.tasks.v2beta2.ListTasksRequest(this);
       result.parent_ = parent_;
@@ -536,39 +520,32 @@ public com.google.cloud.tasks.v2beta2.ListTasksRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta2.ListTasksRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta2.ListTasksRequest)other);
@@ -599,12 +576,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta2.ListTasksRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -780,7 +755,6 @@ public Builder setResponseViewValue(int value) {
      * .google.cloud.tasks.v2beta2.Task.View response_view = 2;
      */
     public com.google.cloud.tasks.v2beta2.Task.View getResponseView() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.tasks.v2beta2.Task.View result = com.google.cloud.tasks.v2beta2.Task.View.valueOf(responseView_);
       return result == null ? com.google.cloud.tasks.v2beta2.Task.View.UNRECOGNIZED : result;
     }
@@ -1003,13 +977,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1031,12 +1003,11 @@ public static com.google.cloud.tasks.v2beta2.ListTasksRequest getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListTasksRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTasksRequest(input, extensionRegistry);
+        return new ListTasksRequest(input, extensionRegistry);
     }
   };
 
@@ -1049,7 +1020,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta2.ListTasksRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/ListTasksResponse.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/ListTasksResponse.java
index 7f3ed00c4291..95d6d09827d8 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/ListTasksResponse.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/ListTasksResponse.java
@@ -34,9 +34,6 @@ private ListTasksResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListTasksResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               tasks_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListTasksResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListTasksResponse(
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_ListTasksResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_ListTasksResponse_fieldAccessorTable
@@ -205,7 +201,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -215,7 +210,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < tasks_.size(); i++) {
@@ -227,7 +221,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -352,7 +345,6 @@ public static com.google.cloud.tasks.v2beta2.ListTasksResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -360,7 +352,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta2.ListTasksResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -388,7 +379,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_ListTasksResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_ListTasksResponse_fieldAccessorTable
@@ -412,7 +402,6 @@ private void maybeForceBuilderInitialization() {
         getTasksFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (tasksBuilder_ == null) {
@@ -426,18 +415,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_ListTasksResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.ListTasksResponse getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta2.ListTasksResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.ListTasksResponse build() {
       com.google.cloud.tasks.v2beta2.ListTasksResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -446,7 +432,6 @@ public com.google.cloud.tasks.v2beta2.ListTasksResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.ListTasksResponse buildPartial() {
       com.google.cloud.tasks.v2beta2.ListTasksResponse result = new com.google.cloud.tasks.v2beta2.ListTasksResponse(this);
       int from_bitField0_ = bitField0_;
@@ -466,39 +451,32 @@ public com.google.cloud.tasks.v2beta2.ListTasksResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta2.ListTasksResponse) {
         return mergeFrom((com.google.cloud.tasks.v2beta2.ListTasksResponse)other);
@@ -545,12 +523,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta2.ListTasksResponse other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -990,13 +966,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1018,12 +992,11 @@ public static com.google.cloud.tasks.v2beta2.ListTasksResponse getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListTasksResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTasksResponse(input, extensionRegistry);
+        return new ListTasksResponse(input, extensionRegistry);
     }
   };
 
@@ -1036,7 +1009,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta2.ListTasksResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/PauseQueueRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/PauseQueueRequest.java
index 1ca53673a843..a241876e5974 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/PauseQueueRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/PauseQueueRequest.java
@@ -33,9 +33,6 @@ private PauseQueueRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private PauseQueueRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private PauseQueueRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private PauseQueueRequest(
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_PauseQueueRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_PauseQueueRequest_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.tasks.v2beta2.PauseQueueRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta2.PauseQueueRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_PauseQueueRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_PauseQueueRequest_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_PauseQueueRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.PauseQueueRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta2.PauseQueueRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.PauseQueueRequest build() {
       com.google.cloud.tasks.v2beta2.PauseQueueRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.tasks.v2beta2.PauseQueueRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.PauseQueueRequest buildPartial() {
       com.google.cloud.tasks.v2beta2.PauseQueueRequest result = new com.google.cloud.tasks.v2beta2.PauseQueueRequest(this);
       result.name_ = name_;
@@ -361,39 +346,32 @@ public com.google.cloud.tasks.v2beta2.PauseQueueRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta2.PauseQueueRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta2.PauseQueueRequest)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta2.PauseQueueRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.tasks.v2beta2.PauseQueueRequest getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PauseQueueRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PauseQueueRequest(input, extensionRegistry);
+        return new PauseQueueRequest(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta2.PauseQueueRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/PullMessage.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/PullMessage.java
index cf4ee1bcda4c..20943c66bee1 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/PullMessage.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/PullMessage.java
@@ -37,9 +37,6 @@ private PullMessage(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private PullMessage(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
 
             payload_ = input.readBytes();
@@ -62,13 +66,6 @@ private PullMessage(
             tag_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -86,7 +83,6 @@ private PullMessage(
     return com.google.cloud.tasks.v2beta2.TargetProto.internal_static_google_cloud_tasks_v2beta2_PullMessage_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta2.TargetProto.internal_static_google_cloud_tasks_v2beta2_PullMessage_fieldAccessorTable
@@ -176,7 +172,6 @@ public java.lang.String getTag() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -186,7 +181,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!payload_.isEmpty()) {
@@ -198,7 +192,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -321,7 +314,6 @@ public static com.google.cloud.tasks.v2beta2.PullMessage parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -329,7 +321,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta2.PullMessage prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -360,7 +351,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta2.TargetProto.internal_static_google_cloud_tasks_v2beta2_PullMessage_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta2.TargetProto.internal_static_google_cloud_tasks_v2beta2_PullMessage_fieldAccessorTable
@@ -383,7 +373,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       payload_ = com.google.protobuf.ByteString.EMPTY;
@@ -393,18 +382,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta2.TargetProto.internal_static_google_cloud_tasks_v2beta2_PullMessage_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.PullMessage getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta2.PullMessage.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.PullMessage build() {
       com.google.cloud.tasks.v2beta2.PullMessage result = buildPartial();
       if (!result.isInitialized()) {
@@ -413,7 +399,6 @@ public com.google.cloud.tasks.v2beta2.PullMessage build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.PullMessage buildPartial() {
       com.google.cloud.tasks.v2beta2.PullMessage result = new com.google.cloud.tasks.v2beta2.PullMessage(this);
       result.payload_ = payload_;
@@ -422,39 +407,32 @@ public com.google.cloud.tasks.v2beta2.PullMessage buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta2.PullMessage) {
         return mergeFrom((com.google.cloud.tasks.v2beta2.PullMessage)other);
@@ -478,12 +456,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta2.PullMessage other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -696,13 +672,11 @@ public Builder setTagBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -724,12 +698,11 @@ public static com.google.cloud.tasks.v2beta2.PullMessage getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PullMessage parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PullMessage(input, extensionRegistry);
+        return new PullMessage(input, extensionRegistry);
     }
   };
 
@@ -742,7 +715,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta2.PullMessage getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/PullTarget.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/PullTarget.java
index 265bca13302e..ea4ca57b5b55 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/PullTarget.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/PullTarget.java
@@ -32,9 +32,6 @@ private PullTarget(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
@@ -69,7 +66,6 @@ private PullTarget(
     return com.google.cloud.tasks.v2beta2.TargetProto.internal_static_google_cloud_tasks_v2beta2_PullTarget_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta2.TargetProto.internal_static_google_cloud_tasks_v2beta2_PullTarget_fieldAccessorTable
@@ -78,7 +74,6 @@ private PullTarget(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -88,13 +83,11 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -202,7 +195,6 @@ public static com.google.cloud.tasks.v2beta2.PullTarget parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -210,7 +202,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta2.PullTarget prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -238,7 +229,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta2.TargetProto.internal_static_google_cloud_tasks_v2beta2_PullTarget_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta2.TargetProto.internal_static_google_cloud_tasks_v2beta2_PullTarget_fieldAccessorTable
@@ -261,24 +251,20 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta2.TargetProto.internal_static_google_cloud_tasks_v2beta2_PullTarget_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.PullTarget getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta2.PullTarget.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.PullTarget build() {
       com.google.cloud.tasks.v2beta2.PullTarget result = buildPartial();
       if (!result.isInitialized()) {
@@ -287,46 +273,38 @@ public com.google.cloud.tasks.v2beta2.PullTarget build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.PullTarget buildPartial() {
       com.google.cloud.tasks.v2beta2.PullTarget result = new com.google.cloud.tasks.v2beta2.PullTarget(this);
       onBuilt();
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta2.PullTarget) {
         return mergeFrom((com.google.cloud.tasks.v2beta2.PullTarget)other);
@@ -343,12 +321,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta2.PullTarget other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -366,13 +342,11 @@ public Builder mergeFrom(
       }
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -394,12 +368,11 @@ public static com.google.cloud.tasks.v2beta2.PullTarget getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PullTarget parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PullTarget(input, extensionRegistry);
+        return new PullTarget(input, extensionRegistry);
     }
   };
 
@@ -412,7 +385,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta2.PullTarget getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/PurgeQueueRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/PurgeQueueRequest.java
index 3e93fc4e3228..8cc06d19ed52 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/PurgeQueueRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/PurgeQueueRequest.java
@@ -33,9 +33,6 @@ private PurgeQueueRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private PurgeQueueRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private PurgeQueueRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private PurgeQueueRequest(
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_PurgeQueueRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_PurgeQueueRequest_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.tasks.v2beta2.PurgeQueueRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta2.PurgeQueueRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_PurgeQueueRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_PurgeQueueRequest_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_PurgeQueueRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.PurgeQueueRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta2.PurgeQueueRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.PurgeQueueRequest build() {
       com.google.cloud.tasks.v2beta2.PurgeQueueRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.tasks.v2beta2.PurgeQueueRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.PurgeQueueRequest buildPartial() {
       com.google.cloud.tasks.v2beta2.PurgeQueueRequest result = new com.google.cloud.tasks.v2beta2.PurgeQueueRequest(this);
       result.name_ = name_;
@@ -361,39 +346,32 @@ public com.google.cloud.tasks.v2beta2.PurgeQueueRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta2.PurgeQueueRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta2.PurgeQueueRequest)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta2.PurgeQueueRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.tasks.v2beta2.PurgeQueueRequest getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PurgeQueueRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PurgeQueueRequest(input, extensionRegistry);
+        return new PurgeQueueRequest(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta2.PurgeQueueRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/Queue.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/Queue.java
index 382e1af8f628..f57b1aff090a 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/Queue.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/Queue.java
@@ -36,9 +36,6 @@ private Queue(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private Queue(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -129,13 +133,6 @@ private Queue(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -153,7 +150,6 @@ private Queue(
     return com.google.cloud.tasks.v2beta2.QueueProto.internal_static_google_cloud_tasks_v2beta2_Queue_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta2.QueueProto.internal_static_google_cloud_tasks_v2beta2_Queue_fieldAccessorTable
@@ -696,7 +692,6 @@ public int getStateValue() {
    * .google.cloud.tasks.v2beta2.Queue.State state = 7;
    */
   public com.google.cloud.tasks.v2beta2.Queue.State getState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.tasks.v2beta2.Queue.State result = com.google.cloud.tasks.v2beta2.Queue.State.valueOf(state_);
     return result == null ? com.google.cloud.tasks.v2beta2.Queue.State.UNRECOGNIZED : result;
   }
@@ -753,7 +748,6 @@ public com.google.protobuf.TimestampOrBuilder getPurgeTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -763,7 +757,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -790,7 +783,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -986,7 +978,6 @@ public static com.google.cloud.tasks.v2beta2.Queue parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -994,7 +985,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta2.Queue prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1024,7 +1014,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta2.QueueProto.internal_static_google_cloud_tasks_v2beta2_Queue_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta2.QueueProto.internal_static_google_cloud_tasks_v2beta2_Queue_fieldAccessorTable
@@ -1047,7 +1036,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -1077,18 +1065,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta2.QueueProto.internal_static_google_cloud_tasks_v2beta2_Queue_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.Queue getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta2.Queue.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.Queue build() {
       com.google.cloud.tasks.v2beta2.Queue result = buildPartial();
       if (!result.isInitialized()) {
@@ -1097,7 +1082,6 @@ public com.google.cloud.tasks.v2beta2.Queue build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.Queue buildPartial() {
       com.google.cloud.tasks.v2beta2.Queue result = new com.google.cloud.tasks.v2beta2.Queue(this);
       result.name_ = name_;
@@ -1136,39 +1120,32 @@ public com.google.cloud.tasks.v2beta2.Queue buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta2.Queue) {
         return mergeFrom((com.google.cloud.tasks.v2beta2.Queue)other);
@@ -1214,12 +1191,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta2.Queue other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2297,7 +2272,6 @@ public Builder setStateValue(int value) {
      * .google.cloud.tasks.v2beta2.Queue.State state = 7;
      */
     public com.google.cloud.tasks.v2beta2.Queue.State getState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.tasks.v2beta2.Queue.State result = com.google.cloud.tasks.v2beta2.Queue.State.valueOf(state_);
       return result == null ? com.google.cloud.tasks.v2beta2.Queue.State.UNRECOGNIZED : result;
     }
@@ -2547,13 +2521,11 @@ public com.google.protobuf.TimestampOrBuilder getPurgeTimeOrBuilder() {
       }
       return purgeTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2575,12 +2547,11 @@ public static com.google.cloud.tasks.v2beta2.Queue getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Queue parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Queue(input, extensionRegistry);
+        return new Queue(input, extensionRegistry);
     }
   };
 
@@ -2593,7 +2564,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta2.Queue getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/QueueProto.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/QueueProto.java
index 07983a792c74..ddd6810e3150 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/QueueProto.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/QueueProto.java
@@ -47,7 +47,7 @@ public static void registerAllExtensions(
       "ne_http_target\030\003 \001(\0132/.google.cloud.task" +
       "s.v2beta2.AppEngineHttpTargetH\000\022=\n\013pull_" +
       "target\030\004 \001(\0132&.google.cloud.tasks.v2beta" +
-      "2.PullTargetH\000\022;\n\013rate_limits\030\005 \001(\0132&.go" +
+      "2.PullTargetH\000\022;\n\013rate_limits\030\005 \001(\0132&.go",
       "ogle.cloud.tasks.v2beta2.RateLimits\022=\n\014r" +
       "etry_config\030\006 \001(\0132\'.google.cloud.tasks.v" +
       "2beta2.RetryConfig\0226\n\005state\030\007 \001(\0162\'.goog" +
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "NNING\020\001\022\n\n\006PAUSED\020\002\022\014\n\010DISABLED\020\003B\r\n\013tar" +
       "get_type\"k\n\nRateLimits\022\'\n\037max_tasks_disp" +
       "atched_per_second\030\001 \001(\001\022\026\n\016max_burst_siz" +
-      "e\030\002 \001(\005\022\034\n\024max_concurrent_tasks\030\003 \001(\005\"\201\002" +
+      "e\030\002 \001(\005\022\034\n\024max_concurrent_tasks\030\003 \001(\005\"\201\002",
       "\n\013RetryConfig\022\026\n\014max_attempts\030\001 \001(\005H\000\022\034\n" +
       "\022unlimited_attempts\030\002 \001(\010H\000\0225\n\022max_retry" +
       "_duration\030\003 \001(\0132\031.google.protobuf.Durati" +
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/RateLimits.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/RateLimits.java
index 90d5318ae4c8..52983fa036dd 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/RateLimits.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/RateLimits.java
@@ -39,9 +39,6 @@ private RateLimits(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private RateLimits(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 9: {
 
             maxTasksDispatchedPerSecond_ = input.readDouble();
@@ -68,13 +72,6 @@ private RateLimits(
             maxConcurrentTasks_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -92,7 +89,6 @@ private RateLimits(
     return com.google.cloud.tasks.v2beta2.QueueProto.internal_static_google_cloud_tasks_v2beta2_RateLimits_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta2.QueueProto.internal_static_google_cloud_tasks_v2beta2_RateLimits_fieldAccessorTable
@@ -187,7 +183,6 @@ public int getMaxConcurrentTasks() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -197,7 +192,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (maxTasksDispatchedPerSecond_ != 0D) {
@@ -212,7 +206,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -347,7 +340,6 @@ public static com.google.cloud.tasks.v2beta2.RateLimits parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -355,7 +347,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta2.RateLimits prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -387,7 +378,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta2.QueueProto.internal_static_google_cloud_tasks_v2beta2_RateLimits_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta2.QueueProto.internal_static_google_cloud_tasks_v2beta2_RateLimits_fieldAccessorTable
@@ -410,7 +400,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       maxTasksDispatchedPerSecond_ = 0D;
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta2.QueueProto.internal_static_google_cloud_tasks_v2beta2_RateLimits_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.RateLimits getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta2.RateLimits.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.RateLimits build() {
       com.google.cloud.tasks.v2beta2.RateLimits result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public com.google.cloud.tasks.v2beta2.RateLimits build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.RateLimits buildPartial() {
       com.google.cloud.tasks.v2beta2.RateLimits result = new com.google.cloud.tasks.v2beta2.RateLimits(this);
       result.maxTasksDispatchedPerSecond_ = maxTasksDispatchedPerSecond_;
@@ -452,39 +437,32 @@ public com.google.cloud.tasks.v2beta2.RateLimits buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta2.RateLimits) {
         return mergeFrom((com.google.cloud.tasks.v2beta2.RateLimits)other);
@@ -510,12 +488,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta2.RateLimits other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -788,13 +764,11 @@ public Builder clearMaxConcurrentTasks() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -816,12 +790,11 @@ public static com.google.cloud.tasks.v2beta2.RateLimits getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RateLimits parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RateLimits(input, extensionRegistry);
+        return new RateLimits(input, extensionRegistry);
     }
   };
 
@@ -834,7 +807,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta2.RateLimits getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/RenewLeaseRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/RenewLeaseRequest.java
index b045eeb93d3e..555827a216b4 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/RenewLeaseRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/RenewLeaseRequest.java
@@ -35,9 +35,6 @@ private RenewLeaseRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private RenewLeaseRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -87,13 +91,6 @@ private RenewLeaseRequest(
             responseView_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -111,7 +108,6 @@ private RenewLeaseRequest(
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_RenewLeaseRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_RenewLeaseRequest_fieldAccessorTable
@@ -293,13 +289,11 @@ public int getResponseViewValue() {
    * .google.cloud.tasks.v2beta2.Task.View response_view = 4;
    */
   public com.google.cloud.tasks.v2beta2.Task.View getResponseView() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.tasks.v2beta2.Task.View result = com.google.cloud.tasks.v2beta2.Task.View.valueOf(responseView_);
     return result == null ? com.google.cloud.tasks.v2beta2.Task.View.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -309,7 +303,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -327,7 +320,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -475,7 +467,6 @@ public static com.google.cloud.tasks.v2beta2.RenewLeaseRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -483,7 +474,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta2.RenewLeaseRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -512,7 +502,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_RenewLeaseRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_RenewLeaseRequest_fieldAccessorTable
@@ -535,7 +524,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -557,18 +545,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_RenewLeaseRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.RenewLeaseRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta2.RenewLeaseRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.RenewLeaseRequest build() {
       com.google.cloud.tasks.v2beta2.RenewLeaseRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -577,7 +562,6 @@ public com.google.cloud.tasks.v2beta2.RenewLeaseRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.RenewLeaseRequest buildPartial() {
       com.google.cloud.tasks.v2beta2.RenewLeaseRequest result = new com.google.cloud.tasks.v2beta2.RenewLeaseRequest(this);
       result.name_ = name_;
@@ -596,39 +580,32 @@ public com.google.cloud.tasks.v2beta2.RenewLeaseRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta2.RenewLeaseRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta2.RenewLeaseRequest)other);
@@ -658,12 +635,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta2.RenewLeaseRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1217,7 +1192,6 @@ public Builder setResponseViewValue(int value) {
      * .google.cloud.tasks.v2beta2.Task.View response_view = 4;
      */
     public com.google.cloud.tasks.v2beta2.Task.View getResponseView() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.tasks.v2beta2.Task.View result = com.google.cloud.tasks.v2beta2.Task.View.valueOf(responseView_);
       return result == null ? com.google.cloud.tasks.v2beta2.Task.View.UNRECOGNIZED : result;
     }
@@ -1268,13 +1242,11 @@ public Builder clearResponseView() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1296,12 +1268,11 @@ public static com.google.cloud.tasks.v2beta2.RenewLeaseRequest getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RenewLeaseRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RenewLeaseRequest(input, extensionRegistry);
+        return new RenewLeaseRequest(input, extensionRegistry);
     }
   };
 
@@ -1314,7 +1285,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta2.RenewLeaseRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/ResumeQueueRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/ResumeQueueRequest.java
index 34b27d1811ea..e4648f3ecef5 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/ResumeQueueRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/ResumeQueueRequest.java
@@ -33,9 +33,6 @@ private ResumeQueueRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private ResumeQueueRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private ResumeQueueRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private ResumeQueueRequest(
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_ResumeQueueRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_ResumeQueueRequest_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.tasks.v2beta2.ResumeQueueRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta2.ResumeQueueRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_ResumeQueueRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_ResumeQueueRequest_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_ResumeQueueRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.ResumeQueueRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta2.ResumeQueueRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.ResumeQueueRequest build() {
       com.google.cloud.tasks.v2beta2.ResumeQueueRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.tasks.v2beta2.ResumeQueueRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.ResumeQueueRequest buildPartial() {
       com.google.cloud.tasks.v2beta2.ResumeQueueRequest result = new com.google.cloud.tasks.v2beta2.ResumeQueueRequest(this);
       result.name_ = name_;
@@ -361,39 +346,32 @@ public com.google.cloud.tasks.v2beta2.ResumeQueueRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta2.ResumeQueueRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta2.ResumeQueueRequest)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta2.ResumeQueueRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.tasks.v2beta2.ResumeQueueRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ResumeQueueRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ResumeQueueRequest(input, extensionRegistry);
+        return new ResumeQueueRequest(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta2.ResumeQueueRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/RetryConfig.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/RetryConfig.java
index a8d044af5f80..03cd82d4d58a 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/RetryConfig.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/RetryConfig.java
@@ -34,9 +34,6 @@ private RetryConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private RetryConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             numAttemptsCase_ = 1;
             numAttempts_ = input.readInt32();
@@ -102,13 +106,6 @@ private RetryConfig(
             maxDoublings_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -126,7 +123,6 @@ private RetryConfig(
     return com.google.cloud.tasks.v2beta2.QueueProto.internal_static_google_cloud_tasks_v2beta2_RetryConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta2.QueueProto.internal_static_google_cloud_tasks_v2beta2_RetryConfig_fieldAccessorTable
@@ -434,7 +430,6 @@ public int getMaxDoublings() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -444,7 +439,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (numAttemptsCase_ == 1) {
@@ -470,7 +464,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -663,7 +656,6 @@ public static com.google.cloud.tasks.v2beta2.RetryConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -671,7 +663,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta2.RetryConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -700,7 +691,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta2.QueueProto.internal_static_google_cloud_tasks_v2beta2_RetryConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta2.QueueProto.internal_static_google_cloud_tasks_v2beta2_RetryConfig_fieldAccessorTable
@@ -723,7 +713,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (maxRetryDurationBuilder_ == null) {
@@ -751,18 +740,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta2.QueueProto.internal_static_google_cloud_tasks_v2beta2_RetryConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.RetryConfig getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta2.RetryConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.RetryConfig build() {
       com.google.cloud.tasks.v2beta2.RetryConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -771,7 +757,6 @@ public com.google.cloud.tasks.v2beta2.RetryConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.RetryConfig buildPartial() {
       com.google.cloud.tasks.v2beta2.RetryConfig result = new com.google.cloud.tasks.v2beta2.RetryConfig(this);
       if (numAttemptsCase_ == 1) {
@@ -801,39 +786,32 @@ public com.google.cloud.tasks.v2beta2.RetryConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta2.RetryConfig) {
         return mergeFrom((com.google.cloud.tasks.v2beta2.RetryConfig)other);
@@ -875,12 +853,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta2.RetryConfig other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1851,13 +1827,11 @@ public Builder clearMaxDoublings() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1879,12 +1853,11 @@ public static com.google.cloud.tasks.v2beta2.RetryConfig getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RetryConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RetryConfig(input, extensionRegistry);
+        return new RetryConfig(input, extensionRegistry);
     }
   };
 
@@ -1897,7 +1870,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta2.RetryConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/RunTaskRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/RunTaskRequest.java
index f761c264a8eb..dc873190e832 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/RunTaskRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/RunTaskRequest.java
@@ -35,9 +35,6 @@ private RunTaskRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private RunTaskRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -61,13 +65,6 @@ private RunTaskRequest(
             responseView_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -85,7 +82,6 @@ private RunTaskRequest(
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_RunTaskRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_RunTaskRequest_fieldAccessorTable
@@ -177,13 +173,11 @@ public int getResponseViewValue() {
    * .google.cloud.tasks.v2beta2.Task.View response_view = 2;
    */
   public com.google.cloud.tasks.v2beta2.Task.View getResponseView() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.tasks.v2beta2.Task.View result = com.google.cloud.tasks.v2beta2.Task.View.valueOf(responseView_);
     return result == null ? com.google.cloud.tasks.v2beta2.Task.View.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -193,7 +187,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -205,7 +198,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -327,7 +319,6 @@ public static com.google.cloud.tasks.v2beta2.RunTaskRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -335,7 +326,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta2.RunTaskRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -364,7 +354,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_RunTaskRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_RunTaskRequest_fieldAccessorTable
@@ -387,7 +376,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -397,18 +385,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_RunTaskRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.RunTaskRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta2.RunTaskRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.RunTaskRequest build() {
       com.google.cloud.tasks.v2beta2.RunTaskRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -417,7 +402,6 @@ public com.google.cloud.tasks.v2beta2.RunTaskRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.RunTaskRequest buildPartial() {
       com.google.cloud.tasks.v2beta2.RunTaskRequest result = new com.google.cloud.tasks.v2beta2.RunTaskRequest(this);
       result.name_ = name_;
@@ -426,39 +410,32 @@ public com.google.cloud.tasks.v2beta2.RunTaskRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta2.RunTaskRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta2.RunTaskRequest)other);
@@ -482,12 +459,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta2.RunTaskRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -663,7 +638,6 @@ public Builder setResponseViewValue(int value) {
      * .google.cloud.tasks.v2beta2.Task.View response_view = 2;
      */
     public com.google.cloud.tasks.v2beta2.Task.View getResponseView() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.tasks.v2beta2.Task.View result = com.google.cloud.tasks.v2beta2.Task.View.valueOf(responseView_);
       return result == null ? com.google.cloud.tasks.v2beta2.Task.View.UNRECOGNIZED : result;
     }
@@ -714,13 +688,11 @@ public Builder clearResponseView() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -742,12 +714,11 @@ public static com.google.cloud.tasks.v2beta2.RunTaskRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RunTaskRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RunTaskRequest(input, extensionRegistry);
+        return new RunTaskRequest(input, extensionRegistry);
     }
   };
 
@@ -760,7 +731,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta2.RunTaskRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/TargetProto.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/TargetProto.java
index 4323c5aa95e9..48f1f926a7e2 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/TargetProto.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/TargetProto.java
@@ -62,7 +62,7 @@ public static void registerAllExtensions(
       "ride\030\001 \001(\0132,.google.cloud.tasks.v2beta2." +
       "AppEngineRouting\"\304\002\n\024AppEngineHttpReques" +
       "t\022;\n\013http_method\030\001 \001(\0162&.google.cloud.ta" +
-      "sks.v2beta2.HttpMethod\022H\n\022app_engine_rou" +
+      "sks.v2beta2.HttpMethod\022H\n\022app_engine_rou",
       "ting\030\002 \001(\0132,.google.cloud.tasks.v2beta2." +
       "AppEngineRouting\022\024\n\014relative_url\030\003 \001(\t\022N" +
       "\n\007headers\030\004 \003(\0132=.google.cloud.tasks.v2b" +
@@ -72,7 +72,7 @@ public static void registerAllExtensions(
       "ing\022\017\n\007service\030\001 \001(\t\022\017\n\007version\030\002 \001(\t\022\020\n" +
       "\010instance\030\003 \001(\t\022\014\n\004host\030\004 \001(\t*[\n\nHttpMet" +
       "hod\022\033\n\027HTTP_METHOD_UNSPECIFIED\020\000\022\010\n\004POST" +
-      "\020\001\022\007\n\003GET\020\002\022\010\n\004HEAD\020\003\022\007\n\003PUT\020\004\022\n\n\006DELETE" +
+      "\020\001\022\007\n\003GET\020\002\022\010\n\004HEAD\020\003\022\007\n\003PUT\020\004\022\n\n\006DELETE",
       "\020\005Bp\n\036com.google.cloud.tasks.v2beta2B\013Ta" +
       "rgetProtoP\001Z?google.golang.org/genproto/" +
       "googleapis/cloud/tasks/v2beta2;tasksb\006pr" +
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/Task.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/Task.java
index cc490ef9c410..276e8a127303 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/Task.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/Task.java
@@ -34,9 +34,6 @@ private Task(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private Task(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -127,13 +131,6 @@ private Task(
             view_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -151,7 +148,6 @@ private Task(
     return com.google.cloud.tasks.v2beta2.TaskProto.internal_static_google_cloud_tasks_v2beta2_Task_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta2.TaskProto.internal_static_google_cloud_tasks_v2beta2_Task_fieldAccessorTable
@@ -665,13 +661,11 @@ public int getViewValue() {
    * .google.cloud.tasks.v2beta2.Task.View view = 8;
    */
   public com.google.cloud.tasks.v2beta2.Task.View getView() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.tasks.v2beta2.Task.View result = com.google.cloud.tasks.v2beta2.Task.View.valueOf(view_);
     return result == null ? com.google.cloud.tasks.v2beta2.Task.View.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -681,7 +675,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -708,7 +701,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -904,7 +896,6 @@ public static com.google.cloud.tasks.v2beta2.Task parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -912,7 +903,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta2.Task prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -940,7 +930,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta2.TaskProto.internal_static_google_cloud_tasks_v2beta2_Task_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta2.TaskProto.internal_static_google_cloud_tasks_v2beta2_Task_fieldAccessorTable
@@ -963,7 +952,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -993,18 +981,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta2.TaskProto.internal_static_google_cloud_tasks_v2beta2_Task_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.Task getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta2.Task.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.Task build() {
       com.google.cloud.tasks.v2beta2.Task result = buildPartial();
       if (!result.isInitialized()) {
@@ -1013,7 +998,6 @@ public com.google.cloud.tasks.v2beta2.Task build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.Task buildPartial() {
       com.google.cloud.tasks.v2beta2.Task result = new com.google.cloud.tasks.v2beta2.Task(this);
       result.name_ = name_;
@@ -1052,39 +1036,32 @@ public com.google.cloud.tasks.v2beta2.Task buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta2.Task) {
         return mergeFrom((com.google.cloud.tasks.v2beta2.Task)other);
@@ -1130,12 +1107,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta2.Task other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2287,7 +2262,6 @@ public Builder setViewValue(int value) {
      * .google.cloud.tasks.v2beta2.Task.View view = 8;
      */
     public com.google.cloud.tasks.v2beta2.Task.View getView() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.tasks.v2beta2.Task.View result = com.google.cloud.tasks.v2beta2.Task.View.valueOf(view_);
       return result == null ? com.google.cloud.tasks.v2beta2.Task.View.UNRECOGNIZED : result;
     }
@@ -2322,13 +2296,11 @@ public Builder clearView() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2350,12 +2322,11 @@ public static com.google.cloud.tasks.v2beta2.Task getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Task parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Task(input, extensionRegistry);
+        return new Task(input, extensionRegistry);
     }
   };
 
@@ -2368,7 +2339,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta2.Task getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/TaskProto.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/TaskProto.java
index 856f5efe5178..a8f315c6584d 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/TaskProto.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/TaskProto.java
@@ -47,7 +47,7 @@ public static void registerAllExtensions(
       "equest\030\003 \001(\01320.google.cloud.tasks.v2beta" +
       "2.AppEngineHttpRequestH\000\022?\n\014pull_message" +
       "\030\004 \001(\0132\'.google.cloud.tasks.v2beta2.Pull" +
-      "MessageH\000\0221\n\rschedule_time\030\005 \001(\0132\032.googl" +
+      "MessageH\000\0221\n\rschedule_time\030\005 \001(\0132\032.googl",
       "e.protobuf.Timestamp\022/\n\013create_time\030\006 \001(" +
       "\0132\032.google.protobuf.Timestamp\0226\n\006status\030" +
       "\007 \001(\0132&.google.cloud.tasks.v2beta2.TaskS" +
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "_type\"\335\001\n\nTaskStatus\022\036\n\026attempt_dispatch" +
       "_count\030\001 \001(\005\022\036\n\026attempt_response_count\030\002" +
       " \001(\005\022G\n\024first_attempt_status\030\003 \001(\0132).goo" +
-      "gle.cloud.tasks.v2beta2.AttemptStatus\022F\n" +
+      "gle.cloud.tasks.v2beta2.AttemptStatus\022F\n",
       "\023last_attempt_status\030\004 \001(\0132).google.clou" +
       "d.tasks.v2beta2.AttemptStatus\"\325\001\n\rAttemp" +
       "tStatus\0221\n\rschedule_time\030\001 \001(\0132\032.google." +
@@ -67,7 +67,7 @@ public static void registerAllExtensions(
       "\022+\n\017response_status\030\004 \001(\0132\022.google.rpc.S" +
       "tatusBn\n\036com.google.cloud.tasks.v2beta2B" +
       "\tTaskProtoP\001Z?google.golang.org/genproto" +
-      "/googleapis/cloud/tasks/v2beta2;tasksb\006p" +
+      "/googleapis/cloud/tasks/v2beta2;tasksb\006p",
       "roto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/TaskStatus.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/TaskStatus.java
index e1b9bf29aad3..cdda29a08a68 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/TaskStatus.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/TaskStatus.java
@@ -34,9 +34,6 @@ private TaskStatus(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private TaskStatus(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
 
             attemptDispatchCount_ = input.readInt32();
@@ -84,13 +88,6 @@ private TaskStatus(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -108,7 +105,6 @@ private TaskStatus(
     return com.google.cloud.tasks.v2beta2.TaskProto.internal_static_google_cloud_tasks_v2beta2_TaskStatus_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta2.TaskProto.internal_static_google_cloud_tasks_v2beta2_TaskStatus_fieldAccessorTable
@@ -224,7 +220,6 @@ public com.google.cloud.tasks.v2beta2.AttemptStatusOrBuilder getLastAttemptStatu
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -234,7 +229,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (attemptDispatchCount_ != 0) {
@@ -252,7 +246,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -402,7 +395,6 @@ public static com.google.cloud.tasks.v2beta2.TaskStatus parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -410,7 +402,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta2.TaskStatus prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -438,7 +429,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta2.TaskProto.internal_static_google_cloud_tasks_v2beta2_TaskStatus_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta2.TaskProto.internal_static_google_cloud_tasks_v2beta2_TaskStatus_fieldAccessorTable
@@ -461,7 +451,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       attemptDispatchCount_ = 0;
@@ -483,18 +472,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta2.TaskProto.internal_static_google_cloud_tasks_v2beta2_TaskStatus_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.TaskStatus getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta2.TaskStatus.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.TaskStatus build() {
       com.google.cloud.tasks.v2beta2.TaskStatus result = buildPartial();
       if (!result.isInitialized()) {
@@ -503,7 +489,6 @@ public com.google.cloud.tasks.v2beta2.TaskStatus build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.TaskStatus buildPartial() {
       com.google.cloud.tasks.v2beta2.TaskStatus result = new com.google.cloud.tasks.v2beta2.TaskStatus(this);
       result.attemptDispatchCount_ = attemptDispatchCount_;
@@ -522,39 +507,32 @@ public com.google.cloud.tasks.v2beta2.TaskStatus buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta2.TaskStatus) {
         return mergeFrom((com.google.cloud.tasks.v2beta2.TaskStatus)other);
@@ -583,12 +561,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta2.TaskStatus other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1033,13 +1009,11 @@ public com.google.cloud.tasks.v2beta2.AttemptStatusOrBuilder getLastAttemptStatu
       }
       return lastAttemptStatusBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1061,12 +1035,11 @@ public static com.google.cloud.tasks.v2beta2.TaskStatus getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TaskStatus parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TaskStatus(input, extensionRegistry);
+        return new TaskStatus(input, extensionRegistry);
     }
   };
 
@@ -1079,7 +1052,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta2.TaskStatus getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/UpdateQueueRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/UpdateQueueRequest.java
index a4087171591f..c43ab930ef06 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/UpdateQueueRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta2/src/main/java/com/google/cloud/tasks/v2beta2/UpdateQueueRequest.java
@@ -32,9 +32,6 @@ private UpdateQueueRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private UpdateQueueRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.tasks.v2beta2.Queue.Builder subBuilder = null;
             if (queue_ != null) {
@@ -72,13 +76,6 @@ private UpdateQueueRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private UpdateQueueRequest(
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_UpdateQueueRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_UpdateQueueRequest_fieldAccessorTable
@@ -189,7 +185,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -199,7 +194,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (queue_ != null) {
@@ -211,7 +205,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -345,7 +338,6 @@ public static com.google.cloud.tasks.v2beta2.UpdateQueueRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -353,7 +345,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta2.UpdateQueueRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -381,7 +372,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_UpdateQueueRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_UpdateQueueRequest_fieldAccessorTable
@@ -404,7 +394,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (queueBuilder_ == null) {
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta2.CloudTasksProto.internal_static_google_cloud_tasks_v2beta2_UpdateQueueRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.UpdateQueueRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta2.UpdateQueueRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.UpdateQueueRequest build() {
       com.google.cloud.tasks.v2beta2.UpdateQueueRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public com.google.cloud.tasks.v2beta2.UpdateQueueRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta2.UpdateQueueRequest buildPartial() {
       com.google.cloud.tasks.v2beta2.UpdateQueueRequest result = new com.google.cloud.tasks.v2beta2.UpdateQueueRequest(this);
       if (queueBuilder_ == null) {
@@ -459,39 +444,32 @@ public com.google.cloud.tasks.v2beta2.UpdateQueueRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta2.UpdateQueueRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta2.UpdateQueueRequest)other);
@@ -514,12 +492,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta2.UpdateQueueRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -897,13 +873,11 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
       }
       return updateMaskBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -925,12 +899,11 @@ public static com.google.cloud.tasks.v2beta2.UpdateQueueRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateQueueRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateQueueRequest(input, extensionRegistry);
+        return new UpdateQueueRequest(input, extensionRegistry);
     }
   };
 
@@ -943,7 +916,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta2.UpdateQueueRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/AppEngineHttpQueue.java b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/AppEngineHttpQueue.java
index c225cd0bf069..f3fffbc341b3 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/AppEngineHttpQueue.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/AppEngineHttpQueue.java
@@ -41,9 +41,6 @@ private AppEngineHttpQueue(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -55,6 +52,13 @@ private AppEngineHttpQueue(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.tasks.v2beta3.AppEngineRouting.Builder subBuilder = null;
             if (appEngineRoutingOverride_ != null) {
@@ -68,13 +72,6 @@ private AppEngineHttpQueue(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -92,7 +89,6 @@ private AppEngineHttpQueue(
     return com.google.cloud.tasks.v2beta3.TargetProto.internal_static_google_cloud_tasks_v2beta3_AppEngineHttpQueue_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta3.TargetProto.internal_static_google_cloud_tasks_v2beta3_AppEngineHttpQueue_fieldAccessorTable
@@ -146,7 +142,6 @@ public com.google.cloud.tasks.v2beta3.AppEngineRoutingOrBuilder getAppEngineRout
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -156,7 +151,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (appEngineRoutingOverride_ != null) {
@@ -165,7 +159,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -286,7 +279,6 @@ public static com.google.cloud.tasks.v2beta3.AppEngineHttpQueue parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -294,7 +286,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta3.AppEngineHttpQueue prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -331,7 +322,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta3.TargetProto.internal_static_google_cloud_tasks_v2beta3_AppEngineHttpQueue_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta3.TargetProto.internal_static_google_cloud_tasks_v2beta3_AppEngineHttpQueue_fieldAccessorTable
@@ -354,7 +344,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (appEngineRoutingOverrideBuilder_ == null) {
@@ -366,18 +355,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta3.TargetProto.internal_static_google_cloud_tasks_v2beta3_AppEngineHttpQueue_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.AppEngineHttpQueue getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta3.AppEngineHttpQueue.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.AppEngineHttpQueue build() {
       com.google.cloud.tasks.v2beta3.AppEngineHttpQueue result = buildPartial();
       if (!result.isInitialized()) {
@@ -386,7 +372,6 @@ public com.google.cloud.tasks.v2beta3.AppEngineHttpQueue build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.AppEngineHttpQueue buildPartial() {
       com.google.cloud.tasks.v2beta3.AppEngineHttpQueue result = new com.google.cloud.tasks.v2beta3.AppEngineHttpQueue(this);
       if (appEngineRoutingOverrideBuilder_ == null) {
@@ -398,39 +383,32 @@ public com.google.cloud.tasks.v2beta3.AppEngineHttpQueue buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta3.AppEngineHttpQueue) {
         return mergeFrom((com.google.cloud.tasks.v2beta3.AppEngineHttpQueue)other);
@@ -450,12 +428,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta3.AppEngineHttpQueue other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -662,13 +638,11 @@ public com.google.cloud.tasks.v2beta3.AppEngineRoutingOrBuilder getAppEngineRout
       }
       return appEngineRoutingOverrideBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -690,12 +664,11 @@ public static com.google.cloud.tasks.v2beta3.AppEngineHttpQueue getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AppEngineHttpQueue parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AppEngineHttpQueue(input, extensionRegistry);
+        return new AppEngineHttpQueue(input, extensionRegistry);
     }
   };
 
@@ -708,7 +681,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta3.AppEngineHttpQueue getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/AppEngineHttpRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/AppEngineHttpRequest.java
index 44128838050c..ff21c71e6008 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/AppEngineHttpRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/AppEngineHttpRequest.java
@@ -66,9 +66,6 @@ private AppEngineHttpRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -80,6 +77,13 @@ private AppEngineHttpRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -123,13 +127,6 @@ private AppEngineHttpRequest(
             body_ = input.readBytes();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -148,7 +145,6 @@ private AppEngineHttpRequest(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -159,7 +155,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta3.TargetProto.internal_static_google_cloud_tasks_v2beta3_AppEngineHttpRequest_fieldAccessorTable
@@ -202,7 +197,6 @@ public int getHttpMethodValue() {
    * .google.cloud.tasks.v2beta3.HttpMethod http_method = 1;
    */
   public com.google.cloud.tasks.v2beta3.HttpMethod getHttpMethod() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.tasks.v2beta3.HttpMethod result = com.google.cloud.tasks.v2beta3.HttpMethod.valueOf(httpMethod_);
     return result == null ? com.google.cloud.tasks.v2beta3.HttpMethod.UNRECOGNIZED : result;
   }
@@ -534,7 +528,6 @@ public com.google.protobuf.ByteString getBody() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -544,7 +537,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (httpMethod_ != com.google.cloud.tasks.v2beta3.HttpMethod.HTTP_METHOD_UNSPECIFIED.getNumber()) {
@@ -568,7 +560,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -727,7 +718,6 @@ public static com.google.cloud.tasks.v2beta3.AppEngineHttpRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -735,7 +725,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta3.AppEngineHttpRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -816,7 +805,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta3.TargetProto.internal_static_google_cloud_tasks_v2beta3_AppEngineHttpRequest_fieldAccessorTable
@@ -839,7 +827,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       httpMethod_ = 0;
@@ -858,18 +845,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta3.TargetProto.internal_static_google_cloud_tasks_v2beta3_AppEngineHttpRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.AppEngineHttpRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta3.AppEngineHttpRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.AppEngineHttpRequest build() {
       com.google.cloud.tasks.v2beta3.AppEngineHttpRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -878,7 +862,6 @@ public com.google.cloud.tasks.v2beta3.AppEngineHttpRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.AppEngineHttpRequest buildPartial() {
       com.google.cloud.tasks.v2beta3.AppEngineHttpRequest result = new com.google.cloud.tasks.v2beta3.AppEngineHttpRequest(this);
       int from_bitField0_ = bitField0_;
@@ -898,39 +881,32 @@ public com.google.cloud.tasks.v2beta3.AppEngineHttpRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta3.AppEngineHttpRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta3.AppEngineHttpRequest)other);
@@ -962,12 +938,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta3.AppEngineHttpRequest oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1039,7 +1013,6 @@ public Builder setHttpMethodValue(int value) {
      * .google.cloud.tasks.v2beta3.HttpMethod http_method = 1;
      */
     public com.google.cloud.tasks.v2beta3.HttpMethod getHttpMethod() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.tasks.v2beta3.HttpMethod result = com.google.cloud.tasks.v2beta3.HttpMethod.valueOf(httpMethod_);
       return result == null ? com.google.cloud.tasks.v2beta3.HttpMethod.UNRECOGNIZED : result;
     }
@@ -1799,13 +1772,11 @@ public Builder clearBody() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1827,12 +1798,11 @@ public static com.google.cloud.tasks.v2beta3.AppEngineHttpRequest getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AppEngineHttpRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AppEngineHttpRequest(input, extensionRegistry);
+        return new AppEngineHttpRequest(input, extensionRegistry);
     }
   };
 
@@ -1845,7 +1815,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta3.AppEngineHttpRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/AppEngineRouting.java b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/AppEngineRouting.java
index c749e8294f5b..af11496a5c69 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/AppEngineRouting.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/AppEngineRouting.java
@@ -49,9 +49,6 @@ private AppEngineRouting(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -63,6 +60,13 @@ private AppEngineRouting(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -87,13 +91,6 @@ private AppEngineRouting(
             host_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -111,7 +108,6 @@ private AppEngineRouting(
     return com.google.cloud.tasks.v2beta3.TargetProto.internal_static_google_cloud_tasks_v2beta3_AppEngineRouting_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta3.TargetProto.internal_static_google_cloud_tasks_v2beta3_AppEngineRouting_fieldAccessorTable
@@ -368,7 +364,6 @@ public java.lang.String getHost() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -378,7 +373,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getServiceBytes().isEmpty()) {
@@ -396,7 +390,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -532,7 +525,6 @@ public static com.google.cloud.tasks.v2beta3.AppEngineRouting parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -540,7 +532,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta3.AppEngineRouting prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -581,7 +572,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta3.TargetProto.internal_static_google_cloud_tasks_v2beta3_AppEngineRouting_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta3.TargetProto.internal_static_google_cloud_tasks_v2beta3_AppEngineRouting_fieldAccessorTable
@@ -604,7 +594,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       service_ = "";
@@ -618,18 +607,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta3.TargetProto.internal_static_google_cloud_tasks_v2beta3_AppEngineRouting_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.AppEngineRouting getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta3.AppEngineRouting.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.AppEngineRouting build() {
       com.google.cloud.tasks.v2beta3.AppEngineRouting result = buildPartial();
       if (!result.isInitialized()) {
@@ -638,7 +624,6 @@ public com.google.cloud.tasks.v2beta3.AppEngineRouting build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.AppEngineRouting buildPartial() {
       com.google.cloud.tasks.v2beta3.AppEngineRouting result = new com.google.cloud.tasks.v2beta3.AppEngineRouting(this);
       result.service_ = service_;
@@ -649,39 +634,32 @@ public com.google.cloud.tasks.v2beta3.AppEngineRouting buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta3.AppEngineRouting) {
         return mergeFrom((com.google.cloud.tasks.v2beta3.AppEngineRouting)other);
@@ -714,12 +692,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta3.AppEngineRouting other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1293,13 +1269,11 @@ public Builder setHostBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1321,12 +1295,11 @@ public static com.google.cloud.tasks.v2beta3.AppEngineRouting getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AppEngineRouting parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AppEngineRouting(input, extensionRegistry);
+        return new AppEngineRouting(input, extensionRegistry);
     }
   };
 
@@ -1339,7 +1312,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta3.AppEngineRouting getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/Attempt.java b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/Attempt.java
index f8d786af49d9..8ecf1716efa5 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/Attempt.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/Attempt.java
@@ -32,9 +32,6 @@ private Attempt(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private Attempt(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.protobuf.Timestamp.Builder subBuilder = null;
             if (scheduleTime_ != null) {
@@ -98,13 +102,6 @@ private Attempt(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -122,7 +119,6 @@ private Attempt(
     return com.google.cloud.tasks.v2beta3.TaskProto.internal_static_google_cloud_tasks_v2beta3_Attempt_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta3.TaskProto.internal_static_google_cloud_tasks_v2beta3_Attempt_fieldAccessorTable
@@ -278,7 +274,6 @@ public com.google.rpc.StatusOrBuilder getResponseStatusOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -288,7 +283,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (scheduleTime_ != null) {
@@ -306,7 +300,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -466,7 +459,6 @@ public static com.google.cloud.tasks.v2beta3.Attempt parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -474,7 +466,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta3.Attempt prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -502,7 +493,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta3.TaskProto.internal_static_google_cloud_tasks_v2beta3_Attempt_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta3.TaskProto.internal_static_google_cloud_tasks_v2beta3_Attempt_fieldAccessorTable
@@ -525,7 +515,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (scheduleTimeBuilder_ == null) {
@@ -555,18 +544,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta3.TaskProto.internal_static_google_cloud_tasks_v2beta3_Attempt_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.Attempt getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta3.Attempt.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.Attempt build() {
       com.google.cloud.tasks.v2beta3.Attempt result = buildPartial();
       if (!result.isInitialized()) {
@@ -575,7 +561,6 @@ public com.google.cloud.tasks.v2beta3.Attempt build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.Attempt buildPartial() {
       com.google.cloud.tasks.v2beta3.Attempt result = new com.google.cloud.tasks.v2beta3.Attempt(this);
       if (scheduleTimeBuilder_ == null) {
@@ -602,39 +587,32 @@ public com.google.cloud.tasks.v2beta3.Attempt buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta3.Attempt) {
         return mergeFrom((com.google.cloud.tasks.v2beta3.Attempt)other);
@@ -663,12 +641,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta3.Attempt other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1343,13 +1319,11 @@ public com.google.rpc.StatusOrBuilder getResponseStatusOrBuilder() {
       }
       return responseStatusBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1371,12 +1345,11 @@ public static com.google.cloud.tasks.v2beta3.Attempt getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Attempt parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Attempt(input, extensionRegistry);
+        return new Attempt(input, extensionRegistry);
     }
   };
 
@@ -1389,7 +1362,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta3.Attempt getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/CloudTasksProto.java b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/CloudTasksProto.java
index e944d4cab14b..be358762d8f9 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/CloudTasksProto.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/CloudTasksProto.java
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "to\032\033google/protobuf/empty.proto\032 google/" +
       "protobuf/field_mask.proto\032\025google/rpc/co" +
       "de.proto\"Z\n\021ListQueuesRequest\022\016\n\006parent\030" +
-      "\001 \001(\t\022\016\n\006filter\030\002 \001(\t\022\021\n\tpage_size\030\003 \001(\005" +
+      "\001 \001(\t\022\016\n\006filter\030\002 \001(\t\022\021\n\tpage_size\030\003 \001(\005",
       "\022\022\n\npage_token\030\004 \001(\t\"`\n\022ListQueuesRespon" +
       "se\0221\n\006queues\030\001 \003(\0132!.google.cloud.tasks." +
       "v2beta3.Queue\022\027\n\017next_page_token\030\002 \001(\t\"\037" +
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       "w\n\022UpdateQueueRequest\0220\n\005queue\030\001 \001(\0132!.g" +
       "oogle.cloud.tasks.v2beta3.Queue\022/\n\013updat" +
       "e_mask\030\002 \001(\0132\032.google.protobuf.FieldMask" +
-      "\"\"\n\022DeleteQueueRequest\022\014\n\004name\030\001 \001(\t\"!\n\021" +
+      "\"\"\n\022DeleteQueueRequest\022\014\n\004name\030\001 \001(\t\"!\n\021",
       "PurgeQueueRequest\022\014\n\004name\030\001 \001(\t\"!\n\021Pause" +
       "QueueRequest\022\014\n\004name\030\001 \001(\t\"\"\n\022ResumeQueu" +
       "eRequest\022\014\n\004name\030\001 \001(\t\"\207\001\n\020ListTasksRequ" +
@@ -127,7 +127,7 @@ public static void registerAllExtensions(
       "\"]\n\021ListTasksResponse\022/\n\005tasks\030\001 \003(\0132 .g" +
       "oogle.cloud.tasks.v2beta3.Task\022\027\n\017next_p" +
       "age_token\030\002 \001(\t\"\\\n\016GetTaskRequest\022\014\n\004nam" +
-      "e\030\001 \001(\t\022<\n\rresponse_view\030\002 \001(\0162%.google." +
+      "e\030\001 \001(\t\022<\n\rresponse_view\030\002 \001(\0162%.google.",
       "cloud.tasks.v2beta3.Task.View\"\221\001\n\021Create" +
       "TaskRequest\022\016\n\006parent\030\001 \001(\t\022.\n\004task\030\002 \001(" +
       "\0132 .google.cloud.tasks.v2beta3.Task\022<\n\rr" +
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       " \001(\t\022<\n\rresponse_view\030\002 \001(\0162%.google.clo" +
       "ud.tasks.v2beta3.Task.View2\247\024\n\nCloudTask" +
       "s\022\244\001\n\nListQueues\022-.google.cloud.tasks.v2" +
-      "beta3.ListQueuesRequest\032..google.cloud.t" +
+      "beta3.ListQueuesRequest\032..google.cloud.t",
       "asks.v2beta3.ListQueuesResponse\"7\202\323\344\223\0021\022" +
       "//v2beta3/{parent=projects/*/locations/*" +
       "}/queues\022\223\001\n\010GetQueue\022+.google.cloud.tas" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "\001\n\013CreateQueue\022..google.cloud.tasks.v2be" +
       "ta3.CreateQueueRequest\032!.google.cloud.ta" +
       "sks.v2beta3.Queue\">\202\323\344\223\0028\"//v2beta3/{par" +
-      "ent=projects/*/locations/*}/queues:\005queu" +
+      "ent=projects/*/locations/*}/queues:\005queu",
       "e\022\246\001\n\013UpdateQueue\022..google.cloud.tasks.v" +
       "2beta3.UpdateQueueRequest\032!.google.cloud" +
       ".tasks.v2beta3.Queue\"D\202\323\344\223\002>25/v2beta3/{" +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       "gle.protobuf.Empty\"7\202\323\344\223\0021*//v2beta3/{na" +
       "me=projects/*/locations/*/queues/*}\022\240\001\n\n" +
       "PurgeQueue\022-.google.cloud.tasks.v2beta3." +
-      "PurgeQueueRequest\032!.google.cloud.tasks.v" +
+      "PurgeQueueRequest\032!.google.cloud.tasks.v",
       "2beta3.Queue\"@\202\323\344\223\002:\"5/v2beta3/{name=pro" +
       "jects/*/locations/*/queues/*}:purge:\001*\022\240" +
       "\001\n\nPauseQueue\022-.google.cloud.tasks.v2bet" +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       "*\022\243\001\n\013ResumeQueue\022..google.cloud.tasks.v" +
       "2beta3.ResumeQueueRequest\032!.google.cloud" +
       ".tasks.v2beta3.Queue\"A\202\323\344\223\002;\"6/v2beta3/{" +
-      "name=projects/*/locations/*/queues/*}:re" +
+      "name=projects/*/locations/*/queues/*}:re",
       "sume:\001*\022\226\001\n\014GetIamPolicy\022\".google.iam.v1" +
       ".GetIamPolicyRequest\032\025.google.iam.v1.Pol" +
       "icy\"K\202\323\344\223\002E\"@/v2beta3/{resource=projects" +
@@ -177,7 +177,7 @@ public static void registerAllExtensions(
       "\344\223\002E\"@/v2beta3/{resource=projects/*/loca" +
       "tions/*/queues/*}:setIamPolicy:\001*\022\274\001\n\022Te" +
       "stIamPermissions\022(.google.iam.v1.TestIam" +
-      "PermissionsRequest\032).google.iam.v1.TestI" +
+      "PermissionsRequest\032).google.iam.v1.TestI",
       "amPermissionsResponse\"Q\202\323\344\223\002K\"F/v2beta3/" +
       "{resource=projects/*/locations/*/queues/" +
       "*}:testIamPermissions:\001*\022\251\001\n\tListTasks\022," +
@@ -187,7 +187,7 @@ public static void registerAllExtensions(
       "ojects/*/locations/*/queues/*}/tasks\022\230\001\n" +
       "\007GetTask\022*.google.cloud.tasks.v2beta3.Ge" +
       "tTaskRequest\032 .google.cloud.tasks.v2beta" +
-      "3.Task\"?\202\323\344\223\0029\0227/v2beta3/{name=projects/" +
+      "3.Task\"?\202\323\344\223\0029\0227/v2beta3/{name=projects/",
       "*/locations/*/queues/*/tasks/*}\022\241\001\n\nCrea" +
       "teTask\022-.google.cloud.tasks.v2beta3.Crea" +
       "teTaskRequest\032 .google.cloud.tasks.v2bet" +
@@ -197,7 +197,7 @@ public static void registerAllExtensions(
       "DeleteTaskRequest\032\026.google.protobuf.Empt" +
       "y\"?\202\323\344\223\0029*7/v2beta3/{name=projects/*/loc" +
       "ations/*/queues/*/tasks/*}\022\237\001\n\007RunTask\022*" +
-      ".google.cloud.tasks.v2beta3.RunTaskReque" +
+      ".google.cloud.tasks.v2beta3.RunTaskReque",
       "st\032 .google.cloud.tasks.v2beta3.Task\"F\202\323" +
       "\344\223\002@\";/v2beta3/{name=projects/*/location" +
       "s/*/queues/*/tasks/*}:run:\001*B|\n\036com.goog" +
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/CreateQueueRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/CreateQueueRequest.java
index f70366a5df8a..4b66dcfd68a3 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/CreateQueueRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/CreateQueueRequest.java
@@ -33,9 +33,6 @@ private CreateQueueRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private CreateQueueRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private CreateQueueRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private CreateQueueRequest(
     return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_CreateQueueRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_CreateQueueRequest_fieldAccessorTable
@@ -190,7 +186,6 @@ public com.google.cloud.tasks.v2beta3.QueueOrBuilder getQueueOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -200,7 +195,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -212,7 +206,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -340,7 +333,6 @@ public static com.google.cloud.tasks.v2beta3.CreateQueueRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -348,7 +340,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta3.CreateQueueRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -376,7 +367,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_CreateQueueRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_CreateQueueRequest_fieldAccessorTable
@@ -399,7 +389,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -413,18 +402,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_CreateQueueRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.CreateQueueRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta3.CreateQueueRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.CreateQueueRequest build() {
       com.google.cloud.tasks.v2beta3.CreateQueueRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -433,7 +419,6 @@ public com.google.cloud.tasks.v2beta3.CreateQueueRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.CreateQueueRequest buildPartial() {
       com.google.cloud.tasks.v2beta3.CreateQueueRequest result = new com.google.cloud.tasks.v2beta3.CreateQueueRequest(this);
       result.parent_ = parent_;
@@ -446,39 +431,32 @@ public com.google.cloud.tasks.v2beta3.CreateQueueRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta3.CreateQueueRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta3.CreateQueueRequest)other);
@@ -502,12 +480,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta3.CreateQueueRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -810,13 +786,11 @@ public com.google.cloud.tasks.v2beta3.QueueOrBuilder getQueueOrBuilder() {
       }
       return queueBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -838,12 +812,11 @@ public static com.google.cloud.tasks.v2beta3.CreateQueueRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateQueueRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateQueueRequest(input, extensionRegistry);
+        return new CreateQueueRequest(input, extensionRegistry);
     }
   };
 
@@ -856,7 +829,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta3.CreateQueueRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/CreateTaskRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/CreateTaskRequest.java
index 93fd78a4b730..dd977d05e6c3 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/CreateTaskRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/CreateTaskRequest.java
@@ -34,9 +34,6 @@ private CreateTaskRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private CreateTaskRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private CreateTaskRequest(
             responseView_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private CreateTaskRequest(
     return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_CreateTaskRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_CreateTaskRequest_fieldAccessorTable
@@ -308,13 +304,11 @@ public int getResponseViewValue() {
    * .google.cloud.tasks.v2beta3.Task.View response_view = 3;
    */
   public com.google.cloud.tasks.v2beta3.Task.View getResponseView() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.tasks.v2beta3.Task.View result = com.google.cloud.tasks.v2beta3.Task.View.valueOf(responseView_);
     return result == null ? com.google.cloud.tasks.v2beta3.Task.View.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -324,7 +318,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -339,7 +332,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -474,7 +466,6 @@ public static com.google.cloud.tasks.v2beta3.CreateTaskRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -482,7 +473,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta3.CreateTaskRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -510,7 +500,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_CreateTaskRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_CreateTaskRequest_fieldAccessorTable
@@ -533,7 +522,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -549,18 +537,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_CreateTaskRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.CreateTaskRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta3.CreateTaskRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.CreateTaskRequest build() {
       com.google.cloud.tasks.v2beta3.CreateTaskRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -569,7 +554,6 @@ public com.google.cloud.tasks.v2beta3.CreateTaskRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.CreateTaskRequest buildPartial() {
       com.google.cloud.tasks.v2beta3.CreateTaskRequest result = new com.google.cloud.tasks.v2beta3.CreateTaskRequest(this);
       result.parent_ = parent_;
@@ -583,39 +567,32 @@ public com.google.cloud.tasks.v2beta3.CreateTaskRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta3.CreateTaskRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta3.CreateTaskRequest)other);
@@ -642,12 +619,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta3.CreateTaskRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1233,7 +1208,6 @@ public Builder setResponseViewValue(int value) {
      * .google.cloud.tasks.v2beta3.Task.View response_view = 3;
      */
     public com.google.cloud.tasks.v2beta3.Task.View getResponseView() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.tasks.v2beta3.Task.View result = com.google.cloud.tasks.v2beta3.Task.View.valueOf(responseView_);
       return result == null ? com.google.cloud.tasks.v2beta3.Task.View.UNRECOGNIZED : result;
     }
@@ -1284,13 +1258,11 @@ public Builder clearResponseView() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1312,12 +1284,11 @@ public static com.google.cloud.tasks.v2beta3.CreateTaskRequest getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateTaskRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateTaskRequest(input, extensionRegistry);
+        return new CreateTaskRequest(input, extensionRegistry);
     }
   };
 
@@ -1330,7 +1301,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta3.CreateTaskRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/DeleteQueueRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/DeleteQueueRequest.java
index d0931414af60..d53730463f9d 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/DeleteQueueRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/DeleteQueueRequest.java
@@ -33,9 +33,6 @@ private DeleteQueueRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteQueueRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteQueueRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteQueueRequest(
     return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_DeleteQueueRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_DeleteQueueRequest_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.tasks.v2beta3.DeleteQueueRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta3.DeleteQueueRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_DeleteQueueRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_DeleteQueueRequest_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_DeleteQueueRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.DeleteQueueRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta3.DeleteQueueRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.DeleteQueueRequest build() {
       com.google.cloud.tasks.v2beta3.DeleteQueueRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.tasks.v2beta3.DeleteQueueRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.DeleteQueueRequest buildPartial() {
       com.google.cloud.tasks.v2beta3.DeleteQueueRequest result = new com.google.cloud.tasks.v2beta3.DeleteQueueRequest(this);
       result.name_ = name_;
@@ -361,39 +346,32 @@ public com.google.cloud.tasks.v2beta3.DeleteQueueRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta3.DeleteQueueRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta3.DeleteQueueRequest)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta3.DeleteQueueRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.tasks.v2beta3.DeleteQueueRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteQueueRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteQueueRequest(input, extensionRegistry);
+        return new DeleteQueueRequest(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta3.DeleteQueueRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/DeleteTaskRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/DeleteTaskRequest.java
index 36bcaf4884ed..3ca4898254b5 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/DeleteTaskRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/DeleteTaskRequest.java
@@ -34,9 +34,6 @@ private DeleteTaskRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,12 +45,6 @@ private DeleteTaskRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -61,6 +52,12 @@ private DeleteTaskRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -78,7 +75,6 @@ private DeleteTaskRequest(
     return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_DeleteTaskRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_DeleteTaskRequest_fieldAccessorTable
@@ -133,7 +129,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -143,7 +138,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -152,7 +146,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -267,7 +260,6 @@ public static com.google.cloud.tasks.v2beta3.DeleteTaskRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -275,7 +267,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta3.DeleteTaskRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -304,7 +295,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_DeleteTaskRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_DeleteTaskRequest_fieldAccessorTable
@@ -327,7 +317,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -335,18 +324,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_DeleteTaskRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.DeleteTaskRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta3.DeleteTaskRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.DeleteTaskRequest build() {
       com.google.cloud.tasks.v2beta3.DeleteTaskRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -355,7 +341,6 @@ public com.google.cloud.tasks.v2beta3.DeleteTaskRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.DeleteTaskRequest buildPartial() {
       com.google.cloud.tasks.v2beta3.DeleteTaskRequest result = new com.google.cloud.tasks.v2beta3.DeleteTaskRequest(this);
       result.name_ = name_;
@@ -363,39 +348,32 @@ public com.google.cloud.tasks.v2beta3.DeleteTaskRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta3.DeleteTaskRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta3.DeleteTaskRequest)other);
@@ -416,12 +394,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta3.DeleteTaskRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -538,13 +514,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -566,12 +540,11 @@ public static com.google.cloud.tasks.v2beta3.DeleteTaskRequest getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteTaskRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteTaskRequest(input, extensionRegistry);
+        return new DeleteTaskRequest(input, extensionRegistry);
     }
   };
 
@@ -584,7 +557,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta3.DeleteTaskRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/GetQueueRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/GetQueueRequest.java
index 7889ed934525..82aa89a2f25c 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/GetQueueRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/GetQueueRequest.java
@@ -33,9 +33,6 @@ private GetQueueRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetQueueRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetQueueRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetQueueRequest(
     return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_GetQueueRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_GetQueueRequest_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.tasks.v2beta3.GetQueueRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta3.GetQueueRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_GetQueueRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_GetQueueRequest_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_GetQueueRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.GetQueueRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta3.GetQueueRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.GetQueueRequest build() {
       com.google.cloud.tasks.v2beta3.GetQueueRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.tasks.v2beta3.GetQueueRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.GetQueueRequest buildPartial() {
       com.google.cloud.tasks.v2beta3.GetQueueRequest result = new com.google.cloud.tasks.v2beta3.GetQueueRequest(this);
       result.name_ = name_;
@@ -361,39 +346,32 @@ public com.google.cloud.tasks.v2beta3.GetQueueRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta3.GetQueueRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta3.GetQueueRequest)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta3.GetQueueRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.tasks.v2beta3.GetQueueRequest getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetQueueRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetQueueRequest(input, extensionRegistry);
+        return new GetQueueRequest(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta3.GetQueueRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/GetTaskRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/GetTaskRequest.java
index 941f7ad9da7a..04d446b1637d 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/GetTaskRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/GetTaskRequest.java
@@ -34,9 +34,6 @@ private GetTaskRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private GetTaskRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private GetTaskRequest(
             responseView_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private GetTaskRequest(
     return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_GetTaskRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_GetTaskRequest_fieldAccessorTable
@@ -176,13 +172,11 @@ public int getResponseViewValue() {
    * .google.cloud.tasks.v2beta3.Task.View response_view = 2;
    */
   public com.google.cloud.tasks.v2beta3.Task.View getResponseView() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.tasks.v2beta3.Task.View result = com.google.cloud.tasks.v2beta3.Task.View.valueOf(responseView_);
     return result == null ? com.google.cloud.tasks.v2beta3.Task.View.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -192,7 +186,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -204,7 +197,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -326,7 +318,6 @@ public static com.google.cloud.tasks.v2beta3.GetTaskRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -334,7 +325,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta3.GetTaskRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -362,7 +352,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_GetTaskRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_GetTaskRequest_fieldAccessorTable
@@ -385,7 +374,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -395,18 +383,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_GetTaskRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.GetTaskRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta3.GetTaskRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.GetTaskRequest build() {
       com.google.cloud.tasks.v2beta3.GetTaskRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -415,7 +400,6 @@ public com.google.cloud.tasks.v2beta3.GetTaskRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.GetTaskRequest buildPartial() {
       com.google.cloud.tasks.v2beta3.GetTaskRequest result = new com.google.cloud.tasks.v2beta3.GetTaskRequest(this);
       result.name_ = name_;
@@ -424,39 +408,32 @@ public com.google.cloud.tasks.v2beta3.GetTaskRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta3.GetTaskRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta3.GetTaskRequest)other);
@@ -480,12 +457,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta3.GetTaskRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -661,7 +636,6 @@ public Builder setResponseViewValue(int value) {
      * .google.cloud.tasks.v2beta3.Task.View response_view = 2;
      */
     public com.google.cloud.tasks.v2beta3.Task.View getResponseView() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.tasks.v2beta3.Task.View result = com.google.cloud.tasks.v2beta3.Task.View.valueOf(responseView_);
       return result == null ? com.google.cloud.tasks.v2beta3.Task.View.UNRECOGNIZED : result;
     }
@@ -712,13 +686,11 @@ public Builder clearResponseView() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -740,12 +712,11 @@ public static com.google.cloud.tasks.v2beta3.GetTaskRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetTaskRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetTaskRequest(input, extensionRegistry);
+        return new GetTaskRequest(input, extensionRegistry);
     }
   };
 
@@ -758,7 +729,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta3.GetTaskRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/ListQueuesRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/ListQueuesRequest.java
index 41839666bb9b..8aaf56798901 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/ListQueuesRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/ListQueuesRequest.java
@@ -36,9 +36,6 @@ private ListQueuesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private ListQueuesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private ListQueuesRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private ListQueuesRequest(
     return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_ListQueuesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_ListQueuesRequest_fieldAccessorTable
@@ -280,7 +276,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -290,7 +285,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -308,7 +302,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -445,7 +438,6 @@ public static com.google.cloud.tasks.v2beta3.ListQueuesRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -453,7 +445,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta3.ListQueuesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -481,7 +472,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_ListQueuesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_ListQueuesRequest_fieldAccessorTable
@@ -504,7 +494,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -518,18 +507,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_ListQueuesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.ListQueuesRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta3.ListQueuesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.ListQueuesRequest build() {
       com.google.cloud.tasks.v2beta3.ListQueuesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -538,7 +524,6 @@ public com.google.cloud.tasks.v2beta3.ListQueuesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.ListQueuesRequest buildPartial() {
       com.google.cloud.tasks.v2beta3.ListQueuesRequest result = new com.google.cloud.tasks.v2beta3.ListQueuesRequest(this);
       result.parent_ = parent_;
@@ -549,39 +534,32 @@ public com.google.cloud.tasks.v2beta3.ListQueuesRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta3.ListQueuesRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta3.ListQueuesRequest)other);
@@ -613,12 +591,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta3.ListQueuesRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1031,13 +1007,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1059,12 +1033,11 @@ public static com.google.cloud.tasks.v2beta3.ListQueuesRequest getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListQueuesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListQueuesRequest(input, extensionRegistry);
+        return new ListQueuesRequest(input, extensionRegistry);
     }
   };
 
@@ -1077,7 +1050,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta3.ListQueuesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/ListQueuesResponse.java b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/ListQueuesResponse.java
index 83f5935fc87d..781e165da532 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/ListQueuesResponse.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/ListQueuesResponse.java
@@ -34,9 +34,6 @@ private ListQueuesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListQueuesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               queues_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListQueuesResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListQueuesResponse(
     return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_ListQueuesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_ListQueuesResponse_fieldAccessorTable
@@ -207,7 +203,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -217,7 +212,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < queues_.size(); i++) {
@@ -229,7 +223,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -354,7 +347,6 @@ public static com.google.cloud.tasks.v2beta3.ListQueuesResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -362,7 +354,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta3.ListQueuesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -390,7 +381,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_ListQueuesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_ListQueuesResponse_fieldAccessorTable
@@ -414,7 +404,6 @@ private void maybeForceBuilderInitialization() {
         getQueuesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (queuesBuilder_ == null) {
@@ -428,18 +417,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_ListQueuesResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.ListQueuesResponse getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta3.ListQueuesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.ListQueuesResponse build() {
       com.google.cloud.tasks.v2beta3.ListQueuesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -448,7 +434,6 @@ public com.google.cloud.tasks.v2beta3.ListQueuesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.ListQueuesResponse buildPartial() {
       com.google.cloud.tasks.v2beta3.ListQueuesResponse result = new com.google.cloud.tasks.v2beta3.ListQueuesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -468,39 +453,32 @@ public com.google.cloud.tasks.v2beta3.ListQueuesResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta3.ListQueuesResponse) {
         return mergeFrom((com.google.cloud.tasks.v2beta3.ListQueuesResponse)other);
@@ -547,12 +525,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta3.ListQueuesResponse other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -997,13 +973,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1025,12 +999,11 @@ public static com.google.cloud.tasks.v2beta3.ListQueuesResponse getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListQueuesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListQueuesResponse(input, extensionRegistry);
+        return new ListQueuesResponse(input, extensionRegistry);
     }
   };
 
@@ -1043,7 +1016,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta3.ListQueuesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/ListTasksRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/ListTasksRequest.java
index b5c16d7bb0de..a5e9925e8e82 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/ListTasksRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/ListTasksRequest.java
@@ -36,9 +36,6 @@ private ListTasksRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private ListTasksRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private ListTasksRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private ListTasksRequest(
     return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_ListTasksRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_ListTasksRequest_fieldAccessorTable
@@ -189,7 +185,6 @@ public int getResponseViewValue() {
    * .google.cloud.tasks.v2beta3.Task.View response_view = 2;
    */
   public com.google.cloud.tasks.v2beta3.Task.View getResponseView() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.tasks.v2beta3.Task.View result = com.google.cloud.tasks.v2beta3.Task.View.valueOf(responseView_);
     return result == null ? com.google.cloud.tasks.v2beta3.Task.View.UNRECOGNIZED : result;
   }
@@ -267,7 +262,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -277,7 +271,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -295,7 +288,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -432,7 +424,6 @@ public static com.google.cloud.tasks.v2beta3.ListTasksRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -440,7 +431,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta3.ListTasksRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -468,7 +458,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_ListTasksRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_ListTasksRequest_fieldAccessorTable
@@ -491,7 +480,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -505,18 +493,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_ListTasksRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.ListTasksRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta3.ListTasksRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.ListTasksRequest build() {
       com.google.cloud.tasks.v2beta3.ListTasksRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -525,7 +510,6 @@ public com.google.cloud.tasks.v2beta3.ListTasksRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.ListTasksRequest buildPartial() {
       com.google.cloud.tasks.v2beta3.ListTasksRequest result = new com.google.cloud.tasks.v2beta3.ListTasksRequest(this);
       result.parent_ = parent_;
@@ -536,39 +520,32 @@ public com.google.cloud.tasks.v2beta3.ListTasksRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta3.ListTasksRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta3.ListTasksRequest)other);
@@ -599,12 +576,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta3.ListTasksRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -780,7 +755,6 @@ public Builder setResponseViewValue(int value) {
      * .google.cloud.tasks.v2beta3.Task.View response_view = 2;
      */
     public com.google.cloud.tasks.v2beta3.Task.View getResponseView() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.tasks.v2beta3.Task.View result = com.google.cloud.tasks.v2beta3.Task.View.valueOf(responseView_);
       return result == null ? com.google.cloud.tasks.v2beta3.Task.View.UNRECOGNIZED : result;
     }
@@ -1003,13 +977,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1031,12 +1003,11 @@ public static com.google.cloud.tasks.v2beta3.ListTasksRequest getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListTasksRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTasksRequest(input, extensionRegistry);
+        return new ListTasksRequest(input, extensionRegistry);
     }
   };
 
@@ -1049,7 +1020,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta3.ListTasksRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/ListTasksResponse.java b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/ListTasksResponse.java
index e75a07374cf3..080d1b412d61 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/ListTasksResponse.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/ListTasksResponse.java
@@ -34,9 +34,6 @@ private ListTasksResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListTasksResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               tasks_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListTasksResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListTasksResponse(
     return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_ListTasksResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_ListTasksResponse_fieldAccessorTable
@@ -205,7 +201,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -215,7 +210,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < tasks_.size(); i++) {
@@ -227,7 +221,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -352,7 +345,6 @@ public static com.google.cloud.tasks.v2beta3.ListTasksResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -360,7 +352,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta3.ListTasksResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -388,7 +379,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_ListTasksResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_ListTasksResponse_fieldAccessorTable
@@ -412,7 +402,6 @@ private void maybeForceBuilderInitialization() {
         getTasksFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (tasksBuilder_ == null) {
@@ -426,18 +415,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_ListTasksResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.ListTasksResponse getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta3.ListTasksResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.ListTasksResponse build() {
       com.google.cloud.tasks.v2beta3.ListTasksResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -446,7 +432,6 @@ public com.google.cloud.tasks.v2beta3.ListTasksResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.ListTasksResponse buildPartial() {
       com.google.cloud.tasks.v2beta3.ListTasksResponse result = new com.google.cloud.tasks.v2beta3.ListTasksResponse(this);
       int from_bitField0_ = bitField0_;
@@ -466,39 +451,32 @@ public com.google.cloud.tasks.v2beta3.ListTasksResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta3.ListTasksResponse) {
         return mergeFrom((com.google.cloud.tasks.v2beta3.ListTasksResponse)other);
@@ -545,12 +523,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta3.ListTasksResponse other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -990,13 +966,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1018,12 +992,11 @@ public static com.google.cloud.tasks.v2beta3.ListTasksResponse getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListTasksResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTasksResponse(input, extensionRegistry);
+        return new ListTasksResponse(input, extensionRegistry);
     }
   };
 
@@ -1036,7 +1009,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta3.ListTasksResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/PauseQueueRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/PauseQueueRequest.java
index 5dede5436d66..849fb6ccd382 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/PauseQueueRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/PauseQueueRequest.java
@@ -33,9 +33,6 @@ private PauseQueueRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private PauseQueueRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private PauseQueueRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private PauseQueueRequest(
     return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_PauseQueueRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_PauseQueueRequest_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.tasks.v2beta3.PauseQueueRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta3.PauseQueueRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_PauseQueueRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_PauseQueueRequest_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_PauseQueueRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.PauseQueueRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta3.PauseQueueRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.PauseQueueRequest build() {
       com.google.cloud.tasks.v2beta3.PauseQueueRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.tasks.v2beta3.PauseQueueRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.PauseQueueRequest buildPartial() {
       com.google.cloud.tasks.v2beta3.PauseQueueRequest result = new com.google.cloud.tasks.v2beta3.PauseQueueRequest(this);
       result.name_ = name_;
@@ -361,39 +346,32 @@ public com.google.cloud.tasks.v2beta3.PauseQueueRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta3.PauseQueueRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta3.PauseQueueRequest)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta3.PauseQueueRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.tasks.v2beta3.PauseQueueRequest getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PauseQueueRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PauseQueueRequest(input, extensionRegistry);
+        return new PauseQueueRequest(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta3.PauseQueueRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/PurgeQueueRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/PurgeQueueRequest.java
index 16815a4d9385..e030450fb666 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/PurgeQueueRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/PurgeQueueRequest.java
@@ -33,9 +33,6 @@ private PurgeQueueRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private PurgeQueueRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private PurgeQueueRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private PurgeQueueRequest(
     return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_PurgeQueueRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_PurgeQueueRequest_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.tasks.v2beta3.PurgeQueueRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta3.PurgeQueueRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_PurgeQueueRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_PurgeQueueRequest_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_PurgeQueueRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.PurgeQueueRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta3.PurgeQueueRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.PurgeQueueRequest build() {
       com.google.cloud.tasks.v2beta3.PurgeQueueRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.tasks.v2beta3.PurgeQueueRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.PurgeQueueRequest buildPartial() {
       com.google.cloud.tasks.v2beta3.PurgeQueueRequest result = new com.google.cloud.tasks.v2beta3.PurgeQueueRequest(this);
       result.name_ = name_;
@@ -361,39 +346,32 @@ public com.google.cloud.tasks.v2beta3.PurgeQueueRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta3.PurgeQueueRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta3.PurgeQueueRequest)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta3.PurgeQueueRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.tasks.v2beta3.PurgeQueueRequest getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PurgeQueueRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PurgeQueueRequest(input, extensionRegistry);
+        return new PurgeQueueRequest(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta3.PurgeQueueRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/Queue.java b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/Queue.java
index abdc13e421e3..a569654ef001 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/Queue.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/Queue.java
@@ -36,9 +36,6 @@ private Queue(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private Queue(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -115,13 +119,6 @@ private Queue(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -139,7 +136,6 @@ private Queue(
     return com.google.cloud.tasks.v2beta3.QueueProto.internal_static_google_cloud_tasks_v2beta3_Queue_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta3.QueueProto.internal_static_google_cloud_tasks_v2beta3_Queue_fieldAccessorTable
@@ -631,7 +627,6 @@ public int getStateValue() {
    * .google.cloud.tasks.v2beta3.Queue.State state = 6;
    */
   public com.google.cloud.tasks.v2beta3.Queue.State getState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.tasks.v2beta3.Queue.State result = com.google.cloud.tasks.v2beta3.Queue.State.valueOf(state_);
     return result == null ? com.google.cloud.tasks.v2beta3.Queue.State.UNRECOGNIZED : result;
   }
@@ -688,7 +683,6 @@ public com.google.protobuf.TimestampOrBuilder getPurgeTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -698,7 +692,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -722,7 +715,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -906,7 +898,6 @@ public static com.google.cloud.tasks.v2beta3.Queue parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -914,7 +905,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta3.Queue prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -944,7 +934,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta3.QueueProto.internal_static_google_cloud_tasks_v2beta3_Queue_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta3.QueueProto.internal_static_google_cloud_tasks_v2beta3_Queue_fieldAccessorTable
@@ -967,7 +956,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -997,18 +985,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta3.QueueProto.internal_static_google_cloud_tasks_v2beta3_Queue_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.Queue getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta3.Queue.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.Queue build() {
       com.google.cloud.tasks.v2beta3.Queue result = buildPartial();
       if (!result.isInitialized()) {
@@ -1017,7 +1002,6 @@ public com.google.cloud.tasks.v2beta3.Queue build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.Queue buildPartial() {
       com.google.cloud.tasks.v2beta3.Queue result = new com.google.cloud.tasks.v2beta3.Queue(this);
       result.name_ = name_;
@@ -1049,39 +1033,32 @@ public com.google.cloud.tasks.v2beta3.Queue buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta3.Queue) {
         return mergeFrom((com.google.cloud.tasks.v2beta3.Queue)other);
@@ -1123,12 +1100,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta3.Queue other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2025,7 +2000,6 @@ public Builder setStateValue(int value) {
      * .google.cloud.tasks.v2beta3.Queue.State state = 6;
      */
     public com.google.cloud.tasks.v2beta3.Queue.State getState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.tasks.v2beta3.Queue.State result = com.google.cloud.tasks.v2beta3.Queue.State.valueOf(state_);
       return result == null ? com.google.cloud.tasks.v2beta3.Queue.State.UNRECOGNIZED : result;
     }
@@ -2275,13 +2249,11 @@ public com.google.protobuf.TimestampOrBuilder getPurgeTimeOrBuilder() {
       }
       return purgeTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2303,12 +2275,11 @@ public static com.google.cloud.tasks.v2beta3.Queue getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Queue parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Queue(input, extensionRegistry);
+        return new Queue(input, extensionRegistry);
     }
   };
 
@@ -2321,7 +2292,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta3.Queue getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/QueueProto.java b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/QueueProto.java
index b1ebf5de7d04..bb7c762fd6e8 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/QueueProto.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/QueueProto.java
@@ -47,7 +47,7 @@ public static void registerAllExtensions(
       "ne_http_queue\030\003 \001(\0132..google.cloud.tasks" +
       ".v2beta3.AppEngineHttpQueueH\000\022;\n\013rate_li" +
       "mits\030\004 \001(\0132&.google.cloud.tasks.v2beta3." +
-      "RateLimits\022=\n\014retry_config\030\005 \001(\0132\'.googl" +
+      "RateLimits\022=\n\014retry_config\030\005 \001(\0132\'.googl",
       "e.cloud.tasks.v2beta3.RetryConfig\0226\n\005sta" +
       "te\030\006 \001(\0162\'.google.cloud.tasks.v2beta3.Qu" +
       "eue.State\022.\n\npurge_time\030\007 \001(\0132\032.google.p" +
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "max_dispatches_per_second\030\001 \001(\001\022\026\n\016max_b" +
       "urst_size\030\002 \001(\005\022!\n\031max_concurrent_dispat" +
       "ches\030\003 \001(\005\"\321\001\n\013RetryConfig\022\024\n\014max_attemp" +
-      "ts\030\001 \001(\005\0225\n\022max_retry_duration\030\002 \001(\0132\031.g" +
+      "ts\030\001 \001(\005\0225\n\022max_retry_duration\030\002 \001(\0132\031.g",
       "oogle.protobuf.Duration\022.\n\013min_backoff\030\003" +
       " \001(\0132\031.google.protobuf.Duration\022.\n\013max_b" +
       "ackoff\030\004 \001(\0132\031.google.protobuf.Duration\022" +
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/RateLimits.java b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/RateLimits.java
index 1ae321c3724c..fc030684a827 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/RateLimits.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/RateLimits.java
@@ -39,9 +39,6 @@ private RateLimits(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private RateLimits(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 9: {
 
             maxDispatchesPerSecond_ = input.readDouble();
@@ -68,13 +72,6 @@ private RateLimits(
             maxConcurrentDispatches_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -92,7 +89,6 @@ private RateLimits(
     return com.google.cloud.tasks.v2beta3.QueueProto.internal_static_google_cloud_tasks_v2beta3_RateLimits_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta3.QueueProto.internal_static_google_cloud_tasks_v2beta3_RateLimits_fieldAccessorTable
@@ -181,7 +177,6 @@ public int getMaxConcurrentDispatches() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -191,7 +186,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (maxDispatchesPerSecond_ != 0D) {
@@ -206,7 +200,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -341,7 +334,6 @@ public static com.google.cloud.tasks.v2beta3.RateLimits parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -349,7 +341,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta3.RateLimits prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -381,7 +372,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta3.QueueProto.internal_static_google_cloud_tasks_v2beta3_RateLimits_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta3.QueueProto.internal_static_google_cloud_tasks_v2beta3_RateLimits_fieldAccessorTable
@@ -404,7 +394,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       maxDispatchesPerSecond_ = 0D;
@@ -416,18 +405,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta3.QueueProto.internal_static_google_cloud_tasks_v2beta3_RateLimits_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.RateLimits getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta3.RateLimits.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.RateLimits build() {
       com.google.cloud.tasks.v2beta3.RateLimits result = buildPartial();
       if (!result.isInitialized()) {
@@ -436,7 +422,6 @@ public com.google.cloud.tasks.v2beta3.RateLimits build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.RateLimits buildPartial() {
       com.google.cloud.tasks.v2beta3.RateLimits result = new com.google.cloud.tasks.v2beta3.RateLimits(this);
       result.maxDispatchesPerSecond_ = maxDispatchesPerSecond_;
@@ -446,39 +431,32 @@ public com.google.cloud.tasks.v2beta3.RateLimits buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta3.RateLimits) {
         return mergeFrom((com.google.cloud.tasks.v2beta3.RateLimits)other);
@@ -504,12 +482,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta3.RateLimits other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -764,13 +740,11 @@ public Builder clearMaxConcurrentDispatches() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -792,12 +766,11 @@ public static com.google.cloud.tasks.v2beta3.RateLimits getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RateLimits parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RateLimits(input, extensionRegistry);
+        return new RateLimits(input, extensionRegistry);
     }
   };
 
@@ -810,7 +783,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta3.RateLimits getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/ResumeQueueRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/ResumeQueueRequest.java
index dca2033d8d0f..1748548fcaa1 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/ResumeQueueRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/ResumeQueueRequest.java
@@ -33,9 +33,6 @@ private ResumeQueueRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private ResumeQueueRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private ResumeQueueRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private ResumeQueueRequest(
     return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_ResumeQueueRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_ResumeQueueRequest_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.tasks.v2beta3.ResumeQueueRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta3.ResumeQueueRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_ResumeQueueRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_ResumeQueueRequest_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_ResumeQueueRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.ResumeQueueRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta3.ResumeQueueRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.ResumeQueueRequest build() {
       com.google.cloud.tasks.v2beta3.ResumeQueueRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.tasks.v2beta3.ResumeQueueRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.ResumeQueueRequest buildPartial() {
       com.google.cloud.tasks.v2beta3.ResumeQueueRequest result = new com.google.cloud.tasks.v2beta3.ResumeQueueRequest(this);
       result.name_ = name_;
@@ -361,39 +346,32 @@ public com.google.cloud.tasks.v2beta3.ResumeQueueRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta3.ResumeQueueRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta3.ResumeQueueRequest)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta3.ResumeQueueRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.tasks.v2beta3.ResumeQueueRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ResumeQueueRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ResumeQueueRequest(input, extensionRegistry);
+        return new ResumeQueueRequest(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta3.ResumeQueueRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/RetryConfig.java b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/RetryConfig.java
index 92f80c1803c1..4ddea1f18e22 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/RetryConfig.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/RetryConfig.java
@@ -35,9 +35,6 @@ private RetryConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private RetryConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
 
             maxAttempts_ = input.readInt32();
@@ -98,13 +102,6 @@ private RetryConfig(
             maxDoublings_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -122,7 +119,6 @@ private RetryConfig(
     return com.google.cloud.tasks.v2beta3.QueueProto.internal_static_google_cloud_tasks_v2beta3_RetryConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta3.QueueProto.internal_static_google_cloud_tasks_v2beta3_RetryConfig_fieldAccessorTable
@@ -370,7 +366,6 @@ public int getMaxDoublings() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -380,7 +375,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (maxAttempts_ != 0) {
@@ -401,7 +395,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -564,7 +557,6 @@ public static com.google.cloud.tasks.v2beta3.RetryConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -572,7 +564,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta3.RetryConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -601,7 +592,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta3.QueueProto.internal_static_google_cloud_tasks_v2beta3_RetryConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta3.QueueProto.internal_static_google_cloud_tasks_v2beta3_RetryConfig_fieldAccessorTable
@@ -624,7 +614,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       maxAttempts_ = 0;
@@ -652,18 +641,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta3.QueueProto.internal_static_google_cloud_tasks_v2beta3_RetryConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.RetryConfig getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta3.RetryConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.RetryConfig build() {
       com.google.cloud.tasks.v2beta3.RetryConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -672,7 +658,6 @@ public com.google.cloud.tasks.v2beta3.RetryConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.RetryConfig buildPartial() {
       com.google.cloud.tasks.v2beta3.RetryConfig result = new com.google.cloud.tasks.v2beta3.RetryConfig(this);
       result.maxAttempts_ = maxAttempts_;
@@ -696,39 +681,32 @@ public com.google.cloud.tasks.v2beta3.RetryConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta3.RetryConfig) {
         return mergeFrom((com.google.cloud.tasks.v2beta3.RetryConfig)other);
@@ -760,12 +738,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta3.RetryConfig other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1660,13 +1636,11 @@ public Builder clearMaxDoublings() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1688,12 +1662,11 @@ public static com.google.cloud.tasks.v2beta3.RetryConfig getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RetryConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RetryConfig(input, extensionRegistry);
+        return new RetryConfig(input, extensionRegistry);
     }
   };
 
@@ -1706,7 +1679,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta3.RetryConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/RunTaskRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/RunTaskRequest.java
index 5e443befc519..395f0cb9a484 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/RunTaskRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/RunTaskRequest.java
@@ -35,9 +35,6 @@ private RunTaskRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private RunTaskRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -61,13 +65,6 @@ private RunTaskRequest(
             responseView_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -85,7 +82,6 @@ private RunTaskRequest(
     return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_RunTaskRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_RunTaskRequest_fieldAccessorTable
@@ -177,13 +173,11 @@ public int getResponseViewValue() {
    * .google.cloud.tasks.v2beta3.Task.View response_view = 2;
    */
   public com.google.cloud.tasks.v2beta3.Task.View getResponseView() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.tasks.v2beta3.Task.View result = com.google.cloud.tasks.v2beta3.Task.View.valueOf(responseView_);
     return result == null ? com.google.cloud.tasks.v2beta3.Task.View.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -193,7 +187,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -205,7 +198,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -327,7 +319,6 @@ public static com.google.cloud.tasks.v2beta3.RunTaskRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -335,7 +326,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta3.RunTaskRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -364,7 +354,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_RunTaskRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_RunTaskRequest_fieldAccessorTable
@@ -387,7 +376,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -397,18 +385,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_RunTaskRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.RunTaskRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta3.RunTaskRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.RunTaskRequest build() {
       com.google.cloud.tasks.v2beta3.RunTaskRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -417,7 +402,6 @@ public com.google.cloud.tasks.v2beta3.RunTaskRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.RunTaskRequest buildPartial() {
       com.google.cloud.tasks.v2beta3.RunTaskRequest result = new com.google.cloud.tasks.v2beta3.RunTaskRequest(this);
       result.name_ = name_;
@@ -426,39 +410,32 @@ public com.google.cloud.tasks.v2beta3.RunTaskRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta3.RunTaskRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta3.RunTaskRequest)other);
@@ -482,12 +459,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta3.RunTaskRequest other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -663,7 +638,6 @@ public Builder setResponseViewValue(int value) {
      * .google.cloud.tasks.v2beta3.Task.View response_view = 2;
      */
     public com.google.cloud.tasks.v2beta3.Task.View getResponseView() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.tasks.v2beta3.Task.View result = com.google.cloud.tasks.v2beta3.Task.View.valueOf(responseView_);
       return result == null ? com.google.cloud.tasks.v2beta3.Task.View.UNRECOGNIZED : result;
     }
@@ -714,13 +688,11 @@ public Builder clearResponseView() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -742,12 +714,11 @@ public static com.google.cloud.tasks.v2beta3.RunTaskRequest getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RunTaskRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RunTaskRequest(input, extensionRegistry);
+        return new RunTaskRequest(input, extensionRegistry);
     }
   };
 
@@ -760,7 +731,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta3.RunTaskRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/TargetProto.java b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/TargetProto.java
index 0bde28207369..bfaf19c95cd1 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/TargetProto.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/TargetProto.java
@@ -52,7 +52,7 @@ public static void registerAllExtensions(
       "thod\030\001 \001(\0162&.google.cloud.tasks.v2beta3." +
       "HttpMethod\022H\n\022app_engine_routing\030\002 \001(\0132," +
       ".google.cloud.tasks.v2beta3.AppEngineRou" +
-      "ting\022\024\n\014relative_uri\030\003 \001(\t\022N\n\007headers\030\004 " +
+      "ting\022\024\n\014relative_uri\030\003 \001(\t\022N\n\007headers\030\004 ",
       "\003(\0132=.google.cloud.tasks.v2beta3.AppEngi" +
       "neHttpRequest.HeadersEntry\022\014\n\004body\030\005 \001(\014" +
       "\032.\n\014HeadersEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002" +
@@ -62,7 +62,7 @@ public static void registerAllExtensions(
       "HOD_UNSPECIFIED\020\000\022\010\n\004POST\020\001\022\007\n\003GET\020\002\022\010\n\004" +
       "HEAD\020\003\022\007\n\003PUT\020\004\022\n\n\006DELETE\020\005Bp\n\036com.googl" +
       "e.cloud.tasks.v2beta3B\013TargetProtoP\001Z?go" +
-      "ogle.golang.org/genproto/googleapis/clou" +
+      "ogle.golang.org/genproto/googleapis/clou",
       "d/tasks/v2beta3;tasksb\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/Task.java b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/Task.java
index 4de1b614f924..85ec793610a3 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/Task.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/Task.java
@@ -36,9 +36,6 @@ private Task(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private Task(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -138,13 +142,6 @@ private Task(
             view_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -162,7 +159,6 @@ private Task(
     return com.google.cloud.tasks.v2beta3.TaskProto.internal_static_google_cloud_tasks_v2beta3_Task_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta3.TaskProto.internal_static_google_cloud_tasks_v2beta3_Task_fieldAccessorTable
@@ -683,13 +679,11 @@ public int getViewValue() {
    * .google.cloud.tasks.v2beta3.Task.View view = 10;
    */
   public com.google.cloud.tasks.v2beta3.Task.View getView() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.tasks.v2beta3.Task.View result = com.google.cloud.tasks.v2beta3.Task.View.valueOf(view_);
     return result == null ? com.google.cloud.tasks.v2beta3.Task.View.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -699,7 +693,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -732,7 +725,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -945,7 +937,6 @@ public static com.google.cloud.tasks.v2beta3.Task parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -953,7 +944,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta3.Task prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -981,7 +971,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta3.TaskProto.internal_static_google_cloud_tasks_v2beta3_Task_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta3.TaskProto.internal_static_google_cloud_tasks_v2beta3_Task_fieldAccessorTable
@@ -1004,7 +993,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -1044,18 +1032,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta3.TaskProto.internal_static_google_cloud_tasks_v2beta3_Task_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.Task getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta3.Task.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.Task build() {
       com.google.cloud.tasks.v2beta3.Task result = buildPartial();
       if (!result.isInitialized()) {
@@ -1064,7 +1049,6 @@ public com.google.cloud.tasks.v2beta3.Task build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.Task buildPartial() {
       com.google.cloud.tasks.v2beta3.Task result = new com.google.cloud.tasks.v2beta3.Task(this);
       result.name_ = name_;
@@ -1103,39 +1087,32 @@ public com.google.cloud.tasks.v2beta3.Task buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta3.Task) {
         return mergeFrom((com.google.cloud.tasks.v2beta3.Task)other);
@@ -1186,12 +1163,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta3.Task other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2370,7 +2345,6 @@ public Builder setViewValue(int value) {
      * .google.cloud.tasks.v2beta3.Task.View view = 10;
      */
     public com.google.cloud.tasks.v2beta3.Task.View getView() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.tasks.v2beta3.Task.View result = com.google.cloud.tasks.v2beta3.Task.View.valueOf(view_);
       return result == null ? com.google.cloud.tasks.v2beta3.Task.View.UNRECOGNIZED : result;
     }
@@ -2405,13 +2379,11 @@ public Builder clearView() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2433,12 +2405,11 @@ public static com.google.cloud.tasks.v2beta3.Task getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Task parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Task(input, extensionRegistry);
+        return new Task(input, extensionRegistry);
     }
   };
 
@@ -2451,7 +2422,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta3.Task getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/TaskProto.java b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/TaskProto.java
index 0fd9aa9bd910..47b9520dcfcc 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/TaskProto.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/TaskProto.java
@@ -42,7 +42,7 @@ public static void registerAllExtensions(
       "equest\030\003 \001(\01320.google.cloud.tasks.v2beta" +
       "3.AppEngineHttpRequestH\000\0221\n\rschedule_tim" +
       "e\030\004 \001(\0132\032.google.protobuf.Timestamp\022/\n\013c" +
-      "reate_time\030\005 \001(\0132\032.google.protobuf.Times" +
+      "reate_time\030\005 \001(\0132\032.google.protobuf.Times",
       "tamp\022\026\n\016dispatch_count\030\006 \001(\005\022\026\n\016response" +
       "_count\030\007 \001(\005\022:\n\rfirst_attempt\030\010 \001(\0132#.go" +
       "ogle.cloud.tasks.v2beta3.Attempt\0229\n\014last" +
@@ -52,7 +52,7 @@ public static void registerAllExtensions(
       "_UNSPECIFIED\020\000\022\t\n\005BASIC\020\001\022\010\n\004FULL\020\002B\016\n\014p" +
       "ayload_type\"\317\001\n\007Attempt\0221\n\rschedule_time" +
       "\030\001 \001(\0132\032.google.protobuf.Timestamp\0221\n\rdi" +
-      "spatch_time\030\002 \001(\0132\032.google.protobuf.Time" +
+      "spatch_time\030\002 \001(\0132\032.google.protobuf.Time",
       "stamp\0221\n\rresponse_time\030\003 \001(\0132\032.google.pr" +
       "otobuf.Timestamp\022+\n\017response_status\030\004 \001(" +
       "\0132\022.google.rpc.StatusBn\n\036com.google.clou" +
diff --git a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/UpdateQueueRequest.java b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/UpdateQueueRequest.java
index b9f4f1c2e000..6ec85db32218 100644
--- a/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/UpdateQueueRequest.java
+++ b/google-api-grpc/proto-google-cloud-tasks-v2beta3/src/main/java/com/google/cloud/tasks/v2beta3/UpdateQueueRequest.java
@@ -32,9 +32,6 @@ private UpdateQueueRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private UpdateQueueRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.tasks.v2beta3.Queue.Builder subBuilder = null;
             if (queue_ != null) {
@@ -72,13 +76,6 @@ private UpdateQueueRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private UpdateQueueRequest(
     return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_UpdateQueueRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_UpdateQueueRequest_fieldAccessorTable
@@ -189,7 +185,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -199,7 +194,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (queue_ != null) {
@@ -211,7 +205,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -345,7 +338,6 @@ public static com.google.cloud.tasks.v2beta3.UpdateQueueRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -353,7 +345,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.tasks.v2beta3.UpdateQueueRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -381,7 +372,6 @@ public static final class Builder extends
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_UpdateQueueRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_UpdateQueueRequest_fieldAccessorTable
@@ -404,7 +394,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (queueBuilder_ == null) {
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.tasks.v2beta3.CloudTasksProto.internal_static_google_cloud_tasks_v2beta3_UpdateQueueRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.UpdateQueueRequest getDefaultInstanceForType() {
       return com.google.cloud.tasks.v2beta3.UpdateQueueRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.UpdateQueueRequest build() {
       com.google.cloud.tasks.v2beta3.UpdateQueueRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public com.google.cloud.tasks.v2beta3.UpdateQueueRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.tasks.v2beta3.UpdateQueueRequest buildPartial() {
       com.google.cloud.tasks.v2beta3.UpdateQueueRequest result = new com.google.cloud.tasks.v2beta3.UpdateQueueRequest(this);
       if (queueBuilder_ == null) {
@@ -459,39 +444,32 @@ public com.google.cloud.tasks.v2beta3.UpdateQueueRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.tasks.v2beta3.UpdateQueueRequest) {
         return mergeFrom((com.google.cloud.tasks.v2beta3.UpdateQueueRequest)other);
@@ -514,12 +492,10 @@ public Builder mergeFrom(com.google.cloud.tasks.v2beta3.UpdateQueueRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -897,13 +873,11 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
       }
       return updateMaskBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -925,12 +899,11 @@ public static com.google.cloud.tasks.v2beta3.UpdateQueueRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateQueueRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateQueueRequest(input, extensionRegistry);
+        return new UpdateQueueRequest(input, extensionRegistry);
     }
   };
 
@@ -943,7 +916,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.tasks.v2beta3.UpdateQueueRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioConfig.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioConfig.java
index 9310b78c7b77..39f5f589a4ed 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioConfig.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/AudioConfig.java
@@ -37,9 +37,6 @@ private AudioConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private AudioConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -77,13 +81,6 @@ private AudioConfig(
             sampleRateHertz_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -101,7 +98,6 @@ private AudioConfig(
     return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_AudioConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_AudioConfig_fieldAccessorTable
@@ -129,7 +125,6 @@ public int getAudioEncodingValue() {
    * .google.cloud.texttospeech.v1.AudioEncoding audio_encoding = 1;
    */
   public com.google.cloud.texttospeech.v1.AudioEncoding getAudioEncoding() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.texttospeech.v1.AudioEncoding result = com.google.cloud.texttospeech.v1.AudioEncoding.valueOf(audioEncoding_);
     return result == null ? com.google.cloud.texttospeech.v1.AudioEncoding.UNRECOGNIZED : result;
   }
@@ -204,7 +199,6 @@ public int getSampleRateHertz() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -214,7 +208,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (audioEncoding_ != com.google.cloud.texttospeech.v1.AudioEncoding.AUDIO_ENCODING_UNSPECIFIED.getNumber()) {
@@ -235,7 +228,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -391,7 +383,6 @@ public static com.google.cloud.texttospeech.v1.AudioConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -399,7 +390,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.texttospeech.v1.AudioConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -427,7 +417,6 @@ public static final class Builder extends
       return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_AudioConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_AudioConfig_fieldAccessorTable
@@ -450,7 +439,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       audioEncoding_ = 0;
@@ -466,18 +454,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_AudioConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1.AudioConfig getDefaultInstanceForType() {
       return com.google.cloud.texttospeech.v1.AudioConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1.AudioConfig build() {
       com.google.cloud.texttospeech.v1.AudioConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -486,7 +471,6 @@ public com.google.cloud.texttospeech.v1.AudioConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1.AudioConfig buildPartial() {
       com.google.cloud.texttospeech.v1.AudioConfig result = new com.google.cloud.texttospeech.v1.AudioConfig(this);
       result.audioEncoding_ = audioEncoding_;
@@ -498,39 +482,32 @@ public com.google.cloud.texttospeech.v1.AudioConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.texttospeech.v1.AudioConfig) {
         return mergeFrom((com.google.cloud.texttospeech.v1.AudioConfig)other);
@@ -562,12 +539,10 @@ public Builder mergeFrom(com.google.cloud.texttospeech.v1.AudioConfig other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -617,7 +592,6 @@ public Builder setAudioEncodingValue(int value) {
      * .google.cloud.texttospeech.v1.AudioEncoding audio_encoding = 1;
      */
     public com.google.cloud.texttospeech.v1.AudioEncoding getAudioEncoding() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.texttospeech.v1.AudioEncoding result = com.google.cloud.texttospeech.v1.AudioEncoding.valueOf(audioEncoding_);
       return result == null ? com.google.cloud.texttospeech.v1.AudioEncoding.UNRECOGNIZED : result;
     }
@@ -853,13 +827,11 @@ public Builder clearSampleRateHertz() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -881,12 +853,11 @@ public static com.google.cloud.texttospeech.v1.AudioConfig getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AudioConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AudioConfig(input, extensionRegistry);
+        return new AudioConfig(input, extensionRegistry);
     }
   };
 
@@ -899,7 +870,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.texttospeech.v1.AudioConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesRequest.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesRequest.java
index 537a4b78a94c..1a75939a17b2 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesRequest.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesRequest.java
@@ -33,9 +33,6 @@ private ListVoicesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private ListVoicesRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            languageCode_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private ListVoicesRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            languageCode_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private ListVoicesRequest(
     return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_ListVoicesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_ListVoicesRequest_fieldAccessorTable
@@ -142,7 +138,6 @@ public java.lang.String getLanguageCode() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -152,7 +147,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getLanguageCodeBytes().isEmpty()) {
@@ -161,7 +155,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -276,7 +269,6 @@ public static com.google.cloud.texttospeech.v1.ListVoicesRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -284,7 +276,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.texttospeech.v1.ListVoicesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -312,7 +303,6 @@ public static final class Builder extends
       return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_ListVoicesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_ListVoicesRequest_fieldAccessorTable
@@ -335,7 +325,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       languageCode_ = "";
@@ -343,18 +332,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_ListVoicesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1.ListVoicesRequest getDefaultInstanceForType() {
       return com.google.cloud.texttospeech.v1.ListVoicesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1.ListVoicesRequest build() {
       com.google.cloud.texttospeech.v1.ListVoicesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -363,7 +349,6 @@ public com.google.cloud.texttospeech.v1.ListVoicesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1.ListVoicesRequest buildPartial() {
       com.google.cloud.texttospeech.v1.ListVoicesRequest result = new com.google.cloud.texttospeech.v1.ListVoicesRequest(this);
       result.languageCode_ = languageCode_;
@@ -371,39 +356,32 @@ public com.google.cloud.texttospeech.v1.ListVoicesRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.texttospeech.v1.ListVoicesRequest) {
         return mergeFrom((com.google.cloud.texttospeech.v1.ListVoicesRequest)other);
@@ -424,12 +402,10 @@ public Builder mergeFrom(com.google.cloud.texttospeech.v1.ListVoicesRequest othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -571,13 +547,11 @@ public Builder setLanguageCodeBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -599,12 +573,11 @@ public static com.google.cloud.texttospeech.v1.ListVoicesRequest getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListVoicesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListVoicesRequest(input, extensionRegistry);
+        return new ListVoicesRequest(input, extensionRegistry);
     }
   };
 
@@ -617,7 +590,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.texttospeech.v1.ListVoicesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesResponse.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesResponse.java
index 5c9bd7414eeb..8a3973592ee0 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesResponse.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/ListVoicesResponse.java
@@ -33,9 +33,6 @@ private ListVoicesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ListVoicesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               voices_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private ListVoicesResponse(
                 input.readMessage(com.google.cloud.texttospeech.v1.Voice.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private ListVoicesResponse(
     return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_ListVoicesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_ListVoicesResponse_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.cloud.texttospeech.v1.VoiceOrBuilder getVoicesOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < voices_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.texttospeech.v1.ListVoicesResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.texttospeech.v1.ListVoicesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_ListVoicesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_ListVoicesResponse_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getVoicesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (voicesBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_ListVoicesResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1.ListVoicesResponse getDefaultInstanceForType() {
       return com.google.cloud.texttospeech.v1.ListVoicesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1.ListVoicesResponse build() {
       com.google.cloud.texttospeech.v1.ListVoicesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.cloud.texttospeech.v1.ListVoicesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1.ListVoicesResponse buildPartial() {
       com.google.cloud.texttospeech.v1.ListVoicesResponse result = new com.google.cloud.texttospeech.v1.ListVoicesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.cloud.texttospeech.v1.ListVoicesResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.texttospeech.v1.ListVoicesResponse) {
         return mergeFrom((com.google.cloud.texttospeech.v1.ListVoicesResponse)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.cloud.texttospeech.v1.ListVoicesResponse oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.cloud.texttospeech.v1.Voice.Builder addVoicesBuilder(
       }
       return voicesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.cloud.texttospeech.v1.ListVoicesResponse getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListVoicesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListVoicesResponse(input, extensionRegistry);
+        return new ListVoicesResponse(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.texttospeech.v1.ListVoicesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesisInput.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesisInput.java
index 3b8a6890381d..10200a5411c8 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesisInput.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesisInput.java
@@ -35,9 +35,6 @@ private SynthesisInput(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private SynthesisInput(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             inputSourceCase_ = 1;
@@ -61,13 +65,6 @@ private SynthesisInput(
             inputSource_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -85,7 +82,6 @@ private SynthesisInput(
     return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_SynthesisInput_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_SynthesisInput_fieldAccessorTable
@@ -240,7 +236,6 @@ public java.lang.String getSsml() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -250,7 +245,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (inputSourceCase_ == 1) {
@@ -262,7 +256,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -403,7 +396,6 @@ public static com.google.cloud.texttospeech.v1.SynthesisInput parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -411,7 +403,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.texttospeech.v1.SynthesisInput prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -442,7 +433,6 @@ public static final class Builder extends
       return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_SynthesisInput_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_SynthesisInput_fieldAccessorTable
@@ -465,7 +455,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       inputSourceCase_ = 0;
@@ -473,18 +462,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_SynthesisInput_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1.SynthesisInput getDefaultInstanceForType() {
       return com.google.cloud.texttospeech.v1.SynthesisInput.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1.SynthesisInput build() {
       com.google.cloud.texttospeech.v1.SynthesisInput result = buildPartial();
       if (!result.isInitialized()) {
@@ -493,7 +479,6 @@ public com.google.cloud.texttospeech.v1.SynthesisInput build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1.SynthesisInput buildPartial() {
       com.google.cloud.texttospeech.v1.SynthesisInput result = new com.google.cloud.texttospeech.v1.SynthesisInput(this);
       if (inputSourceCase_ == 1) {
@@ -507,39 +492,32 @@ public com.google.cloud.texttospeech.v1.SynthesisInput buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.texttospeech.v1.SynthesisInput) {
         return mergeFrom((com.google.cloud.texttospeech.v1.SynthesisInput)other);
@@ -573,12 +551,10 @@ public Builder mergeFrom(com.google.cloud.texttospeech.v1.SynthesisInput other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -826,13 +802,11 @@ public Builder setSsmlBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -854,12 +828,11 @@ public static com.google.cloud.texttospeech.v1.SynthesisInput getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SynthesisInput parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SynthesisInput(input, extensionRegistry);
+        return new SynthesisInput(input, extensionRegistry);
     }
   };
 
@@ -872,7 +845,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.texttospeech.v1.SynthesisInput getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechRequest.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechRequest.java
index 6692e8a87b75..e00b67b862d1 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechRequest.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechRequest.java
@@ -32,9 +32,6 @@ private SynthesizeSpeechRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private SynthesizeSpeechRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.texttospeech.v1.SynthesisInput.Builder subBuilder = null;
             if (input_ != null) {
@@ -85,13 +89,6 @@ private SynthesizeSpeechRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -109,7 +106,6 @@ private SynthesizeSpeechRequest(
     return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_SynthesizeSpeechRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_SynthesizeSpeechRequest_fieldAccessorTable
@@ -217,7 +213,6 @@ public com.google.cloud.texttospeech.v1.AudioConfigOrBuilder getAudioConfigOrBui
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -227,7 +222,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (input_ != null) {
@@ -242,7 +236,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -389,7 +382,6 @@ public static com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest parseFrom
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -397,7 +389,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -425,7 +416,6 @@ public static final class Builder extends
       return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_SynthesizeSpeechRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_SynthesizeSpeechRequest_fieldAccessorTable
@@ -448,7 +438,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (inputBuilder_ == null) {
@@ -472,18 +461,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_SynthesizeSpeechRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest getDefaultInstanceForType() {
       return com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest build() {
       com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -492,7 +478,6 @@ public com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest buildPartial() {
       com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest result = new com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest(this);
       if (inputBuilder_ == null) {
@@ -514,39 +499,32 @@ public com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest) {
         return mergeFrom((com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest)other);
@@ -572,12 +550,10 @@ public Builder mergeFrom(com.google.cloud.texttospeech.v1.SynthesizeSpeechReques
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1054,13 +1030,11 @@ public com.google.cloud.texttospeech.v1.AudioConfigOrBuilder getAudioConfigOrBui
       }
       return audioConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1082,12 +1056,11 @@ public static com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest getDefaul
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SynthesizeSpeechRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SynthesizeSpeechRequest(input, extensionRegistry);
+        return new SynthesizeSpeechRequest(input, extensionRegistry);
     }
   };
 
@@ -1100,7 +1073,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.texttospeech.v1.SynthesizeSpeechRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechResponse.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechResponse.java
index f7241927bb40..c553352af295 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechResponse.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/SynthesizeSpeechResponse.java
@@ -33,9 +33,6 @@ private SynthesizeSpeechResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,11 +44,6 @@ private SynthesizeSpeechResponse(
           case 0:
             done = true;
             break;
-          case 10: {
-
-            audioContent_ = input.readBytes();
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -59,6 +51,11 @@ private SynthesizeSpeechResponse(
             }
             break;
           }
+          case 10: {
+
+            audioContent_ = input.readBytes();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -76,7 +73,6 @@ private SynthesizeSpeechResponse(
     return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_SynthesizeSpeechResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_SynthesizeSpeechResponse_fieldAccessorTable
@@ -101,7 +97,6 @@ public com.google.protobuf.ByteString getAudioContent() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -111,7 +106,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!audioContent_.isEmpty()) {
@@ -120,7 +114,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -236,7 +229,6 @@ public static com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -244,7 +236,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -272,7 +263,6 @@ public static final class Builder extends
       return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_SynthesizeSpeechResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_SynthesizeSpeechResponse_fieldAccessorTable
@@ -295,7 +285,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       audioContent_ = com.google.protobuf.ByteString.EMPTY;
@@ -303,18 +292,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_SynthesizeSpeechResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse getDefaultInstanceForType() {
       return com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse build() {
       com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -323,7 +309,6 @@ public com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse buildPartial() {
       com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse result = new com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse(this);
       result.audioContent_ = audioContent_;
@@ -331,39 +316,32 @@ public com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse) {
         return mergeFrom((com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse)other);
@@ -383,12 +361,10 @@ public Builder mergeFrom(com.google.cloud.texttospeech.v1.SynthesizeSpeechRespon
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -456,13 +432,11 @@ public Builder clearAudioContent() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -484,12 +458,11 @@ public static com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse getDefau
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SynthesizeSpeechResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SynthesizeSpeechResponse(input, extensionRegistry);
+        return new SynthesizeSpeechResponse(input, extensionRegistry);
     }
   };
 
@@ -502,7 +475,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.texttospeech.v1.SynthesizeSpeechResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechProto.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechProto.java
index b06155ef6cd8..23ebe8be4e2b 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechProto.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/TextToSpeechProto.java
@@ -72,7 +72,7 @@ public static void registerAllExtensions(
       "anguage_codes\030\001 \003(\t\022\014\n\004name\030\002 \001(\t\022B\n\013ssm" +
       "l_gender\030\003 \001(\0162-.google.cloud.texttospee" +
       "ch.v1.SsmlVoiceGender\022!\n\031natural_sample_" +
-      "rate_hertz\030\004 \001(\005\"\332\001\n\027SynthesizeSpeechReq" +
+      "rate_hertz\030\004 \001(\005\"\332\001\n\027SynthesizeSpeechReq",
       "uest\022;\n\005input\030\001 \001(\0132,.google.cloud.textt" +
       "ospeech.v1.SynthesisInput\022A\n\005voice\030\002 \001(\013" +
       "22.google.cloud.texttospeech.v1.VoiceSel" +
@@ -82,7 +82,7 @@ public static void registerAllExtensions(
       "\002 \001(\tH\000B\016\n\014input_source\"\177\n\024VoiceSelectio" +
       "nParams\022\025\n\rlanguage_code\030\001 \001(\t\022\014\n\004name\030\002" +
       " \001(\t\022B\n\013ssml_gender\030\003 \001(\0162-.google.cloud" +
-      ".texttospeech.v1.SsmlVoiceGender\"\253\001\n\013Aud" +
+      ".texttospeech.v1.SsmlVoiceGender\"\253\001\n\013Aud",
       "ioConfig\022C\n\016audio_encoding\030\001 \001(\0162+.googl" +
       "e.cloud.texttospeech.v1.AudioEncoding\022\025\n" +
       "\rspeaking_rate\030\002 \001(\001\022\r\n\005pitch\030\003 \001(\001\022\026\n\016v" +
@@ -92,7 +92,7 @@ public static void registerAllExtensions(
       "SSML_VOICE_GENDER_UNSPECIFIED\020\000\022\010\n\004MALE\020" +
       "\001\022\n\n\006FEMALE\020\002\022\013\n\007NEUTRAL\020\003*T\n\rAudioEncod" +
       "ing\022\036\n\032AUDIO_ENCODING_UNSPECIFIED\020\000\022\014\n\010L" +
-      "INEAR16\020\001\022\007\n\003MP3\020\002\022\014\n\010OGG_OPUS\020\0032\270\002\n\014Tex" +
+      "INEAR16\020\001\022\007\n\003MP3\020\002\022\014\n\010OGG_OPUS\020\0032\270\002\n\014Tex",
       "tToSpeech\022\203\001\n\nListVoices\022/.google.cloud." +
       "texttospeech.v1.ListVoicesRequest\0320.goog" +
       "le.cloud.texttospeech.v1.ListVoicesRespo" +
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "ospeech.v1.SynthesizeSpeechResponse\"\036\202\323\344" +
       "\223\002\030\"\023/v1/text:synthesize:\001*B\302\001\n com.goog" +
       "le.cloud.texttospeech.v1B\021TextToSpeechPr" +
-      "otoP\001ZHgoogle.golang.org/genproto/google" +
+      "otoP\001ZHgoogle.golang.org/genproto/google",
       "apis/cloud/texttospeech/v1;texttospeech\370" +
       "\001\001\252\002\034Google.Cloud.TextToSpeech.V1\312\002\034Goog" +
       "le\\Cloud\\TextToSpeech\\V1b\006proto3"
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/Voice.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/Voice.java
index db299ea0a7af..40d09f9fbc7c 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/Voice.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/Voice.java
@@ -36,9 +36,6 @@ private Voice(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private Voice(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -76,13 +80,6 @@ private Voice(
             naturalSampleRateHertz_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private Voice(
     return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_Voice_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_Voice_fieldAccessorTable
@@ -227,7 +223,6 @@ public int getSsmlGenderValue() {
    * .google.cloud.texttospeech.v1.SsmlVoiceGender ssml_gender = 3;
    */
   public com.google.cloud.texttospeech.v1.SsmlVoiceGender getSsmlGender() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.texttospeech.v1.SsmlVoiceGender result = com.google.cloud.texttospeech.v1.SsmlVoiceGender.valueOf(ssmlGender_);
     return result == null ? com.google.cloud.texttospeech.v1.SsmlVoiceGender.UNRECOGNIZED : result;
   }
@@ -246,7 +241,6 @@ public int getNaturalSampleRateHertz() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -256,7 +250,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < languageCodes_.size(); i++) {
@@ -274,7 +267,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -418,7 +410,6 @@ public static com.google.cloud.texttospeech.v1.Voice parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -426,7 +417,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.texttospeech.v1.Voice prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -454,7 +444,6 @@ public static final class Builder extends
       return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_Voice_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_Voice_fieldAccessorTable
@@ -477,7 +466,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       languageCodes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -491,18 +479,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_Voice_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1.Voice getDefaultInstanceForType() {
       return com.google.cloud.texttospeech.v1.Voice.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1.Voice build() {
       com.google.cloud.texttospeech.v1.Voice result = buildPartial();
       if (!result.isInitialized()) {
@@ -511,7 +496,6 @@ public com.google.cloud.texttospeech.v1.Voice build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1.Voice buildPartial() {
       com.google.cloud.texttospeech.v1.Voice result = new com.google.cloud.texttospeech.v1.Voice(this);
       int from_bitField0_ = bitField0_;
@@ -529,39 +513,32 @@ public com.google.cloud.texttospeech.v1.Voice buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.texttospeech.v1.Voice) {
         return mergeFrom((com.google.cloud.texttospeech.v1.Voice)other);
@@ -598,12 +575,10 @@ public Builder mergeFrom(com.google.cloud.texttospeech.v1.Voice other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -891,7 +866,6 @@ public Builder setSsmlGenderValue(int value) {
      * .google.cloud.texttospeech.v1.SsmlVoiceGender ssml_gender = 3;
      */
     public com.google.cloud.texttospeech.v1.SsmlVoiceGender getSsmlGender() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.texttospeech.v1.SsmlVoiceGender result = com.google.cloud.texttospeech.v1.SsmlVoiceGender.valueOf(ssmlGender_);
       return result == null ? com.google.cloud.texttospeech.v1.SsmlVoiceGender.UNRECOGNIZED : result;
     }
@@ -962,13 +936,11 @@ public Builder clearNaturalSampleRateHertz() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -990,12 +962,11 @@ public static com.google.cloud.texttospeech.v1.Voice getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Voice parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Voice(input, extensionRegistry);
+        return new Voice(input, extensionRegistry);
     }
   };
 
@@ -1008,7 +979,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.texttospeech.v1.Voice getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/VoiceSelectionParams.java b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/VoiceSelectionParams.java
index 324afc398886..94e5efda6535 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/VoiceSelectionParams.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1/src/main/java/com/google/cloud/texttospeech/v1/VoiceSelectionParams.java
@@ -35,9 +35,6 @@ private VoiceSelectionParams(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private VoiceSelectionParams(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -67,13 +71,6 @@ private VoiceSelectionParams(
             ssmlGender_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private VoiceSelectionParams(
     return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_VoiceSelectionParams_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_VoiceSelectionParams_fieldAccessorTable
@@ -233,13 +229,11 @@ public int getSsmlGenderValue() {
    * .google.cloud.texttospeech.v1.SsmlVoiceGender ssml_gender = 3;
    */
   public com.google.cloud.texttospeech.v1.SsmlVoiceGender getSsmlGender() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.texttospeech.v1.SsmlVoiceGender result = com.google.cloud.texttospeech.v1.SsmlVoiceGender.valueOf(ssmlGender_);
     return result == null ? com.google.cloud.texttospeech.v1.SsmlVoiceGender.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -249,7 +243,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getLanguageCodeBytes().isEmpty()) {
@@ -264,7 +257,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -393,7 +385,6 @@ public static com.google.cloud.texttospeech.v1.VoiceSelectionParams parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -401,7 +392,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.texttospeech.v1.VoiceSelectionParams prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -429,7 +419,6 @@ public static final class Builder extends
       return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_VoiceSelectionParams_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_VoiceSelectionParams_fieldAccessorTable
@@ -452,7 +441,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       languageCode_ = "";
@@ -464,18 +452,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.texttospeech.v1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1_VoiceSelectionParams_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1.VoiceSelectionParams getDefaultInstanceForType() {
       return com.google.cloud.texttospeech.v1.VoiceSelectionParams.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1.VoiceSelectionParams build() {
       com.google.cloud.texttospeech.v1.VoiceSelectionParams result = buildPartial();
       if (!result.isInitialized()) {
@@ -484,7 +469,6 @@ public com.google.cloud.texttospeech.v1.VoiceSelectionParams build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1.VoiceSelectionParams buildPartial() {
       com.google.cloud.texttospeech.v1.VoiceSelectionParams result = new com.google.cloud.texttospeech.v1.VoiceSelectionParams(this);
       result.languageCode_ = languageCode_;
@@ -494,39 +478,32 @@ public com.google.cloud.texttospeech.v1.VoiceSelectionParams buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.texttospeech.v1.VoiceSelectionParams) {
         return mergeFrom((com.google.cloud.texttospeech.v1.VoiceSelectionParams)other);
@@ -554,12 +531,10 @@ public Builder mergeFrom(com.google.cloud.texttospeech.v1.VoiceSelectionParams o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -854,7 +829,6 @@ public Builder setSsmlGenderValue(int value) {
      * .google.cloud.texttospeech.v1.SsmlVoiceGender ssml_gender = 3;
      */
     public com.google.cloud.texttospeech.v1.SsmlVoiceGender getSsmlGender() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.texttospeech.v1.SsmlVoiceGender result = com.google.cloud.texttospeech.v1.SsmlVoiceGender.valueOf(ssmlGender_);
       return result == null ? com.google.cloud.texttospeech.v1.SsmlVoiceGender.UNRECOGNIZED : result;
     }
@@ -895,13 +869,11 @@ public Builder clearSsmlGender() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -923,12 +895,11 @@ public static com.google.cloud.texttospeech.v1.VoiceSelectionParams getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public VoiceSelectionParams parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VoiceSelectionParams(input, extensionRegistry);
+        return new VoiceSelectionParams(input, extensionRegistry);
     }
   };
 
@@ -941,7 +912,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.texttospeech.v1.VoiceSelectionParams getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/AudioConfig.java b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/AudioConfig.java
index 4b5f0179da40..888d7a91715b 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/AudioConfig.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/AudioConfig.java
@@ -38,9 +38,6 @@ private AudioConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private AudioConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -87,13 +91,6 @@ private AudioConfig(
             effectsProfileId_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -114,7 +111,6 @@ private AudioConfig(
     return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_AudioConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_AudioConfig_fieldAccessorTable
@@ -143,7 +139,6 @@ public int getAudioEncodingValue() {
    * .google.cloud.texttospeech.v1beta1.AudioEncoding audio_encoding = 1;
    */
   public com.google.cloud.texttospeech.v1beta1.AudioEncoding getAudioEncoding() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.texttospeech.v1beta1.AudioEncoding result = com.google.cloud.texttospeech.v1beta1.AudioEncoding.valueOf(audioEncoding_);
     return result == null ? com.google.cloud.texttospeech.v1beta1.AudioEncoding.UNRECOGNIZED : result;
   }
@@ -271,7 +266,6 @@ public java.lang.String getEffectsProfileId(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -281,7 +275,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (audioEncoding_ != com.google.cloud.texttospeech.v1beta1.AudioEncoding.AUDIO_ENCODING_UNSPECIFIED.getNumber()) {
@@ -305,7 +298,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -475,7 +467,6 @@ public static com.google.cloud.texttospeech.v1beta1.AudioConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -483,7 +474,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.texttospeech.v1beta1.AudioConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -511,7 +501,6 @@ public static final class Builder extends
       return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_AudioConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_AudioConfig_fieldAccessorTable
@@ -534,7 +523,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       audioEncoding_ = 0;
@@ -552,18 +540,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_AudioConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1beta1.AudioConfig getDefaultInstanceForType() {
       return com.google.cloud.texttospeech.v1beta1.AudioConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1beta1.AudioConfig build() {
       com.google.cloud.texttospeech.v1beta1.AudioConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -572,7 +557,6 @@ public com.google.cloud.texttospeech.v1beta1.AudioConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1beta1.AudioConfig buildPartial() {
       com.google.cloud.texttospeech.v1beta1.AudioConfig result = new com.google.cloud.texttospeech.v1beta1.AudioConfig(this);
       int from_bitField0_ = bitField0_;
@@ -592,39 +576,32 @@ public com.google.cloud.texttospeech.v1beta1.AudioConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.texttospeech.v1beta1.AudioConfig) {
         return mergeFrom((com.google.cloud.texttospeech.v1beta1.AudioConfig)other);
@@ -666,12 +643,10 @@ public Builder mergeFrom(com.google.cloud.texttospeech.v1beta1.AudioConfig other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -722,7 +697,6 @@ public Builder setAudioEncodingValue(int value) {
      * .google.cloud.texttospeech.v1beta1.AudioEncoding audio_encoding = 1;
      */
     public com.google.cloud.texttospeech.v1beta1.AudioEncoding getAudioEncoding() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.texttospeech.v1beta1.AudioEncoding result = com.google.cloud.texttospeech.v1beta1.AudioEncoding.valueOf(audioEncoding_);
       return result == null ? com.google.cloud.texttospeech.v1beta1.AudioEncoding.UNRECOGNIZED : result;
     }
@@ -1106,13 +1080,11 @@ public Builder addEffectsProfileIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1134,12 +1106,11 @@ public static com.google.cloud.texttospeech.v1beta1.AudioConfig getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AudioConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AudioConfig(input, extensionRegistry);
+        return new AudioConfig(input, extensionRegistry);
     }
   };
 
@@ -1152,7 +1123,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.texttospeech.v1beta1.AudioConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesRequest.java b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesRequest.java
index e3cd651e4973..f4ec95410551 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesRequest.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesRequest.java
@@ -33,9 +33,6 @@ private ListVoicesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private ListVoicesRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            languageCode_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private ListVoicesRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            languageCode_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private ListVoicesRequest(
     return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_ListVoicesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_ListVoicesRequest_fieldAccessorTable
@@ -142,7 +138,6 @@ public java.lang.String getLanguageCode() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -152,7 +147,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getLanguageCodeBytes().isEmpty()) {
@@ -161,7 +155,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -276,7 +269,6 @@ public static com.google.cloud.texttospeech.v1beta1.ListVoicesRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -284,7 +276,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.texttospeech.v1beta1.ListVoicesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -312,7 +303,6 @@ public static final class Builder extends
       return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_ListVoicesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_ListVoicesRequest_fieldAccessorTable
@@ -335,7 +325,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       languageCode_ = "";
@@ -343,18 +332,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_ListVoicesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1beta1.ListVoicesRequest getDefaultInstanceForType() {
       return com.google.cloud.texttospeech.v1beta1.ListVoicesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1beta1.ListVoicesRequest build() {
       com.google.cloud.texttospeech.v1beta1.ListVoicesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -363,7 +349,6 @@ public com.google.cloud.texttospeech.v1beta1.ListVoicesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1beta1.ListVoicesRequest buildPartial() {
       com.google.cloud.texttospeech.v1beta1.ListVoicesRequest result = new com.google.cloud.texttospeech.v1beta1.ListVoicesRequest(this);
       result.languageCode_ = languageCode_;
@@ -371,39 +356,32 @@ public com.google.cloud.texttospeech.v1beta1.ListVoicesRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.texttospeech.v1beta1.ListVoicesRequest) {
         return mergeFrom((com.google.cloud.texttospeech.v1beta1.ListVoicesRequest)other);
@@ -424,12 +402,10 @@ public Builder mergeFrom(com.google.cloud.texttospeech.v1beta1.ListVoicesRequest
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -571,13 +547,11 @@ public Builder setLanguageCodeBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -599,12 +573,11 @@ public static com.google.cloud.texttospeech.v1beta1.ListVoicesRequest getDefault
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListVoicesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListVoicesRequest(input, extensionRegistry);
+        return new ListVoicesRequest(input, extensionRegistry);
     }
   };
 
@@ -617,7 +590,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.texttospeech.v1beta1.ListVoicesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesResponse.java b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesResponse.java
index a61723e81866..b93c97ad1fb5 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesResponse.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/ListVoicesResponse.java
@@ -33,9 +33,6 @@ private ListVoicesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ListVoicesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               voices_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private ListVoicesResponse(
                 input.readMessage(com.google.cloud.texttospeech.v1beta1.Voice.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private ListVoicesResponse(
     return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_ListVoicesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_ListVoicesResponse_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.cloud.texttospeech.v1beta1.VoiceOrBuilder getVoicesOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < voices_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.texttospeech.v1beta1.ListVoicesResponse parseFrom
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.texttospeech.v1beta1.ListVoicesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_ListVoicesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_ListVoicesResponse_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getVoicesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (voicesBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_ListVoicesResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1beta1.ListVoicesResponse getDefaultInstanceForType() {
       return com.google.cloud.texttospeech.v1beta1.ListVoicesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1beta1.ListVoicesResponse build() {
       com.google.cloud.texttospeech.v1beta1.ListVoicesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.cloud.texttospeech.v1beta1.ListVoicesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1beta1.ListVoicesResponse buildPartial() {
       com.google.cloud.texttospeech.v1beta1.ListVoicesResponse result = new com.google.cloud.texttospeech.v1beta1.ListVoicesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.cloud.texttospeech.v1beta1.ListVoicesResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.texttospeech.v1beta1.ListVoicesResponse) {
         return mergeFrom((com.google.cloud.texttospeech.v1beta1.ListVoicesResponse)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.cloud.texttospeech.v1beta1.ListVoicesRespons
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.cloud.texttospeech.v1beta1.Voice.Builder addVoicesBuilder(
       }
       return voicesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.cloud.texttospeech.v1beta1.ListVoicesResponse getDefaul
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListVoicesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListVoicesResponse(input, extensionRegistry);
+        return new ListVoicesResponse(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.texttospeech.v1beta1.ListVoicesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesisInput.java b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesisInput.java
index bca2f97a518b..ada5664d9a58 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesisInput.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesisInput.java
@@ -35,9 +35,6 @@ private SynthesisInput(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private SynthesisInput(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             inputSourceCase_ = 1;
@@ -61,13 +65,6 @@ private SynthesisInput(
             inputSource_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -85,7 +82,6 @@ private SynthesisInput(
     return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_SynthesisInput_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_SynthesisInput_fieldAccessorTable
@@ -240,7 +236,6 @@ public java.lang.String getSsml() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -250,7 +245,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (inputSourceCase_ == 1) {
@@ -262,7 +256,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -403,7 +396,6 @@ public static com.google.cloud.texttospeech.v1beta1.SynthesisInput parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -411,7 +403,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.texttospeech.v1beta1.SynthesisInput prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -442,7 +433,6 @@ public static final class Builder extends
       return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_SynthesisInput_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_SynthesisInput_fieldAccessorTable
@@ -465,7 +455,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       inputSourceCase_ = 0;
@@ -473,18 +462,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_SynthesisInput_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1beta1.SynthesisInput getDefaultInstanceForType() {
       return com.google.cloud.texttospeech.v1beta1.SynthesisInput.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1beta1.SynthesisInput build() {
       com.google.cloud.texttospeech.v1beta1.SynthesisInput result = buildPartial();
       if (!result.isInitialized()) {
@@ -493,7 +479,6 @@ public com.google.cloud.texttospeech.v1beta1.SynthesisInput build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1beta1.SynthesisInput buildPartial() {
       com.google.cloud.texttospeech.v1beta1.SynthesisInput result = new com.google.cloud.texttospeech.v1beta1.SynthesisInput(this);
       if (inputSourceCase_ == 1) {
@@ -507,39 +492,32 @@ public com.google.cloud.texttospeech.v1beta1.SynthesisInput buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.texttospeech.v1beta1.SynthesisInput) {
         return mergeFrom((com.google.cloud.texttospeech.v1beta1.SynthesisInput)other);
@@ -573,12 +551,10 @@ public Builder mergeFrom(com.google.cloud.texttospeech.v1beta1.SynthesisInput ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -826,13 +802,11 @@ public Builder setSsmlBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -854,12 +828,11 @@ public static com.google.cloud.texttospeech.v1beta1.SynthesisInput getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SynthesisInput parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SynthesisInput(input, extensionRegistry);
+        return new SynthesisInput(input, extensionRegistry);
     }
   };
 
@@ -872,7 +845,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.texttospeech.v1beta1.SynthesisInput getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechRequest.java b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechRequest.java
index 6100a942bd86..56255e34aec1 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechRequest.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechRequest.java
@@ -32,9 +32,6 @@ private SynthesizeSpeechRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private SynthesizeSpeechRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.texttospeech.v1beta1.SynthesisInput.Builder subBuilder = null;
             if (input_ != null) {
@@ -85,13 +89,6 @@ private SynthesizeSpeechRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -109,7 +106,6 @@ private SynthesizeSpeechRequest(
     return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_SynthesizeSpeechRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_SynthesizeSpeechRequest_fieldAccessorTable
@@ -217,7 +213,6 @@ public com.google.cloud.texttospeech.v1beta1.AudioConfigOrBuilder getAudioConfig
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -227,7 +222,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (input_ != null) {
@@ -242,7 +236,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -389,7 +382,6 @@ public static com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechRequest pars
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -397,7 +389,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -425,7 +416,6 @@ public static final class Builder extends
       return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_SynthesizeSpeechRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_SynthesizeSpeechRequest_fieldAccessorTable
@@ -448,7 +438,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (inputBuilder_ == null) {
@@ -472,18 +461,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_SynthesizeSpeechRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechRequest getDefaultInstanceForType() {
       return com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechRequest build() {
       com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -492,7 +478,6 @@ public com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechRequest buildPartial() {
       com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechRequest result = new com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechRequest(this);
       if (inputBuilder_ == null) {
@@ -514,39 +499,32 @@ public com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechRequest buildPartia
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechRequest) {
         return mergeFrom((com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechRequest)other);
@@ -572,12 +550,10 @@ public Builder mergeFrom(com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechR
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1054,13 +1030,11 @@ public com.google.cloud.texttospeech.v1beta1.AudioConfigOrBuilder getAudioConfig
       }
       return audioConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1082,12 +1056,11 @@ public static com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechRequest getD
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SynthesizeSpeechRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SynthesizeSpeechRequest(input, extensionRegistry);
+        return new SynthesizeSpeechRequest(input, extensionRegistry);
     }
   };
 
@@ -1100,7 +1073,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechResponse.java b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechResponse.java
index 72e00c32b7ef..1e6e92790212 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechResponse.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/SynthesizeSpeechResponse.java
@@ -33,9 +33,6 @@ private SynthesizeSpeechResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,11 +44,6 @@ private SynthesizeSpeechResponse(
           case 0:
             done = true;
             break;
-          case 10: {
-
-            audioContent_ = input.readBytes();
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -59,6 +51,11 @@ private SynthesizeSpeechResponse(
             }
             break;
           }
+          case 10: {
+
+            audioContent_ = input.readBytes();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -76,7 +73,6 @@ private SynthesizeSpeechResponse(
     return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_SynthesizeSpeechResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_SynthesizeSpeechResponse_fieldAccessorTable
@@ -101,7 +97,6 @@ public com.google.protobuf.ByteString getAudioContent() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -111,7 +106,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!audioContent_.isEmpty()) {
@@ -120,7 +114,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -236,7 +229,6 @@ public static com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechResponse par
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -244,7 +236,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -272,7 +263,6 @@ public static final class Builder extends
       return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_SynthesizeSpeechResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_SynthesizeSpeechResponse_fieldAccessorTable
@@ -295,7 +285,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       audioContent_ = com.google.protobuf.ByteString.EMPTY;
@@ -303,18 +292,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_SynthesizeSpeechResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechResponse getDefaultInstanceForType() {
       return com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechResponse build() {
       com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -323,7 +309,6 @@ public com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechResponse buildPartial() {
       com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechResponse result = new com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechResponse(this);
       result.audioContent_ = audioContent_;
@@ -331,39 +316,32 @@ public com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechResponse buildParti
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechResponse) {
         return mergeFrom((com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechResponse)other);
@@ -383,12 +361,10 @@ public Builder mergeFrom(com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechR
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -456,13 +432,11 @@ public Builder clearAudioContent() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -484,12 +458,11 @@ public static com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechResponse get
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SynthesizeSpeechResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SynthesizeSpeechResponse(input, extensionRegistry);
+        return new SynthesizeSpeechResponse(input, extensionRegistry);
     }
   };
 
@@ -502,7 +475,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.texttospeech.v1beta1.SynthesizeSpeechResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechProto.java b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechProto.java
index caa0e6f9c4d4..f553e29fe58c 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechProto.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/TextToSpeechProto.java
@@ -72,7 +72,7 @@ public static void registerAllExtensions(
       "\"\231\001\n\005Voice\022\026\n\016language_codes\030\001 \003(\t\022\014\n\004na" +
       "me\030\002 \001(\t\022G\n\013ssml_gender\030\003 \001(\01622.google.c" +
       "loud.texttospeech.v1beta1.SsmlVoiceGende" +
-      "r\022!\n\031natural_sample_rate_hertz\030\004 \001(\005\"\351\001\n" +
+      "r\022!\n\031natural_sample_rate_hertz\030\004 \001(\005\"\351\001\n",
       "\027SynthesizeSpeechRequest\022@\n\005input\030\001 \001(\0132" +
       "1.google.cloud.texttospeech.v1beta1.Synt" +
       "hesisInput\022F\n\005voice\030\002 \001(\01327.google.cloud" +
@@ -82,7 +82,7 @@ public static void registerAllExtensions(
       "hesisInput\022\016\n\004text\030\001 \001(\tH\000\022\016\n\004ssml\030\002 \001(\t" +
       "H\000B\016\n\014input_source\"\204\001\n\024VoiceSelectionPar" +
       "ams\022\025\n\rlanguage_code\030\001 \001(\t\022\014\n\004name\030\002 \001(\t" +
-      "\022G\n\013ssml_gender\030\003 \001(\01622.google.cloud.tex" +
+      "\022G\n\013ssml_gender\030\003 \001(\01622.google.cloud.tex",
       "ttospeech.v1beta1.SsmlVoiceGender\"\314\001\n\013Au" +
       "dioConfig\022H\n\016audio_encoding\030\001 \001(\01620.goog" +
       "le.cloud.texttospeech.v1beta1.AudioEncod" +
@@ -92,7 +92,7 @@ public static void registerAllExtensions(
       "\"1\n\030SynthesizeSpeechResponse\022\025\n\raudio_co" +
       "ntent\030\001 \001(\014*W\n\017SsmlVoiceGender\022!\n\035SSML_V" +
       "OICE_GENDER_UNSPECIFIED\020\000\022\010\n\004MALE\020\001\022\n\n\006F" +
-      "EMALE\020\002\022\013\n\007NEUTRAL\020\003*T\n\rAudioEncoding\022\036\n" +
+      "EMALE\020\002\022\013\n\007NEUTRAL\020\003*T\n\rAudioEncoding\022\036\n",
       "\032AUDIO_ENCODING_UNSPECIFIED\020\000\022\014\n\010LINEAR1" +
       "6\020\001\022\007\n\003MP3\020\002\022\014\n\010OGG_OPUS\020\0032\326\002\n\014TextToSpe" +
       "ech\022\222\001\n\nListVoices\0224.google.cloud.textto" +
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "thesizeSpeech\022:.google.cloud.texttospeec" +
       "h.v1beta1.SynthesizeSpeechRequest\032;.goog" +
       "le.cloud.texttospeech.v1beta1.Synthesize" +
-      "SpeechResponse\"#\202\323\344\223\002\035\"\030/v1beta1/text:sy" +
+      "SpeechResponse\"#\202\323\344\223\002\035\"\030/v1beta1/text:sy",
       "nthesize:\001*B\216\001\n%com.google.cloud.texttos" +
       "peech.v1beta1B\021TextToSpeechProtoP\001ZMgoog" +
       "le.golang.org/genproto/googleapis/cloud/" +
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/Voice.java b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/Voice.java
index 42daf6b13d5b..03968d5b2517 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/Voice.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/Voice.java
@@ -36,9 +36,6 @@ private Voice(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private Voice(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -76,13 +80,6 @@ private Voice(
             naturalSampleRateHertz_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private Voice(
     return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_Voice_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_Voice_fieldAccessorTable
@@ -227,7 +223,6 @@ public int getSsmlGenderValue() {
    * .google.cloud.texttospeech.v1beta1.SsmlVoiceGender ssml_gender = 3;
    */
   public com.google.cloud.texttospeech.v1beta1.SsmlVoiceGender getSsmlGender() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.texttospeech.v1beta1.SsmlVoiceGender result = com.google.cloud.texttospeech.v1beta1.SsmlVoiceGender.valueOf(ssmlGender_);
     return result == null ? com.google.cloud.texttospeech.v1beta1.SsmlVoiceGender.UNRECOGNIZED : result;
   }
@@ -246,7 +241,6 @@ public int getNaturalSampleRateHertz() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -256,7 +250,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < languageCodes_.size(); i++) {
@@ -274,7 +267,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -418,7 +410,6 @@ public static com.google.cloud.texttospeech.v1beta1.Voice parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -426,7 +417,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.texttospeech.v1beta1.Voice prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -454,7 +444,6 @@ public static final class Builder extends
       return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_Voice_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_Voice_fieldAccessorTable
@@ -477,7 +466,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       languageCodes_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -491,18 +479,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_Voice_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1beta1.Voice getDefaultInstanceForType() {
       return com.google.cloud.texttospeech.v1beta1.Voice.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1beta1.Voice build() {
       com.google.cloud.texttospeech.v1beta1.Voice result = buildPartial();
       if (!result.isInitialized()) {
@@ -511,7 +496,6 @@ public com.google.cloud.texttospeech.v1beta1.Voice build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1beta1.Voice buildPartial() {
       com.google.cloud.texttospeech.v1beta1.Voice result = new com.google.cloud.texttospeech.v1beta1.Voice(this);
       int from_bitField0_ = bitField0_;
@@ -529,39 +513,32 @@ public com.google.cloud.texttospeech.v1beta1.Voice buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.texttospeech.v1beta1.Voice) {
         return mergeFrom((com.google.cloud.texttospeech.v1beta1.Voice)other);
@@ -598,12 +575,10 @@ public Builder mergeFrom(com.google.cloud.texttospeech.v1beta1.Voice other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -891,7 +866,6 @@ public Builder setSsmlGenderValue(int value) {
      * .google.cloud.texttospeech.v1beta1.SsmlVoiceGender ssml_gender = 3;
      */
     public com.google.cloud.texttospeech.v1beta1.SsmlVoiceGender getSsmlGender() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.texttospeech.v1beta1.SsmlVoiceGender result = com.google.cloud.texttospeech.v1beta1.SsmlVoiceGender.valueOf(ssmlGender_);
       return result == null ? com.google.cloud.texttospeech.v1beta1.SsmlVoiceGender.UNRECOGNIZED : result;
     }
@@ -962,13 +936,11 @@ public Builder clearNaturalSampleRateHertz() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -990,12 +962,11 @@ public static com.google.cloud.texttospeech.v1beta1.Voice getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Voice parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Voice(input, extensionRegistry);
+        return new Voice(input, extensionRegistry);
     }
   };
 
@@ -1008,7 +979,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.texttospeech.v1beta1.Voice getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/VoiceSelectionParams.java b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/VoiceSelectionParams.java
index f5a271839592..71896f3c5051 100644
--- a/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/VoiceSelectionParams.java
+++ b/google-api-grpc/proto-google-cloud-texttospeech-v1beta1/src/main/java/com/google/cloud/texttospeech/v1beta1/VoiceSelectionParams.java
@@ -35,9 +35,6 @@ private VoiceSelectionParams(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private VoiceSelectionParams(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -67,13 +71,6 @@ private VoiceSelectionParams(
             ssmlGender_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private VoiceSelectionParams(
     return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_VoiceSelectionParams_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_VoiceSelectionParams_fieldAccessorTable
@@ -233,13 +229,11 @@ public int getSsmlGenderValue() {
    * .google.cloud.texttospeech.v1beta1.SsmlVoiceGender ssml_gender = 3;
    */
   public com.google.cloud.texttospeech.v1beta1.SsmlVoiceGender getSsmlGender() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.texttospeech.v1beta1.SsmlVoiceGender result = com.google.cloud.texttospeech.v1beta1.SsmlVoiceGender.valueOf(ssmlGender_);
     return result == null ? com.google.cloud.texttospeech.v1beta1.SsmlVoiceGender.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -249,7 +243,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getLanguageCodeBytes().isEmpty()) {
@@ -264,7 +257,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -393,7 +385,6 @@ public static com.google.cloud.texttospeech.v1beta1.VoiceSelectionParams parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -401,7 +392,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.texttospeech.v1beta1.VoiceSelectionParams prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -429,7 +419,6 @@ public static final class Builder extends
       return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_VoiceSelectionParams_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_VoiceSelectionParams_fieldAccessorTable
@@ -452,7 +441,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       languageCode_ = "";
@@ -464,18 +452,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.texttospeech.v1beta1.TextToSpeechProto.internal_static_google_cloud_texttospeech_v1beta1_VoiceSelectionParams_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1beta1.VoiceSelectionParams getDefaultInstanceForType() {
       return com.google.cloud.texttospeech.v1beta1.VoiceSelectionParams.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1beta1.VoiceSelectionParams build() {
       com.google.cloud.texttospeech.v1beta1.VoiceSelectionParams result = buildPartial();
       if (!result.isInitialized()) {
@@ -484,7 +469,6 @@ public com.google.cloud.texttospeech.v1beta1.VoiceSelectionParams build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.texttospeech.v1beta1.VoiceSelectionParams buildPartial() {
       com.google.cloud.texttospeech.v1beta1.VoiceSelectionParams result = new com.google.cloud.texttospeech.v1beta1.VoiceSelectionParams(this);
       result.languageCode_ = languageCode_;
@@ -494,39 +478,32 @@ public com.google.cloud.texttospeech.v1beta1.VoiceSelectionParams buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.texttospeech.v1beta1.VoiceSelectionParams) {
         return mergeFrom((com.google.cloud.texttospeech.v1beta1.VoiceSelectionParams)other);
@@ -554,12 +531,10 @@ public Builder mergeFrom(com.google.cloud.texttospeech.v1beta1.VoiceSelectionPar
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -854,7 +829,6 @@ public Builder setSsmlGenderValue(int value) {
      * .google.cloud.texttospeech.v1beta1.SsmlVoiceGender ssml_gender = 3;
      */
     public com.google.cloud.texttospeech.v1beta1.SsmlVoiceGender getSsmlGender() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.texttospeech.v1beta1.SsmlVoiceGender result = com.google.cloud.texttospeech.v1beta1.SsmlVoiceGender.valueOf(ssmlGender_);
       return result == null ? com.google.cloud.texttospeech.v1beta1.SsmlVoiceGender.UNRECOGNIZED : result;
     }
@@ -895,13 +869,11 @@ public Builder clearSsmlGender() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -923,12 +895,11 @@ public static com.google.cloud.texttospeech.v1beta1.VoiceSelectionParams getDefa
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public VoiceSelectionParams parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VoiceSelectionParams(input, extensionRegistry);
+        return new VoiceSelectionParams(input, extensionRegistry);
     }
   };
 
@@ -941,7 +912,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.texttospeech.v1beta1.VoiceSelectionParams getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/GetTraceRequest.java b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/GetTraceRequest.java
index d37bf64da78f..eefecbfbeb05 100644
--- a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/GetTraceRequest.java
+++ b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/GetTraceRequest.java
@@ -34,9 +34,6 @@ private GetTraceRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private GetTraceRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private GetTraceRequest(
             traceId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private GetTraceRequest(
     return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_GetTraceRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_GetTraceRequest_fieldAccessorTable
@@ -177,7 +173,6 @@ public java.lang.String getTraceId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -187,7 +182,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -199,7 +193,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -321,7 +314,6 @@ public static com.google.devtools.cloudtrace.v1.GetTraceRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -329,7 +321,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.cloudtrace.v1.GetTraceRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -357,7 +348,6 @@ public static final class Builder extends
       return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_GetTraceRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_GetTraceRequest_fieldAccessorTable
@@ -380,7 +370,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -390,18 +379,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_GetTraceRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v1.GetTraceRequest getDefaultInstanceForType() {
       return com.google.devtools.cloudtrace.v1.GetTraceRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v1.GetTraceRequest build() {
       com.google.devtools.cloudtrace.v1.GetTraceRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -410,7 +396,6 @@ public com.google.devtools.cloudtrace.v1.GetTraceRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v1.GetTraceRequest buildPartial() {
       com.google.devtools.cloudtrace.v1.GetTraceRequest result = new com.google.devtools.cloudtrace.v1.GetTraceRequest(this);
       result.projectId_ = projectId_;
@@ -419,39 +404,32 @@ public com.google.devtools.cloudtrace.v1.GetTraceRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.cloudtrace.v1.GetTraceRequest) {
         return mergeFrom((com.google.devtools.cloudtrace.v1.GetTraceRequest)other);
@@ -476,12 +454,10 @@ public Builder mergeFrom(com.google.devtools.cloudtrace.v1.GetTraceRequest other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -677,13 +653,11 @@ public Builder setTraceIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -705,12 +679,11 @@ public static com.google.devtools.cloudtrace.v1.GetTraceRequest getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetTraceRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetTraceRequest(input, extensionRegistry);
+        return new GetTraceRequest(input, extensionRegistry);
     }
   };
 
@@ -723,7 +696,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.cloudtrace.v1.GetTraceRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/ListTracesRequest.java b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/ListTracesRequest.java
index 88dc1ef3bedf..4fce4b9f7e85 100644
--- a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/ListTracesRequest.java
+++ b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/ListTracesRequest.java
@@ -39,9 +39,6 @@ private ListTracesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private ListTracesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -114,13 +118,6 @@ private ListTracesRequest(
             orderBy_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -138,7 +135,6 @@ private ListTracesRequest(
     return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_ListTracesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_ListTracesRequest_fieldAccessorTable
@@ -370,7 +366,6 @@ public int getViewValue() {
    * .google.devtools.cloudtrace.v1.ListTracesRequest.ViewType view = 2;
    */
   public com.google.devtools.cloudtrace.v1.ListTracesRequest.ViewType getView() {
-    @SuppressWarnings("deprecation")
     com.google.devtools.cloudtrace.v1.ListTracesRequest.ViewType result = com.google.devtools.cloudtrace.v1.ListTracesRequest.ViewType.valueOf(view_);
     return result == null ? com.google.devtools.cloudtrace.v1.ListTracesRequest.ViewType.UNRECOGNIZED : result;
   }
@@ -663,7 +658,6 @@ public java.lang.String getOrderBy() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -673,7 +667,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -703,7 +696,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -880,7 +872,6 @@ public static com.google.devtools.cloudtrace.v1.ListTracesRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -888,7 +879,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.cloudtrace.v1.ListTracesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -917,7 +907,6 @@ public static final class Builder extends
       return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_ListTracesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_ListTracesRequest_fieldAccessorTable
@@ -940,7 +929,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -970,18 +958,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_ListTracesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v1.ListTracesRequest getDefaultInstanceForType() {
       return com.google.devtools.cloudtrace.v1.ListTracesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v1.ListTracesRequest build() {
       com.google.devtools.cloudtrace.v1.ListTracesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -990,7 +975,6 @@ public com.google.devtools.cloudtrace.v1.ListTracesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v1.ListTracesRequest buildPartial() {
       com.google.devtools.cloudtrace.v1.ListTracesRequest result = new com.google.devtools.cloudtrace.v1.ListTracesRequest(this);
       result.projectId_ = projectId_;
@@ -1013,39 +997,32 @@ public com.google.devtools.cloudtrace.v1.ListTracesRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.cloudtrace.v1.ListTracesRequest) {
         return mergeFrom((com.google.devtools.cloudtrace.v1.ListTracesRequest)other);
@@ -1090,12 +1067,10 @@ public Builder mergeFrom(com.google.devtools.cloudtrace.v1.ListTracesRequest oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1237,7 +1212,6 @@ public Builder setViewValue(int value) {
      * .google.devtools.cloudtrace.v1.ListTracesRequest.ViewType view = 2;
      */
     public com.google.devtools.cloudtrace.v1.ListTracesRequest.ViewType getView() {
-      @SuppressWarnings("deprecation")
       com.google.devtools.cloudtrace.v1.ListTracesRequest.ViewType result = com.google.devtools.cloudtrace.v1.ListTracesRequest.ViewType.valueOf(view_);
       return result == null ? com.google.devtools.cloudtrace.v1.ListTracesRequest.ViewType.UNRECOGNIZED : result;
     }
@@ -2092,13 +2066,11 @@ public Builder setOrderByBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2120,12 +2092,11 @@ public static com.google.devtools.cloudtrace.v1.ListTracesRequest getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListTracesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTracesRequest(input, extensionRegistry);
+        return new ListTracesRequest(input, extensionRegistry);
     }
   };
 
@@ -2138,7 +2109,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.cloudtrace.v1.ListTracesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/ListTracesResponse.java b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/ListTracesResponse.java
index c55de48951d0..e6ef12a182dc 100644
--- a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/ListTracesResponse.java
+++ b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/ListTracesResponse.java
@@ -34,9 +34,6 @@ private ListTracesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListTracesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               traces_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListTracesResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListTracesResponse(
     return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_ListTracesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_ListTracesResponse_fieldAccessorTable
@@ -201,7 +197,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -211,7 +206,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < traces_.size(); i++) {
@@ -223,7 +217,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.devtools.cloudtrace.v1.ListTracesResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.cloudtrace.v1.ListTracesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_ListTracesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_ListTracesResponse_fieldAccessorTable
@@ -408,7 +398,6 @@ private void maybeForceBuilderInitialization() {
         getTracesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (tracesBuilder_ == null) {
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_ListTracesResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v1.ListTracesResponse getDefaultInstanceForType() {
       return com.google.devtools.cloudtrace.v1.ListTracesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v1.ListTracesResponse build() {
       com.google.devtools.cloudtrace.v1.ListTracesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public com.google.devtools.cloudtrace.v1.ListTracesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v1.ListTracesResponse buildPartial() {
       com.google.devtools.cloudtrace.v1.ListTracesResponse result = new com.google.devtools.cloudtrace.v1.ListTracesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -462,39 +447,32 @@ public com.google.devtools.cloudtrace.v1.ListTracesResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.cloudtrace.v1.ListTracesResponse) {
         return mergeFrom((com.google.devtools.cloudtrace.v1.ListTracesResponse)other);
@@ -541,12 +519,10 @@ public Builder mergeFrom(com.google.devtools.cloudtrace.v1.ListTracesResponse ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -976,13 +952,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1004,12 +978,11 @@ public static com.google.devtools.cloudtrace.v1.ListTracesResponse getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListTracesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListTracesResponse(input, extensionRegistry);
+        return new ListTracesResponse(input, extensionRegistry);
     }
   };
 
@@ -1022,7 +995,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.cloudtrace.v1.ListTracesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/PatchTracesRequest.java b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/PatchTracesRequest.java
index 281bc9d056aa..dbfc6835cdfd 100644
--- a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/PatchTracesRequest.java
+++ b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/PatchTracesRequest.java
@@ -33,9 +33,6 @@ private PatchTracesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private PatchTracesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private PatchTracesRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private PatchTracesRequest(
     return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_PatchTracesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_PatchTracesRequest_fieldAccessorTable
@@ -174,7 +170,6 @@ public com.google.devtools.cloudtrace.v1.TracesOrBuilder getTracesOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -184,7 +179,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -196,7 +190,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -324,7 +317,6 @@ public static com.google.devtools.cloudtrace.v1.PatchTracesRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -332,7 +324,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.cloudtrace.v1.PatchTracesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -360,7 +351,6 @@ public static final class Builder extends
       return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_PatchTracesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_PatchTracesRequest_fieldAccessorTable
@@ -383,7 +373,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -397,18 +386,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_PatchTracesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v1.PatchTracesRequest getDefaultInstanceForType() {
       return com.google.devtools.cloudtrace.v1.PatchTracesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v1.PatchTracesRequest build() {
       com.google.devtools.cloudtrace.v1.PatchTracesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -417,7 +403,6 @@ public com.google.devtools.cloudtrace.v1.PatchTracesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v1.PatchTracesRequest buildPartial() {
       com.google.devtools.cloudtrace.v1.PatchTracesRequest result = new com.google.devtools.cloudtrace.v1.PatchTracesRequest(this);
       result.projectId_ = projectId_;
@@ -430,39 +415,32 @@ public com.google.devtools.cloudtrace.v1.PatchTracesRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.cloudtrace.v1.PatchTracesRequest) {
         return mergeFrom((com.google.devtools.cloudtrace.v1.PatchTracesRequest)other);
@@ -486,12 +464,10 @@ public Builder mergeFrom(com.google.devtools.cloudtrace.v1.PatchTracesRequest ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -751,13 +727,11 @@ public com.google.devtools.cloudtrace.v1.TracesOrBuilder getTracesOrBuilder() {
       }
       return tracesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -779,12 +753,11 @@ public static com.google.devtools.cloudtrace.v1.PatchTracesRequest getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public PatchTracesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new PatchTracesRequest(input, extensionRegistry);
+        return new PatchTracesRequest(input, extensionRegistry);
     }
   };
 
@@ -797,7 +770,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.cloudtrace.v1.PatchTracesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/Trace.java b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/Trace.java
index 44bf55323977..e4a4d6c53791 100644
--- a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/Trace.java
+++ b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/Trace.java
@@ -37,9 +37,6 @@ private Trace(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private Trace(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -72,13 +76,6 @@ private Trace(
                 input.readMessage(com.google.devtools.cloudtrace.v1.TraceSpan.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -99,7 +96,6 @@ private Trace(
     return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_Trace_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_Trace_fieldAccessorTable
@@ -250,7 +246,6 @@ public com.google.devtools.cloudtrace.v1.TraceSpanOrBuilder getSpansOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -260,7 +255,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getProjectIdBytes().isEmpty()) {
@@ -275,7 +269,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -407,7 +400,6 @@ public static com.google.devtools.cloudtrace.v1.Trace parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -415,7 +407,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.cloudtrace.v1.Trace prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -445,7 +436,6 @@ public static final class Builder extends
       return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_Trace_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_Trace_fieldAccessorTable
@@ -469,7 +459,6 @@ private void maybeForceBuilderInitialization() {
         getSpansFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       projectId_ = "";
@@ -485,18 +474,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_Trace_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v1.Trace getDefaultInstanceForType() {
       return com.google.devtools.cloudtrace.v1.Trace.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v1.Trace build() {
       com.google.devtools.cloudtrace.v1.Trace result = buildPartial();
       if (!result.isInitialized()) {
@@ -505,7 +491,6 @@ public com.google.devtools.cloudtrace.v1.Trace build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v1.Trace buildPartial() {
       com.google.devtools.cloudtrace.v1.Trace result = new com.google.devtools.cloudtrace.v1.Trace(this);
       int from_bitField0_ = bitField0_;
@@ -526,39 +511,32 @@ public com.google.devtools.cloudtrace.v1.Trace buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.cloudtrace.v1.Trace) {
         return mergeFrom((com.google.devtools.cloudtrace.v1.Trace)other);
@@ -609,12 +587,10 @@ public Builder mergeFrom(com.google.devtools.cloudtrace.v1.Trace other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1128,13 +1104,11 @@ public com.google.devtools.cloudtrace.v1.TraceSpan.Builder addSpansBuilder(
       }
       return spansBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1156,12 +1130,11 @@ public static com.google.devtools.cloudtrace.v1.Trace getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Trace parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Trace(input, extensionRegistry);
+        return new Trace(input, extensionRegistry);
     }
   };
 
@@ -1174,7 +1147,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.cloudtrace.v1.Trace getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/TraceProto.java b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/TraceProto.java
index cb92a042494a..1fe323cb09c9 100644
--- a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/TraceProto.java
+++ b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/TraceProto.java
@@ -72,7 +72,7 @@ public static void registerAllExtensions(
       "vtools.cloudtrace.v1.TraceSpan\">\n\006Traces" +
       "\0224\n\006traces\030\001 \003(\0132$.google.devtools.cloud" +
       "trace.v1.Trace\"\235\003\n\tTraceSpan\022\017\n\007span_id\030" +
-      "\001 \001(\006\022?\n\004kind\030\002 \001(\01621.google.devtools.cl" +
+      "\001 \001(\006\022?\n\004kind\030\002 \001(\01621.google.devtools.cl",
       "oudtrace.v1.TraceSpan.SpanKind\022\014\n\004name\030\003" +
       " \001(\t\022.\n\nstart_time\030\004 \001(\0132\032.google.protob" +
       "uf.Timestamp\022,\n\010end_time\030\005 \001(\0132\032.google." +
@@ -82,7 +82,7 @@ public static void registerAllExtensions(
       "lsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"" +
       "E\n\010SpanKind\022\031\n\025SPAN_KIND_UNSPECIFIED\020\000\022\016" +
       "\n\nRPC_SERVER\020\001\022\016\n\nRPC_CLIENT\020\002\"\347\002\n\021ListT" +
-      "racesRequest\022\022\n\nproject_id\030\001 \001(\t\022G\n\004view" +
+      "racesRequest\022\022\n\nproject_id\030\001 \001(\t\022G\n\004view",
       "\030\002 \001(\01629.google.devtools.cloudtrace.v1.L" +
       "istTracesRequest.ViewType\022\021\n\tpage_size\030\003" +
       " \001(\005\022\022\n\npage_token\030\004 \001(\t\022.\n\nstart_time\030\005" +
@@ -92,7 +92,7 @@ public static void registerAllExtensions(
       "Type\022\031\n\025VIEW_TYPE_UNSPECIFIED\020\000\022\013\n\007MINIM" +
       "AL\020\001\022\014\n\010ROOTSPAN\020\002\022\014\n\010COMPLETE\020\003\"c\n\022List" +
       "TracesResponse\0224\n\006traces\030\001 \003(\0132$.google." +
-      "devtools.cloudtrace.v1.Trace\022\027\n\017next_pag" +
+      "devtools.cloudtrace.v1.Trace\022\027\n\017next_pag",
       "e_token\030\002 \001(\t\"7\n\017GetTraceRequest\022\022\n\nproj" +
       "ect_id\030\001 \001(\t\022\020\n\010trace_id\030\002 \001(\t\"_\n\022PatchT" +
       "racesRequest\022\022\n\nproject_id\030\001 \001(\t\0225\n\006trac" +
@@ -102,7 +102,7 @@ public static void registerAllExtensions(
       "esRequest\0321.google.devtools.cloudtrace.v" +
       "1.ListTracesResponse\"(\202\323\344\223\002\"\022 /v1/projec" +
       "ts/{project_id}/traces\022\225\001\n\010GetTrace\022..go" +
-      "ogle.devtools.cloudtrace.v1.GetTraceRequ" +
+      "ogle.devtools.cloudtrace.v1.GetTraceRequ",
       "est\032$.google.devtools.cloudtrace.v1.Trac" +
       "e\"3\202\323\344\223\002-\022+/v1/projects/{project_id}/tra" +
       "ces/{trace_id}\022\212\001\n\013PatchTraces\0221.google." +
@@ -112,7 +112,7 @@ public static void registerAllExtensions(
       "com.google.devtools.cloudtrace.v1B\nTrace" +
       "ProtoP\001ZGgoogle.golang.org/genproto/goog" +
       "leapis/devtools/cloudtrace/v1;cloudtrace" +
-      "\252\002\025Google.Cloud.Trace.V1\312\002\025Google\\Cloud\\" +
+      "\252\002\025Google.Cloud.Trace.V1\312\002\025Google\\Cloud\\",
       "Trace\\V1b\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
diff --git a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/TraceSpan.java b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/TraceSpan.java
index 0807fa7a7346..e49e2b97d491 100644
--- a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/TraceSpan.java
+++ b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/TraceSpan.java
@@ -40,9 +40,6 @@ private TraceSpan(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -54,6 +51,13 @@ private TraceSpan(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 9: {
 
             spanId_ = input.readFixed64();
@@ -115,13 +119,6 @@ private TraceSpan(
                 labels__.getKey(), labels__.getValue());
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -140,7 +137,6 @@ private TraceSpan(
   }
 
   @SuppressWarnings({"rawtypes"})
-  @java.lang.Override
   protected com.google.protobuf.MapField internalGetMapField(
       int number) {
     switch (number) {
@@ -151,7 +147,6 @@ protected com.google.protobuf.MapField internalGetMapField(
             "Invalid map field number: " + number);
     }
   }
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_TraceSpan_fieldAccessorTable
@@ -338,7 +333,6 @@ public int getKindValue() {
    * .google.devtools.cloudtrace.v1.TraceSpan.SpanKind kind = 2;
    */
   public com.google.devtools.cloudtrace.v1.TraceSpan.SpanKind getKind() {
-    @SuppressWarnings("deprecation")
     com.google.devtools.cloudtrace.v1.TraceSpan.SpanKind result = com.google.devtools.cloudtrace.v1.TraceSpan.SpanKind.valueOf(kind_);
     return result == null ? com.google.devtools.cloudtrace.v1.TraceSpan.SpanKind.UNRECOGNIZED : result;
   }
@@ -689,7 +683,6 @@ public java.lang.String getLabelsOrThrow(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -699,7 +692,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (spanId_ != 0L) {
@@ -729,7 +721,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -911,7 +902,6 @@ public static com.google.devtools.cloudtrace.v1.TraceSpan parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -919,7 +909,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.cloudtrace.v1.TraceSpan prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -973,7 +962,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_TraceSpan_fieldAccessorTable
@@ -996,7 +984,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       spanId_ = 0L;
@@ -1023,18 +1010,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_TraceSpan_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v1.TraceSpan getDefaultInstanceForType() {
       return com.google.devtools.cloudtrace.v1.TraceSpan.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v1.TraceSpan build() {
       com.google.devtools.cloudtrace.v1.TraceSpan result = buildPartial();
       if (!result.isInitialized()) {
@@ -1043,7 +1027,6 @@ public com.google.devtools.cloudtrace.v1.TraceSpan build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v1.TraceSpan buildPartial() {
       com.google.devtools.cloudtrace.v1.TraceSpan result = new com.google.devtools.cloudtrace.v1.TraceSpan(this);
       int from_bitField0_ = bitField0_;
@@ -1069,39 +1052,32 @@ public com.google.devtools.cloudtrace.v1.TraceSpan buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.cloudtrace.v1.TraceSpan) {
         return mergeFrom((com.google.devtools.cloudtrace.v1.TraceSpan)other);
@@ -1139,12 +1115,10 @@ public Builder mergeFrom(com.google.devtools.cloudtrace.v1.TraceSpan other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1242,7 +1216,6 @@ public Builder setKindValue(int value) {
      * .google.devtools.cloudtrace.v1.TraceSpan.SpanKind kind = 2;
      */
     public com.google.devtools.cloudtrace.v1.TraceSpan.SpanKind getKind() {
-      @SuppressWarnings("deprecation")
       com.google.devtools.cloudtrace.v1.TraceSpan.SpanKind result = com.google.devtools.cloudtrace.v1.TraceSpan.SpanKind.valueOf(kind_);
       return result == null ? com.google.devtools.cloudtrace.v1.TraceSpan.SpanKind.UNRECOGNIZED : result;
     }
@@ -2103,13 +2076,11 @@ public Builder putAllLabels(
           .putAll(values);
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2131,12 +2102,11 @@ public static com.google.devtools.cloudtrace.v1.TraceSpan getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TraceSpan parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TraceSpan(input, extensionRegistry);
+        return new TraceSpan(input, extensionRegistry);
     }
   };
 
@@ -2149,7 +2119,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.cloudtrace.v1.TraceSpan getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/Traces.java b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/Traces.java
index 3c9e1a182e9a..f92c76216cd1 100644
--- a/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/Traces.java
+++ b/google-api-grpc/proto-google-cloud-trace-v1/src/main/java/com/google/devtools/cloudtrace/v1/Traces.java
@@ -33,9 +33,6 @@ private Traces(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private Traces(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               traces_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private Traces(
                 input.readMessage(com.google.devtools.cloudtrace.v1.Trace.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private Traces(
     return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_Traces_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_Traces_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.devtools.cloudtrace.v1.TraceOrBuilder getTracesOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < traces_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.devtools.cloudtrace.v1.Traces parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.cloudtrace.v1.Traces prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_Traces_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_Traces_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getTracesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (tracesBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.cloudtrace.v1.TraceProto.internal_static_google_devtools_cloudtrace_v1_Traces_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v1.Traces getDefaultInstanceForType() {
       return com.google.devtools.cloudtrace.v1.Traces.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v1.Traces build() {
       com.google.devtools.cloudtrace.v1.Traces result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.devtools.cloudtrace.v1.Traces build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v1.Traces buildPartial() {
       com.google.devtools.cloudtrace.v1.Traces result = new com.google.devtools.cloudtrace.v1.Traces(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.devtools.cloudtrace.v1.Traces buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.cloudtrace.v1.Traces) {
         return mergeFrom((com.google.devtools.cloudtrace.v1.Traces)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.devtools.cloudtrace.v1.Traces other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.devtools.cloudtrace.v1.Trace.Builder addTracesBuilder(
       }
       return tracesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.devtools.cloudtrace.v1.Traces getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Traces parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Traces(input, extensionRegistry);
+        return new Traces(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.cloudtrace.v1.Traces getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/AttributeValue.java b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/AttributeValue.java
index c16426a0e5aa..48999883a7fe 100644
--- a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/AttributeValue.java
+++ b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/AttributeValue.java
@@ -32,9 +32,6 @@ private AttributeValue(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private AttributeValue(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.devtools.cloudtrace.v2.TruncatableString.Builder subBuilder = null;
             if (valueCase_ == 1) {
@@ -70,13 +74,6 @@ private AttributeValue(
             value_ = input.readBool();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -94,7 +91,6 @@ private AttributeValue(
     return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_AttributeValue_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_AttributeValue_fieldAccessorTable
@@ -211,7 +207,6 @@ public boolean getBoolValue() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -221,7 +216,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (valueCase_ == 1) {
@@ -238,7 +232,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -397,7 +390,6 @@ public static com.google.devtools.cloudtrace.v2.AttributeValue parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -405,7 +397,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.cloudtrace.v2.AttributeValue prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -433,7 +424,6 @@ public static final class Builder extends
       return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_AttributeValue_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_AttributeValue_fieldAccessorTable
@@ -456,7 +446,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       valueCase_ = 0;
@@ -464,18 +453,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_AttributeValue_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v2.AttributeValue getDefaultInstanceForType() {
       return com.google.devtools.cloudtrace.v2.AttributeValue.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v2.AttributeValue build() {
       com.google.devtools.cloudtrace.v2.AttributeValue result = buildPartial();
       if (!result.isInitialized()) {
@@ -484,7 +470,6 @@ public com.google.devtools.cloudtrace.v2.AttributeValue build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v2.AttributeValue buildPartial() {
       com.google.devtools.cloudtrace.v2.AttributeValue result = new com.google.devtools.cloudtrace.v2.AttributeValue(this);
       if (valueCase_ == 1) {
@@ -505,39 +490,32 @@ public com.google.devtools.cloudtrace.v2.AttributeValue buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.cloudtrace.v2.AttributeValue) {
         return mergeFrom((com.google.devtools.cloudtrace.v2.AttributeValue)other);
@@ -571,12 +549,10 @@ public Builder mergeFrom(com.google.devtools.cloudtrace.v2.AttributeValue other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -865,13 +841,11 @@ public Builder clearBoolValue() {
       }
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -893,12 +867,11 @@ public static com.google.devtools.cloudtrace.v2.AttributeValue getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AttributeValue parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AttributeValue(input, extensionRegistry);
+        return new AttributeValue(input, extensionRegistry);
     }
   };
 
@@ -911,7 +884,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.cloudtrace.v2.AttributeValue getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/BatchWriteSpansRequest.java b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/BatchWriteSpansRequest.java
index eab829b7a017..93acca79ebdf 100644
--- a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/BatchWriteSpansRequest.java
+++ b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/BatchWriteSpansRequest.java
@@ -34,9 +34,6 @@ private BatchWriteSpansRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private BatchWriteSpansRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -63,13 +67,6 @@ private BatchWriteSpansRequest(
                 input.readMessage(com.google.devtools.cloudtrace.v2.Span.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private BatchWriteSpansRequest(
     return com.google.devtools.cloudtrace.v2.TracingProto.internal_static_google_devtools_cloudtrace_v2_BatchWriteSpansRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.cloudtrace.v2.TracingProto.internal_static_google_devtools_cloudtrace_v2_BatchWriteSpansRequest_fieldAccessorTable
@@ -204,7 +200,6 @@ public com.google.devtools.cloudtrace.v2.SpanOrBuilder getSpansOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -214,7 +209,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -226,7 +220,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -351,7 +344,6 @@ public static com.google.devtools.cloudtrace.v2.BatchWriteSpansRequest parseFrom
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -359,7 +351,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.cloudtrace.v2.BatchWriteSpansRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -387,7 +378,6 @@ public static final class Builder extends
       return com.google.devtools.cloudtrace.v2.TracingProto.internal_static_google_devtools_cloudtrace_v2_BatchWriteSpansRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.cloudtrace.v2.TracingProto.internal_static_google_devtools_cloudtrace_v2_BatchWriteSpansRequest_fieldAccessorTable
@@ -411,7 +401,6 @@ private void maybeForceBuilderInitialization() {
         getSpansFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -425,18 +414,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.cloudtrace.v2.TracingProto.internal_static_google_devtools_cloudtrace_v2_BatchWriteSpansRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v2.BatchWriteSpansRequest getDefaultInstanceForType() {
       return com.google.devtools.cloudtrace.v2.BatchWriteSpansRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v2.BatchWriteSpansRequest build() {
       com.google.devtools.cloudtrace.v2.BatchWriteSpansRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -445,7 +431,6 @@ public com.google.devtools.cloudtrace.v2.BatchWriteSpansRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v2.BatchWriteSpansRequest buildPartial() {
       com.google.devtools.cloudtrace.v2.BatchWriteSpansRequest result = new com.google.devtools.cloudtrace.v2.BatchWriteSpansRequest(this);
       int from_bitField0_ = bitField0_;
@@ -465,39 +450,32 @@ public com.google.devtools.cloudtrace.v2.BatchWriteSpansRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.cloudtrace.v2.BatchWriteSpansRequest) {
         return mergeFrom((com.google.devtools.cloudtrace.v2.BatchWriteSpansRequest)other);
@@ -544,12 +522,10 @@ public Builder mergeFrom(com.google.devtools.cloudtrace.v2.BatchWriteSpansReques
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -992,13 +968,11 @@ public com.google.devtools.cloudtrace.v2.Span.Builder addSpansBuilder(
       }
       return spansBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1020,12 +994,11 @@ public static com.google.devtools.cloudtrace.v2.BatchWriteSpansRequest getDefaul
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BatchWriteSpansRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchWriteSpansRequest(input, extensionRegistry);
+        return new BatchWriteSpansRequest(input, extensionRegistry);
     }
   };
 
@@ -1038,7 +1011,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.cloudtrace.v2.BatchWriteSpansRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/Module.java b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/Module.java
index a3eafde0f8a5..b3ff38736d52 100644
--- a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/Module.java
+++ b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/Module.java
@@ -32,9 +32,6 @@ private Module(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private Module(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.devtools.cloudtrace.v2.TruncatableString.Builder subBuilder = null;
             if (module_ != null) {
@@ -72,13 +76,6 @@ private Module(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private Module(
     return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Module_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Module_fieldAccessorTable
@@ -177,7 +173,6 @@ public com.google.devtools.cloudtrace.v2.TruncatableStringOrBuilder getBuildIdOr
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -187,7 +182,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (module_ != null) {
@@ -199,7 +193,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -333,7 +326,6 @@ public static com.google.devtools.cloudtrace.v2.Module parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -341,7 +333,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.cloudtrace.v2.Module prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -369,7 +360,6 @@ public static final class Builder extends
       return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Module_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Module_fieldAccessorTable
@@ -392,7 +382,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (moduleBuilder_ == null) {
@@ -410,18 +399,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Module_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v2.Module getDefaultInstanceForType() {
       return com.google.devtools.cloudtrace.v2.Module.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v2.Module build() {
       com.google.devtools.cloudtrace.v2.Module result = buildPartial();
       if (!result.isInitialized()) {
@@ -430,7 +416,6 @@ public com.google.devtools.cloudtrace.v2.Module build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v2.Module buildPartial() {
       com.google.devtools.cloudtrace.v2.Module result = new com.google.devtools.cloudtrace.v2.Module(this);
       if (moduleBuilder_ == null) {
@@ -447,39 +432,32 @@ public com.google.devtools.cloudtrace.v2.Module buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.cloudtrace.v2.Module) {
         return mergeFrom((com.google.devtools.cloudtrace.v2.Module)other);
@@ -502,12 +480,10 @@ public Builder mergeFrom(com.google.devtools.cloudtrace.v2.Module other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -849,13 +825,11 @@ public com.google.devtools.cloudtrace.v2.TruncatableStringOrBuilder getBuildIdOr
       }
       return buildIdBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -877,12 +851,11 @@ public static com.google.devtools.cloudtrace.v2.Module getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Module parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Module(input, extensionRegistry);
+        return new Module(input, extensionRegistry);
     }
   };
 
@@ -895,7 +868,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.cloudtrace.v2.Module getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/Span.java b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/Span.java
index dcf3f88c880c..b148d271b600 100644
--- a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/Span.java
+++ b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/Span.java
@@ -40,9 +40,6 @@ private Span(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -54,6 +51,13 @@ private Span(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -202,13 +206,6 @@ private Span(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -226,7 +223,6 @@ private Span(
     return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_fieldAccessorTable
@@ -363,9 +359,6 @@ private Attributes(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -377,6 +370,13 @@ private Attributes(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
                 attributeMap_ = com.google.protobuf.MapField.newMapField(
@@ -395,13 +395,6 @@ private Attributes(
               droppedAttributesCount_ = input.readInt32();
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -420,7 +413,6 @@ private Attributes(
     }
 
     @SuppressWarnings({"rawtypes"})
-    @java.lang.Override
     protected com.google.protobuf.MapField internalGetMapField(
         int number) {
       switch (number) {
@@ -431,7 +423,6 @@ protected com.google.protobuf.MapField internalGetMapField(
               "Invalid map field number: " + number);
       }
     }
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_Attributes_fieldAccessorTable
@@ -572,7 +563,6 @@ public int getDroppedAttributesCount() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -582,7 +572,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       com.google.protobuf.GeneratedMessageV3
@@ -597,7 +586,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -729,7 +717,6 @@ public static com.google.devtools.cloudtrace.v2.Span.Attributes parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -737,7 +724,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.devtools.cloudtrace.v2.Span.Attributes prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -787,7 +773,6 @@ protected com.google.protobuf.MapField internalGetMutableMapField(
                 "Invalid map field number: " + number);
         }
       }
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_Attributes_fieldAccessorTable
@@ -810,7 +795,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         internalGetMutableAttributeMap().clear();
@@ -819,18 +803,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_Attributes_descriptor;
       }
 
-      @java.lang.Override
       public com.google.devtools.cloudtrace.v2.Span.Attributes getDefaultInstanceForType() {
         return com.google.devtools.cloudtrace.v2.Span.Attributes.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.devtools.cloudtrace.v2.Span.Attributes build() {
         com.google.devtools.cloudtrace.v2.Span.Attributes result = buildPartial();
         if (!result.isInitialized()) {
@@ -839,7 +820,6 @@ public com.google.devtools.cloudtrace.v2.Span.Attributes build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.devtools.cloudtrace.v2.Span.Attributes buildPartial() {
         com.google.devtools.cloudtrace.v2.Span.Attributes result = new com.google.devtools.cloudtrace.v2.Span.Attributes(this);
         int from_bitField0_ = bitField0_;
@@ -852,39 +832,32 @@ public com.google.devtools.cloudtrace.v2.Span.Attributes buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.devtools.cloudtrace.v2.Span.Attributes) {
           return mergeFrom((com.google.devtools.cloudtrace.v2.Span.Attributes)other);
@@ -906,12 +879,10 @@ public Builder mergeFrom(com.google.devtools.cloudtrace.v2.Span.Attributes other
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1167,13 +1138,11 @@ public Builder clearDroppedAttributesCount() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1195,12 +1164,11 @@ public static com.google.devtools.cloudtrace.v2.Span.Attributes getDefaultInstan
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Attributes parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Attributes(input, extensionRegistry);
+          return new Attributes(input, extensionRegistry);
       }
     };
 
@@ -1213,7 +1181,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v2.Span.Attributes getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1330,9 +1297,6 @@ private TimeEvent(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1344,6 +1308,13 @@ private TimeEvent(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               com.google.protobuf.Timestamp.Builder subBuilder = null;
               if (time_ != null) {
@@ -1385,13 +1356,6 @@ private TimeEvent(
               valueCase_ = 3;
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1409,7 +1373,6 @@ private TimeEvent(
       return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_TimeEvent_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_TimeEvent_fieldAccessorTable
@@ -1506,9 +1469,6 @@ private Annotation(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1520,6 +1480,13 @@ private Annotation(
               case 0:
                 done = true;
                 break;
+              default: {
+                if (!parseUnknownFieldProto3(
+                    input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
               case 10: {
                 com.google.devtools.cloudtrace.v2.TruncatableString.Builder subBuilder = null;
                 if (description_ != null) {
@@ -1546,13 +1513,6 @@ private Annotation(
 
                 break;
               }
-              default: {
-                if (!parseUnknownFieldProto3(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
             }
           }
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1570,7 +1530,6 @@ private Annotation(
         return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_TimeEvent_Annotation_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_TimeEvent_Annotation_fieldAccessorTable
@@ -1651,7 +1610,6 @@ public com.google.devtools.cloudtrace.v2.Span.AttributesOrBuilder getAttributesO
       }
 
       private byte memoizedIsInitialized = -1;
-      @java.lang.Override
       public final boolean isInitialized() {
         byte isInitialized = memoizedIsInitialized;
         if (isInitialized == 1) return true;
@@ -1661,7 +1619,6 @@ public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public void writeTo(com.google.protobuf.CodedOutputStream output)
                           throws java.io.IOException {
         if (description_ != null) {
@@ -1673,7 +1630,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         unknownFields.writeTo(output);
       }
 
-      @java.lang.Override
       public int getSerializedSize() {
         int size = memoizedSize;
         if (size != -1) return size;
@@ -1807,7 +1763,6 @@ public static com.google.devtools.cloudtrace.v2.Span.TimeEvent.Annotation parseF
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
-      @java.lang.Override
       public Builder newBuilderForType() { return newBuilder(); }
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
@@ -1815,7 +1770,6 @@ public static Builder newBuilder() {
       public static Builder newBuilder(com.google.devtools.cloudtrace.v2.Span.TimeEvent.Annotation prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
-      @java.lang.Override
       public Builder toBuilder() {
         return this == DEFAULT_INSTANCE
             ? new Builder() : new Builder().mergeFrom(this);
@@ -1843,7 +1797,6 @@ public static final class Builder extends
           return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_TimeEvent_Annotation_descriptor;
         }
 
-        @java.lang.Override
         protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
           return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_TimeEvent_Annotation_fieldAccessorTable
@@ -1866,7 +1819,6 @@ private void maybeForceBuilderInitialization() {
                   .alwaysUseFieldBuilders) {
           }
         }
-        @java.lang.Override
         public Builder clear() {
           super.clear();
           if (descriptionBuilder_ == null) {
@@ -1884,18 +1836,15 @@ public Builder clear() {
           return this;
         }
 
-        @java.lang.Override
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
           return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_TimeEvent_Annotation_descriptor;
         }
 
-        @java.lang.Override
         public com.google.devtools.cloudtrace.v2.Span.TimeEvent.Annotation getDefaultInstanceForType() {
           return com.google.devtools.cloudtrace.v2.Span.TimeEvent.Annotation.getDefaultInstance();
         }
 
-        @java.lang.Override
         public com.google.devtools.cloudtrace.v2.Span.TimeEvent.Annotation build() {
           com.google.devtools.cloudtrace.v2.Span.TimeEvent.Annotation result = buildPartial();
           if (!result.isInitialized()) {
@@ -1904,7 +1853,6 @@ public com.google.devtools.cloudtrace.v2.Span.TimeEvent.Annotation build() {
           return result;
         }
 
-        @java.lang.Override
         public com.google.devtools.cloudtrace.v2.Span.TimeEvent.Annotation buildPartial() {
           com.google.devtools.cloudtrace.v2.Span.TimeEvent.Annotation result = new com.google.devtools.cloudtrace.v2.Span.TimeEvent.Annotation(this);
           if (descriptionBuilder_ == null) {
@@ -1921,39 +1869,32 @@ public com.google.devtools.cloudtrace.v2.Span.TimeEvent.Annotation buildPartial(
           return result;
         }
 
-        @java.lang.Override
         public Builder clone() {
           return (Builder) super.clone();
         }
-        @java.lang.Override
         public Builder setField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.setField(field, value);
         }
-        @java.lang.Override
         public Builder clearField(
             com.google.protobuf.Descriptors.FieldDescriptor field) {
           return (Builder) super.clearField(field);
         }
-        @java.lang.Override
         public Builder clearOneof(
             com.google.protobuf.Descriptors.OneofDescriptor oneof) {
           return (Builder) super.clearOneof(oneof);
         }
-        @java.lang.Override
         public Builder setRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return (Builder) super.setRepeatedField(field, index, value);
         }
-        @java.lang.Override
         public Builder addRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.addRepeatedField(field, value);
         }
-        @java.lang.Override
         public Builder mergeFrom(com.google.protobuf.Message other) {
           if (other instanceof com.google.devtools.cloudtrace.v2.Span.TimeEvent.Annotation) {
             return mergeFrom((com.google.devtools.cloudtrace.v2.Span.TimeEvent.Annotation)other);
@@ -1976,12 +1917,10 @@ public Builder mergeFrom(com.google.devtools.cloudtrace.v2.Span.TimeEvent.Annota
           return this;
         }
 
-        @java.lang.Override
         public final boolean isInitialized() {
           return true;
         }
 
-        @java.lang.Override
         public Builder mergeFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2323,13 +2262,11 @@ public com.google.devtools.cloudtrace.v2.Span.AttributesOrBuilder getAttributesO
           }
           return attributesBuilder_;
         }
-        @java.lang.Override
         public final Builder setUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.setUnknownFieldsProto3(unknownFields);
         }
 
-        @java.lang.Override
         public final Builder mergeUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
@@ -2351,12 +2288,11 @@ public static com.google.devtools.cloudtrace.v2.Span.TimeEvent.Annotation getDef
 
       private static final com.google.protobuf.Parser
           PARSER = new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
         public Annotation parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new Annotation(input, extensionRegistry);
+            return new Annotation(input, extensionRegistry);
         }
       };
 
@@ -2369,7 +2305,6 @@ public com.google.protobuf.Parser getParserForType() {
         return PARSER;
       }
 
-      @java.lang.Override
       public com.google.devtools.cloudtrace.v2.Span.TimeEvent.Annotation getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
@@ -2462,9 +2397,6 @@ private MessageEvent(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2476,6 +2408,13 @@ private MessageEvent(
               case 0:
                 done = true;
                 break;
+              default: {
+                if (!parseUnknownFieldProto3(
+                    input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
               case 8: {
                 int rawValue = input.readEnum();
 
@@ -2497,13 +2436,6 @@ private MessageEvent(
                 compressedSizeBytes_ = input.readInt64();
                 break;
               }
-              default: {
-                if (!parseUnknownFieldProto3(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
             }
           }
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -2521,7 +2453,6 @@ private MessageEvent(
         return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_TimeEvent_MessageEvent_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_TimeEvent_MessageEvent_fieldAccessorTable
@@ -2686,7 +2617,6 @@ public int getTypeValue() {
        * .google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEvent.Type type = 1;
        */
       public com.google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEvent.Type getType() {
-        @SuppressWarnings("deprecation")
         com.google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEvent.Type result = com.google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEvent.Type.valueOf(type_);
         return result == null ? com.google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEvent.Type.UNRECOGNIZED : result;
       }
@@ -2734,7 +2664,6 @@ public long getCompressedSizeBytes() {
       }
 
       private byte memoizedIsInitialized = -1;
-      @java.lang.Override
       public final boolean isInitialized() {
         byte isInitialized = memoizedIsInitialized;
         if (isInitialized == 1) return true;
@@ -2744,7 +2673,6 @@ public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public void writeTo(com.google.protobuf.CodedOutputStream output)
                           throws java.io.IOException {
         if (type_ != com.google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEvent.Type.TYPE_UNSPECIFIED.getNumber()) {
@@ -2762,7 +2690,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         unknownFields.writeTo(output);
       }
 
-      @java.lang.Override
       public int getSerializedSize() {
         int size = memoizedSize;
         if (size != -1) return size;
@@ -2904,7 +2831,6 @@ public static com.google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEvent pars
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
-      @java.lang.Override
       public Builder newBuilderForType() { return newBuilder(); }
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
@@ -2912,7 +2838,6 @@ public static Builder newBuilder() {
       public static Builder newBuilder(com.google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEvent prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
-      @java.lang.Override
       public Builder toBuilder() {
         return this == DEFAULT_INSTANCE
             ? new Builder() : new Builder().mergeFrom(this);
@@ -2940,7 +2865,6 @@ public static final class Builder extends
           return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_TimeEvent_MessageEvent_descriptor;
         }
 
-        @java.lang.Override
         protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
           return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_TimeEvent_MessageEvent_fieldAccessorTable
@@ -2963,7 +2887,6 @@ private void maybeForceBuilderInitialization() {
                   .alwaysUseFieldBuilders) {
           }
         }
-        @java.lang.Override
         public Builder clear() {
           super.clear();
           type_ = 0;
@@ -2977,18 +2900,15 @@ public Builder clear() {
           return this;
         }
 
-        @java.lang.Override
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
           return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_TimeEvent_MessageEvent_descriptor;
         }
 
-        @java.lang.Override
         public com.google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEvent getDefaultInstanceForType() {
           return com.google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEvent.getDefaultInstance();
         }
 
-        @java.lang.Override
         public com.google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEvent build() {
           com.google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEvent result = buildPartial();
           if (!result.isInitialized()) {
@@ -2997,7 +2917,6 @@ public com.google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEvent build() {
           return result;
         }
 
-        @java.lang.Override
         public com.google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEvent buildPartial() {
           com.google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEvent result = new com.google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEvent(this);
           result.type_ = type_;
@@ -3008,39 +2927,32 @@ public com.google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEvent buildPartia
           return result;
         }
 
-        @java.lang.Override
         public Builder clone() {
           return (Builder) super.clone();
         }
-        @java.lang.Override
         public Builder setField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.setField(field, value);
         }
-        @java.lang.Override
         public Builder clearField(
             com.google.protobuf.Descriptors.FieldDescriptor field) {
           return (Builder) super.clearField(field);
         }
-        @java.lang.Override
         public Builder clearOneof(
             com.google.protobuf.Descriptors.OneofDescriptor oneof) {
           return (Builder) super.clearOneof(oneof);
         }
-        @java.lang.Override
         public Builder setRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return (Builder) super.setRepeatedField(field, index, value);
         }
-        @java.lang.Override
         public Builder addRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.addRepeatedField(field, value);
         }
-        @java.lang.Override
         public Builder mergeFrom(com.google.protobuf.Message other) {
           if (other instanceof com.google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEvent) {
             return mergeFrom((com.google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEvent)other);
@@ -3069,12 +2981,10 @@ public Builder mergeFrom(com.google.devtools.cloudtrace.v2.Span.TimeEvent.Messag
           return this;
         }
 
-        @java.lang.Override
         public final boolean isInitialized() {
           return true;
         }
 
-        @java.lang.Override
         public Builder mergeFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3127,7 +3037,6 @@ public Builder setTypeValue(int value) {
          * .google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEvent.Type type = 1;
          */
         public com.google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEvent.Type getType() {
-          @SuppressWarnings("deprecation")
           com.google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEvent.Type result = com.google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEvent.Type.valueOf(type_);
           return result == null ? com.google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEvent.Type.UNRECOGNIZED : result;
         }
@@ -3285,13 +3194,11 @@ public Builder clearCompressedSizeBytes() {
           onChanged();
           return this;
         }
-        @java.lang.Override
         public final Builder setUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.setUnknownFieldsProto3(unknownFields);
         }
 
-        @java.lang.Override
         public final Builder mergeUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
@@ -3313,12 +3220,11 @@ public static com.google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEvent getD
 
       private static final com.google.protobuf.Parser
           PARSER = new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
         public MessageEvent parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new MessageEvent(input, extensionRegistry);
+            return new MessageEvent(input, extensionRegistry);
         }
       };
 
@@ -3331,7 +3237,6 @@ public com.google.protobuf.Parser getParserForType() {
         return PARSER;
       }
 
-      @java.lang.Override
       public com.google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEvent getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
@@ -3486,7 +3391,6 @@ public com.google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEventOrBuilder ge
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -3496,7 +3400,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (time_ != null) {
@@ -3511,7 +3414,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -3667,7 +3569,6 @@ public static com.google.devtools.cloudtrace.v2.Span.TimeEvent parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -3675,7 +3576,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.devtools.cloudtrace.v2.Span.TimeEvent prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -3703,7 +3603,6 @@ public static final class Builder extends
         return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_TimeEvent_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_TimeEvent_fieldAccessorTable
@@ -3726,7 +3625,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         if (timeBuilder_ == null) {
@@ -3740,18 +3638,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_TimeEvent_descriptor;
       }
 
-      @java.lang.Override
       public com.google.devtools.cloudtrace.v2.Span.TimeEvent getDefaultInstanceForType() {
         return com.google.devtools.cloudtrace.v2.Span.TimeEvent.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.devtools.cloudtrace.v2.Span.TimeEvent build() {
         com.google.devtools.cloudtrace.v2.Span.TimeEvent result = buildPartial();
         if (!result.isInitialized()) {
@@ -3760,7 +3655,6 @@ public com.google.devtools.cloudtrace.v2.Span.TimeEvent build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.devtools.cloudtrace.v2.Span.TimeEvent buildPartial() {
         com.google.devtools.cloudtrace.v2.Span.TimeEvent result = new com.google.devtools.cloudtrace.v2.Span.TimeEvent(this);
         if (timeBuilder_ == null) {
@@ -3787,39 +3681,32 @@ public com.google.devtools.cloudtrace.v2.Span.TimeEvent buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.devtools.cloudtrace.v2.Span.TimeEvent) {
           return mergeFrom((com.google.devtools.cloudtrace.v2.Span.TimeEvent)other);
@@ -3852,12 +3739,10 @@ public Builder mergeFrom(com.google.devtools.cloudtrace.v2.Span.TimeEvent other)
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4387,13 +4272,11 @@ public com.google.devtools.cloudtrace.v2.Span.TimeEvent.MessageEventOrBuilder ge
         onChanged();;
         return messageEventBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -4415,12 +4298,11 @@ public static com.google.devtools.cloudtrace.v2.Span.TimeEvent getDefaultInstanc
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public TimeEvent parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new TimeEvent(input, extensionRegistry);
+          return new TimeEvent(input, extensionRegistry);
       }
     };
 
@@ -4433,7 +4315,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v2.Span.TimeEvent getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -4542,9 +4423,6 @@ private TimeEvents(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -4556,6 +4434,13 @@ private TimeEvents(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
                 timeEvent_ = new java.util.ArrayList();
@@ -4575,13 +4460,6 @@ private TimeEvents(
               droppedMessageEventsCount_ = input.readInt32();
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -4602,7 +4480,6 @@ private TimeEvents(
       return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_TimeEvents_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_TimeEvents_fieldAccessorTable
@@ -4695,7 +4572,6 @@ public int getDroppedMessageEventsCount() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -4705,7 +4581,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < timeEvent_.size(); i++) {
@@ -4720,7 +4595,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -4854,7 +4728,6 @@ public static com.google.devtools.cloudtrace.v2.Span.TimeEvents parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -4862,7 +4735,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.devtools.cloudtrace.v2.Span.TimeEvents prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -4892,7 +4764,6 @@ public static final class Builder extends
         return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_TimeEvents_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_TimeEvents_fieldAccessorTable
@@ -4916,7 +4787,6 @@ private void maybeForceBuilderInitialization() {
           getTimeEventFieldBuilder();
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         if (timeEventBuilder_ == null) {
@@ -4932,18 +4802,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_TimeEvents_descriptor;
       }
 
-      @java.lang.Override
       public com.google.devtools.cloudtrace.v2.Span.TimeEvents getDefaultInstanceForType() {
         return com.google.devtools.cloudtrace.v2.Span.TimeEvents.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.devtools.cloudtrace.v2.Span.TimeEvents build() {
         com.google.devtools.cloudtrace.v2.Span.TimeEvents result = buildPartial();
         if (!result.isInitialized()) {
@@ -4952,7 +4819,6 @@ public com.google.devtools.cloudtrace.v2.Span.TimeEvents build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.devtools.cloudtrace.v2.Span.TimeEvents buildPartial() {
         com.google.devtools.cloudtrace.v2.Span.TimeEvents result = new com.google.devtools.cloudtrace.v2.Span.TimeEvents(this);
         int from_bitField0_ = bitField0_;
@@ -4973,39 +4839,32 @@ public com.google.devtools.cloudtrace.v2.Span.TimeEvents buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.devtools.cloudtrace.v2.Span.TimeEvents) {
           return mergeFrom((com.google.devtools.cloudtrace.v2.Span.TimeEvents)other);
@@ -5054,12 +4913,10 @@ public Builder mergeFrom(com.google.devtools.cloudtrace.v2.Span.TimeEvents other
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -5472,13 +5329,11 @@ public Builder clearDroppedMessageEventsCount() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -5500,12 +5355,11 @@ public static com.google.devtools.cloudtrace.v2.Span.TimeEvents getDefaultInstan
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public TimeEvents parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new TimeEvents(input, extensionRegistry);
+          return new TimeEvents(input, extensionRegistry);
       }
     };
 
@@ -5518,7 +5372,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v2.Span.TimeEvents getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -5645,9 +5498,6 @@ private Link(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -5659,6 +5509,13 @@ private Link(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -5690,13 +5547,6 @@ private Link(
 
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -5714,7 +5564,6 @@ private Link(
       return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_Link_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_Link_fieldAccessorTable
@@ -5962,7 +5811,6 @@ public int getTypeValue() {
      * .google.devtools.cloudtrace.v2.Span.Link.Type type = 3;
      */
     public com.google.devtools.cloudtrace.v2.Span.Link.Type getType() {
-      @SuppressWarnings("deprecation")
       com.google.devtools.cloudtrace.v2.Span.Link.Type result = com.google.devtools.cloudtrace.v2.Span.Link.Type.valueOf(type_);
       return result == null ? com.google.devtools.cloudtrace.v2.Span.Link.Type.UNRECOGNIZED : result;
     }
@@ -6004,7 +5852,6 @@ public com.google.devtools.cloudtrace.v2.Span.AttributesOrBuilder getAttributesO
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -6014,7 +5861,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getTraceIdBytes().isEmpty()) {
@@ -6032,7 +5878,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -6174,7 +6019,6 @@ public static com.google.devtools.cloudtrace.v2.Span.Link parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -6182,7 +6026,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.devtools.cloudtrace.v2.Span.Link prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -6213,7 +6056,6 @@ public static final class Builder extends
         return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_Link_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_Link_fieldAccessorTable
@@ -6236,7 +6078,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         traceId_ = "";
@@ -6254,18 +6095,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_Link_descriptor;
       }
 
-      @java.lang.Override
       public com.google.devtools.cloudtrace.v2.Span.Link getDefaultInstanceForType() {
         return com.google.devtools.cloudtrace.v2.Span.Link.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.devtools.cloudtrace.v2.Span.Link build() {
         com.google.devtools.cloudtrace.v2.Span.Link result = buildPartial();
         if (!result.isInitialized()) {
@@ -6274,7 +6112,6 @@ public com.google.devtools.cloudtrace.v2.Span.Link build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.devtools.cloudtrace.v2.Span.Link buildPartial() {
         com.google.devtools.cloudtrace.v2.Span.Link result = new com.google.devtools.cloudtrace.v2.Span.Link(this);
         result.traceId_ = traceId_;
@@ -6289,39 +6126,32 @@ public com.google.devtools.cloudtrace.v2.Span.Link buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.devtools.cloudtrace.v2.Span.Link) {
           return mergeFrom((com.google.devtools.cloudtrace.v2.Span.Link)other);
@@ -6352,12 +6182,10 @@ public Builder mergeFrom(com.google.devtools.cloudtrace.v2.Span.Link other) {
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -6585,7 +6413,6 @@ public Builder setTypeValue(int value) {
        * .google.devtools.cloudtrace.v2.Span.Link.Type type = 3;
        */
       public com.google.devtools.cloudtrace.v2.Span.Link.Type getType() {
-        @SuppressWarnings("deprecation")
         com.google.devtools.cloudtrace.v2.Span.Link.Type result = com.google.devtools.cloudtrace.v2.Span.Link.Type.valueOf(type_);
         return result == null ? com.google.devtools.cloudtrace.v2.Span.Link.Type.UNRECOGNIZED : result;
       }
@@ -6780,13 +6607,11 @@ public com.google.devtools.cloudtrace.v2.Span.AttributesOrBuilder getAttributesO
         }
         return attributesBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -6808,12 +6633,11 @@ public static com.google.devtools.cloudtrace.v2.Span.Link getDefaultInstance() {
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Link parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Link(input, extensionRegistry);
+          return new Link(input, extensionRegistry);
       }
     };
 
@@ -6826,7 +6650,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v2.Span.Link getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -6923,9 +6746,6 @@ private Links(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -6937,6 +6757,13 @@ private Links(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
                 link_ = new java.util.ArrayList();
@@ -6951,13 +6778,6 @@ private Links(
               droppedLinksCount_ = input.readInt32();
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -6978,7 +6798,6 @@ private Links(
       return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_Links_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_Links_fieldAccessorTable
@@ -7057,7 +6876,6 @@ public int getDroppedLinksCount() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -7067,7 +6885,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < link_.size(); i++) {
@@ -7079,7 +6896,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -7205,7 +7021,6 @@ public static com.google.devtools.cloudtrace.v2.Span.Links parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -7213,7 +7028,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.devtools.cloudtrace.v2.Span.Links prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -7242,7 +7056,6 @@ public static final class Builder extends
         return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_Links_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_Links_fieldAccessorTable
@@ -7266,7 +7079,6 @@ private void maybeForceBuilderInitialization() {
           getLinkFieldBuilder();
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         if (linkBuilder_ == null) {
@@ -7280,18 +7092,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_Links_descriptor;
       }
 
-      @java.lang.Override
       public com.google.devtools.cloudtrace.v2.Span.Links getDefaultInstanceForType() {
         return com.google.devtools.cloudtrace.v2.Span.Links.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.devtools.cloudtrace.v2.Span.Links build() {
         com.google.devtools.cloudtrace.v2.Span.Links result = buildPartial();
         if (!result.isInitialized()) {
@@ -7300,7 +7109,6 @@ public com.google.devtools.cloudtrace.v2.Span.Links build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.devtools.cloudtrace.v2.Span.Links buildPartial() {
         com.google.devtools.cloudtrace.v2.Span.Links result = new com.google.devtools.cloudtrace.v2.Span.Links(this);
         int from_bitField0_ = bitField0_;
@@ -7320,39 +7128,32 @@ public com.google.devtools.cloudtrace.v2.Span.Links buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.devtools.cloudtrace.v2.Span.Links) {
           return mergeFrom((com.google.devtools.cloudtrace.v2.Span.Links)other);
@@ -7398,12 +7199,10 @@ public Builder mergeFrom(com.google.devtools.cloudtrace.v2.Span.Links other) {
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -7775,13 +7574,11 @@ public Builder clearDroppedLinksCount() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -7803,12 +7600,11 @@ public static com.google.devtools.cloudtrace.v2.Span.Links getDefaultInstance()
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Links parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Links(input, extensionRegistry);
+          return new Links(input, extensionRegistry);
       }
     };
 
@@ -7821,7 +7617,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v2.Span.Links getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -8345,7 +8140,6 @@ public com.google.protobuf.Int32ValueOrBuilder getChildSpanCountOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -8355,7 +8149,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -8400,7 +8193,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -8659,7 +8451,6 @@ public static com.google.devtools.cloudtrace.v2.Span parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -8667,7 +8458,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.cloudtrace.v2.Span prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -8700,7 +8490,6 @@ public static final class Builder extends
       return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_fieldAccessorTable
@@ -8723,7 +8512,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -8795,18 +8583,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_Span_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v2.Span getDefaultInstanceForType() {
       return com.google.devtools.cloudtrace.v2.Span.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v2.Span build() {
       com.google.devtools.cloudtrace.v2.Span result = buildPartial();
       if (!result.isInitialized()) {
@@ -8815,7 +8600,6 @@ public com.google.devtools.cloudtrace.v2.Span build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v2.Span buildPartial() {
       com.google.devtools.cloudtrace.v2.Span result = new com.google.devtools.cloudtrace.v2.Span(this);
       result.name_ = name_;
@@ -8875,39 +8659,32 @@ public com.google.devtools.cloudtrace.v2.Span buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.cloudtrace.v2.Span) {
         return mergeFrom((com.google.devtools.cloudtrace.v2.Span)other);
@@ -8966,12 +8743,10 @@ public Builder mergeFrom(com.google.devtools.cloudtrace.v2.Span other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -10960,13 +10735,11 @@ public com.google.protobuf.Int32ValueOrBuilder getChildSpanCountOrBuilder() {
       }
       return childSpanCountBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -10988,12 +10761,11 @@ public static com.google.devtools.cloudtrace.v2.Span getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Span parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Span(input, extensionRegistry);
+        return new Span(input, extensionRegistry);
     }
   };
 
@@ -11006,7 +10778,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.cloudtrace.v2.Span getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/StackTrace.java b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/StackTrace.java
index 9c7916a24789..23c489249cdd 100644
--- a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/StackTrace.java
+++ b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/StackTrace.java
@@ -33,9 +33,6 @@ private StackTrace(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private StackTrace(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.devtools.cloudtrace.v2.StackTrace.StackFrames.Builder subBuilder = null;
             if (stackFrames_ != null) {
@@ -65,13 +69,6 @@ private StackTrace(
             stackTraceHashId_ = input.readInt64();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -89,7 +86,6 @@ private StackTrace(
     return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_StackTrace_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_StackTrace_fieldAccessorTable
@@ -288,9 +284,6 @@ private StackFrame(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -302,6 +295,13 @@ private StackFrame(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               com.google.devtools.cloudtrace.v2.TruncatableString.Builder subBuilder = null;
               if (functionName_ != null) {
@@ -377,13 +377,6 @@ private StackFrame(
 
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -401,7 +394,6 @@ private StackFrame(
       return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_StackTrace_StackFrame_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_StackTrace_StackFrame_fieldAccessorTable
@@ -614,7 +606,6 @@ public com.google.devtools.cloudtrace.v2.TruncatableStringOrBuilder getSourceVer
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -624,7 +615,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (functionName_ != null) {
@@ -651,7 +641,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -842,7 +831,6 @@ public static com.google.devtools.cloudtrace.v2.StackTrace.StackFrame parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -850,7 +838,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.devtools.cloudtrace.v2.StackTrace.StackFrame prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -878,7 +865,6 @@ public static final class Builder extends
         return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_StackTrace_StackFrame_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_StackTrace_StackFrame_fieldAccessorTable
@@ -901,7 +887,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         if (functionNameBuilder_ == null) {
@@ -941,18 +926,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_StackTrace_StackFrame_descriptor;
       }
 
-      @java.lang.Override
       public com.google.devtools.cloudtrace.v2.StackTrace.StackFrame getDefaultInstanceForType() {
         return com.google.devtools.cloudtrace.v2.StackTrace.StackFrame.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.devtools.cloudtrace.v2.StackTrace.StackFrame build() {
         com.google.devtools.cloudtrace.v2.StackTrace.StackFrame result = buildPartial();
         if (!result.isInitialized()) {
@@ -961,7 +943,6 @@ public com.google.devtools.cloudtrace.v2.StackTrace.StackFrame build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.devtools.cloudtrace.v2.StackTrace.StackFrame buildPartial() {
         com.google.devtools.cloudtrace.v2.StackTrace.StackFrame result = new com.google.devtools.cloudtrace.v2.StackTrace.StackFrame(this);
         if (functionNameBuilder_ == null) {
@@ -995,39 +976,32 @@ public com.google.devtools.cloudtrace.v2.StackTrace.StackFrame buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.devtools.cloudtrace.v2.StackTrace.StackFrame) {
           return mergeFrom((com.google.devtools.cloudtrace.v2.StackTrace.StackFrame)other);
@@ -1065,12 +1039,10 @@ public Builder mergeFrom(com.google.devtools.cloudtrace.v2.StackTrace.StackFrame
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1968,13 +1940,11 @@ public com.google.devtools.cloudtrace.v2.TruncatableStringOrBuilder getSourceVer
         }
         return sourceVersionBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1996,12 +1966,11 @@ public static com.google.devtools.cloudtrace.v2.StackTrace.StackFrame getDefault
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public StackFrame parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new StackFrame(input, extensionRegistry);
+          return new StackFrame(input, extensionRegistry);
       }
     };
 
@@ -2014,7 +1983,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v2.StackTrace.StackFrame getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -2111,9 +2079,6 @@ private StackFrames(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -2125,6 +2090,13 @@ private StackFrames(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
                 frame_ = new java.util.ArrayList();
@@ -2139,13 +2111,6 @@ private StackFrames(
               droppedFramesCount_ = input.readInt32();
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -2166,7 +2131,6 @@ private StackFrames(
       return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_StackTrace_StackFrames_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_StackTrace_StackFrames_fieldAccessorTable
@@ -2246,7 +2210,6 @@ public int getDroppedFramesCount() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -2256,7 +2219,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < frame_.size(); i++) {
@@ -2268,7 +2230,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -2394,7 +2355,6 @@ public static com.google.devtools.cloudtrace.v2.StackTrace.StackFrames parseFrom
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -2402,7 +2362,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.devtools.cloudtrace.v2.StackTrace.StackFrames prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -2430,7 +2389,6 @@ public static final class Builder extends
         return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_StackTrace_StackFrames_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_StackTrace_StackFrames_fieldAccessorTable
@@ -2454,7 +2412,6 @@ private void maybeForceBuilderInitialization() {
           getFrameFieldBuilder();
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         if (frameBuilder_ == null) {
@@ -2468,18 +2425,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_StackTrace_StackFrames_descriptor;
       }
 
-      @java.lang.Override
       public com.google.devtools.cloudtrace.v2.StackTrace.StackFrames getDefaultInstanceForType() {
         return com.google.devtools.cloudtrace.v2.StackTrace.StackFrames.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.devtools.cloudtrace.v2.StackTrace.StackFrames build() {
         com.google.devtools.cloudtrace.v2.StackTrace.StackFrames result = buildPartial();
         if (!result.isInitialized()) {
@@ -2488,7 +2442,6 @@ public com.google.devtools.cloudtrace.v2.StackTrace.StackFrames build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.devtools.cloudtrace.v2.StackTrace.StackFrames buildPartial() {
         com.google.devtools.cloudtrace.v2.StackTrace.StackFrames result = new com.google.devtools.cloudtrace.v2.StackTrace.StackFrames(this);
         int from_bitField0_ = bitField0_;
@@ -2508,39 +2461,32 @@ public com.google.devtools.cloudtrace.v2.StackTrace.StackFrames buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.devtools.cloudtrace.v2.StackTrace.StackFrames) {
           return mergeFrom((com.google.devtools.cloudtrace.v2.StackTrace.StackFrames)other);
@@ -2586,12 +2532,10 @@ public Builder mergeFrom(com.google.devtools.cloudtrace.v2.StackTrace.StackFrame
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2966,13 +2910,11 @@ public Builder clearDroppedFramesCount() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -2994,12 +2936,11 @@ public static com.google.devtools.cloudtrace.v2.StackTrace.StackFrames getDefaul
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public StackFrames parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new StackFrames(input, extensionRegistry);
+          return new StackFrames(input, extensionRegistry);
       }
     };
 
@@ -3012,7 +2953,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v2.StackTrace.StackFrames getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -3072,7 +3012,6 @@ public long getStackTraceHashId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -3082,7 +3021,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (stackFrames_ != null) {
@@ -3094,7 +3032,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -3224,7 +3161,6 @@ public static com.google.devtools.cloudtrace.v2.StackTrace parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -3232,7 +3168,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.cloudtrace.v2.StackTrace prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -3260,7 +3195,6 @@ public static final class Builder extends
       return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_StackTrace_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_StackTrace_fieldAccessorTable
@@ -3283,7 +3217,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (stackFramesBuilder_ == null) {
@@ -3297,18 +3230,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_StackTrace_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v2.StackTrace getDefaultInstanceForType() {
       return com.google.devtools.cloudtrace.v2.StackTrace.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v2.StackTrace build() {
       com.google.devtools.cloudtrace.v2.StackTrace result = buildPartial();
       if (!result.isInitialized()) {
@@ -3317,7 +3247,6 @@ public com.google.devtools.cloudtrace.v2.StackTrace build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v2.StackTrace buildPartial() {
       com.google.devtools.cloudtrace.v2.StackTrace result = new com.google.devtools.cloudtrace.v2.StackTrace(this);
       if (stackFramesBuilder_ == null) {
@@ -3330,39 +3259,32 @@ public com.google.devtools.cloudtrace.v2.StackTrace buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.cloudtrace.v2.StackTrace) {
         return mergeFrom((com.google.devtools.cloudtrace.v2.StackTrace)other);
@@ -3385,12 +3307,10 @@ public Builder mergeFrom(com.google.devtools.cloudtrace.v2.StackTrace other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3617,13 +3537,11 @@ public Builder clearStackTraceHashId() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -3645,12 +3563,11 @@ public static com.google.devtools.cloudtrace.v2.StackTrace getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public StackTrace parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StackTrace(input, extensionRegistry);
+        return new StackTrace(input, extensionRegistry);
     }
   };
 
@@ -3663,7 +3580,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.cloudtrace.v2.StackTrace getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TraceProto.java b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TraceProto.java
index 6082924361a2..119e7fa5766b 100644
--- a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TraceProto.java
+++ b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TraceProto.java
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "rent_span_id\030\003 \001(\t\022F\n\014display_name\030\004 \001(\013" +
       "20.google.devtools.cloudtrace.v2.Truncat" +
       "ableString\022.\n\nstart_time\030\005 \001(\0132\032.google." +
-      "protobuf.Timestamp\022,\n\010end_time\030\006 \001(\0132\032.g" +
+      "protobuf.Timestamp\022,\n\010end_time\030\006 \001(\0132\032.g",
       "oogle.protobuf.Timestamp\022B\n\nattributes\030\007" +
       " \001(\0132..google.devtools.cloudtrace.v2.Spa" +
       "n.Attributes\022>\n\013stack_trace\030\010 \001(\0132).goog" +
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       "2).google.devtools.cloudtrace.v2.Span.Li" +
       "nks\022\"\n\006status\030\013 \001(\0132\022.google.rpc.Status\022" +
       "?\n\033same_process_as_parent_span\030\014 \001(\0132\032.g" +
-      "oogle.protobuf.BoolValue\0225\n\020child_span_c" +
+      "oogle.protobuf.BoolValue\0225\n\020child_span_c",
       "ount\030\r \001(\0132\033.google.protobuf.Int32Value\032" +
       "\353\001\n\nAttributes\022W\n\rattribute_map\030\001 \003(\0132@." +
       "google.devtools.cloudtrace.v2.Span.Attri" +
@@ -127,7 +127,7 @@ public static void registerAllExtensions(
       "ools.cloudtrace.v2.AttributeValue:\0028\001\032\337\004" +
       "\n\tTimeEvent\022(\n\004time\030\001 \001(\0132\032.google.proto" +
       "buf.Timestamp\022N\n\nannotation\030\002 \001(\01328.goog" +
-      "le.devtools.cloudtrace.v2.Span.TimeEvent" +
+      "le.devtools.cloudtrace.v2.Span.TimeEvent",
       ".AnnotationH\000\022S\n\rmessage_event\030\003 \001(\0132:.g" +
       "oogle.devtools.cloudtrace.v2.Span.TimeEv" +
       "ent.MessageEventH\000\032\227\001\n\nAnnotation\022E\n\013des" +
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       "n.Attributes\032\337\001\n\014MessageEvent\022M\n\004type\030\001 " +
       "\001(\0162?.google.devtools.cloudtrace.v2.Span" +
       ".TimeEvent.MessageEvent.Type\022\n\n\002id\030\002 \001(\003" +
-      "\022\037\n\027uncompressed_size_bytes\030\003 \001(\003\022\035\n\025com" +
+      "\022\037\n\027uncompressed_size_bytes\030\003 \001(\003\022\035\n\025com",
       "pressed_size_bytes\030\004 \001(\003\"4\n\004Type\022\024\n\020TYPE" +
       "_UNSPECIFIED\020\000\022\010\n\004SENT\020\001\022\014\n\010RECEIVED\020\002B\007" +
       "\n\005value\032\230\001\n\nTimeEvents\022A\n\ntime_event\030\001 \003" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "(\005\032\367\001\n\004Link\022\020\n\010trace_id\030\001 \001(\t\022\017\n\007span_id" +
       "\030\002 \001(\t\022;\n\004type\030\003 \001(\0162-.google.devtools.c" +
       "loudtrace.v2.Span.Link.Type\022B\n\nattribute" +
-      "s\030\004 \001(\0132..google.devtools.cloudtrace.v2." +
+      "s\030\004 \001(\0132..google.devtools.cloudtrace.v2.",
       "Span.Attributes\"K\n\004Type\022\024\n\020TYPE_UNSPECIF" +
       "IED\020\000\022\025\n\021CHILD_LINKED_SPAN\020\001\022\026\n\022PARENT_L" +
       "INKED_SPAN\020\002\032\\\n\005Links\0226\n\004link\030\001 \003(\0132(.go" +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       "tools.cloudtrace.v2.TruncatableStringH\000\022" +
       "\023\n\tint_value\030\002 \001(\003H\000\022\024\n\nbool_value\030\003 \001(\010" +
       "H\000B\007\n\005value\"\211\005\n\nStackTrace\022K\n\014stack_fram" +
-      "es\030\001 \001(\01325.google.devtools.cloudtrace.v2" +
+      "es\030\001 \001(\01325.google.devtools.cloudtrace.v2",
       ".StackTrace.StackFrames\022\033\n\023stack_trace_h" +
       "ash_id\030\002 \001(\003\032\236\003\n\nStackFrame\022G\n\rfunction_" +
       "name\030\001 \001(\01320.google.devtools.cloudtrace." +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       "\01320.google.devtools.cloudtrace.v2.Trunca" +
       "tableString\022\023\n\013line_number\030\004 \001(\003\022\025\n\rcolu" +
       "mn_number\030\005 \001(\003\022:\n\013load_module\030\006 \001(\0132%.g" +
-      "oogle.devtools.cloudtrace.v2.Module\022H\n\016s" +
+      "oogle.devtools.cloudtrace.v2.Module\022H\n\016s",
       "ource_version\030\007 \001(\01320.google.devtools.cl" +
       "oudtrace.v2.TruncatableString\032p\n\013StackFr" +
       "ames\022C\n\005frame\030\001 \003(\01324.google.devtools.cl" +
@@ -177,7 +177,7 @@ public static void registerAllExtensions(
       "v2.TruncatableString\022B\n\010build_id\030\002 \001(\01320" +
       ".google.devtools.cloudtrace.v2.Truncatab" +
       "leString\"@\n\021TruncatableString\022\r\n\005value\030\001" +
-      " \001(\t\022\034\n\024truncated_byte_count\030\002 \001(\005B\252\001\n!c" +
+      " \001(\t\022\034\n\024truncated_byte_count\030\002 \001(\005B\252\001\n!c",
       "om.google.devtools.cloudtrace.v2B\nTraceP" +
       "rotoP\001ZGgoogle.golang.org/genproto/googl" +
       "eapis/devtools/cloudtrace/v2;cloudtrace\252" +
diff --git a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TracingProto.java b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TracingProto.java
index 8d8c12f0f4af..0035c5cdaae0 100644
--- a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TracingProto.java
+++ b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TracingProto.java
@@ -37,7 +37,7 @@ public static void registerAllExtensions(
       "\004name\030\001 \001(\t\0222\n\005spans\030\002 \003(\0132#.google.devt" +
       "ools.cloudtrace.v2.Span2\257\002\n\014TraceService" +
       "\022\224\001\n\017BatchWriteSpans\0225.google.devtools.c" +
-      "loudtrace.v2.BatchWriteSpansRequest\032\026.go" +
+      "loudtrace.v2.BatchWriteSpansRequest\032\026.go",
       "ogle.protobuf.Empty\"2\202\323\344\223\002,\"\'/v2/{name=p" +
       "rojects/*}/traces:batchWrite:\001*\022\207\001\n\nCrea" +
       "teSpan\022#.google.devtools.cloudtrace.v2.S" +
diff --git a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TruncatableString.java b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TruncatableString.java
index 188993aa1324..67922d39350e 100644
--- a/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TruncatableString.java
+++ b/google-api-grpc/proto-google-cloud-trace-v2/src/main/java/com/google/devtools/cloudtrace/v2/TruncatableString.java
@@ -34,9 +34,6 @@ private TruncatableString(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private TruncatableString(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -59,13 +63,6 @@ private TruncatableString(
             truncatedByteCount_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private TruncatableString(
     return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_TruncatableString_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_TruncatableString_fieldAccessorTable
@@ -158,7 +154,6 @@ public int getTruncatedByteCount() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -168,7 +163,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getValueBytes().isEmpty()) {
@@ -180,7 +174,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -303,7 +296,6 @@ public static com.google.devtools.cloudtrace.v2.TruncatableString parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -311,7 +303,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.devtools.cloudtrace.v2.TruncatableString prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -339,7 +330,6 @@ public static final class Builder extends
       return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_TruncatableString_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_TruncatableString_fieldAccessorTable
@@ -362,7 +352,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       value_ = "";
@@ -372,18 +361,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.devtools.cloudtrace.v2.TraceProto.internal_static_google_devtools_cloudtrace_v2_TruncatableString_descriptor;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v2.TruncatableString getDefaultInstanceForType() {
       return com.google.devtools.cloudtrace.v2.TruncatableString.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v2.TruncatableString build() {
       com.google.devtools.cloudtrace.v2.TruncatableString result = buildPartial();
       if (!result.isInitialized()) {
@@ -392,7 +378,6 @@ public com.google.devtools.cloudtrace.v2.TruncatableString build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.devtools.cloudtrace.v2.TruncatableString buildPartial() {
       com.google.devtools.cloudtrace.v2.TruncatableString result = new com.google.devtools.cloudtrace.v2.TruncatableString(this);
       result.value_ = value_;
@@ -401,39 +386,32 @@ public com.google.devtools.cloudtrace.v2.TruncatableString buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.devtools.cloudtrace.v2.TruncatableString) {
         return mergeFrom((com.google.devtools.cloudtrace.v2.TruncatableString)other);
@@ -457,12 +435,10 @@ public Builder mergeFrom(com.google.devtools.cloudtrace.v2.TruncatableString oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -635,13 +611,11 @@ public Builder clearTruncatedByteCount() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -663,12 +637,11 @@ public static com.google.devtools.cloudtrace.v2.TruncatableString getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TruncatableString parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TruncatableString(input, extensionRegistry);
+        return new TruncatableString(input, extensionRegistry);
     }
   };
 
@@ -681,7 +654,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.devtools.cloudtrace.v2.TruncatableString getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoProgress.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoProgress.java
index 64b38a9cbf22..2a5ae39caa2d 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoProgress.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoProgress.java
@@ -35,9 +35,6 @@ private AnnotateVideoProgress(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private AnnotateVideoProgress(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               annotationProgress_ = new java.util.ArrayList();
@@ -58,13 +62,6 @@ private AnnotateVideoProgress(
                 input.readMessage(com.google.cloud.videointelligence.v1.VideoAnnotationProgress.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -85,7 +82,6 @@ private AnnotateVideoProgress(
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_AnnotateVideoProgress_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_AnnotateVideoProgress_fieldAccessorTable
@@ -149,7 +145,6 @@ public com.google.cloud.videointelligence.v1.VideoAnnotationProgressOrBuilder ge
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -159,7 +154,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < annotationProgress_.size(); i++) {
@@ -168,7 +162,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -286,7 +279,6 @@ public static com.google.cloud.videointelligence.v1.AnnotateVideoProgress parseF
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -294,7 +286,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1.AnnotateVideoProgress prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -324,7 +315,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_AnnotateVideoProgress_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_AnnotateVideoProgress_fieldAccessorTable
@@ -348,7 +338,6 @@ private void maybeForceBuilderInitialization() {
         getAnnotationProgressFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (annotationProgressBuilder_ == null) {
@@ -360,18 +349,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_AnnotateVideoProgress_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.AnnotateVideoProgress getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1.AnnotateVideoProgress.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.AnnotateVideoProgress build() {
       com.google.cloud.videointelligence.v1.AnnotateVideoProgress result = buildPartial();
       if (!result.isInitialized()) {
@@ -380,7 +366,6 @@ public com.google.cloud.videointelligence.v1.AnnotateVideoProgress build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.AnnotateVideoProgress buildPartial() {
       com.google.cloud.videointelligence.v1.AnnotateVideoProgress result = new com.google.cloud.videointelligence.v1.AnnotateVideoProgress(this);
       int from_bitField0_ = bitField0_;
@@ -397,39 +382,32 @@ public com.google.cloud.videointelligence.v1.AnnotateVideoProgress buildPartial(
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1.AnnotateVideoProgress) {
         return mergeFrom((com.google.cloud.videointelligence.v1.AnnotateVideoProgress)other);
@@ -472,12 +450,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1.AnnotateVideoProg
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -808,13 +784,11 @@ public com.google.cloud.videointelligence.v1.VideoAnnotationProgress.Builder add
       }
       return annotationProgressBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -836,12 +810,11 @@ public static com.google.cloud.videointelligence.v1.AnnotateVideoProgress getDef
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnnotateVideoProgress parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateVideoProgress(input, extensionRegistry);
+        return new AnnotateVideoProgress(input, extensionRegistry);
     }
   };
 
@@ -854,7 +827,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1.AnnotateVideoProgress getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoRequest.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoRequest.java
index ec0a0c1d525e..125353fdb312 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoRequest.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoRequest.java
@@ -37,9 +37,6 @@ private AnnotateVideoRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private AnnotateVideoRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -110,13 +114,6 @@ private AnnotateVideoRequest(
             inputContent_ = input.readBytes();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -137,7 +134,6 @@ private AnnotateVideoRequest(
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_AnnotateVideoRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_AnnotateVideoRequest_fieldAccessorTable
@@ -228,7 +224,6 @@ public com.google.protobuf.ByteString getInputContent() {
           new com.google.protobuf.Internal.ListAdapter.Converter<
               java.lang.Integer, com.google.cloud.videointelligence.v1.Feature>() {
             public com.google.cloud.videointelligence.v1.Feature convert(java.lang.Integer from) {
-              @SuppressWarnings("deprecation")
               com.google.cloud.videointelligence.v1.Feature result = com.google.cloud.videointelligence.v1.Feature.valueOf(from);
               return result == null ? com.google.cloud.videointelligence.v1.Feature.UNRECOGNIZED : result;
             }
@@ -419,7 +414,6 @@ public java.lang.String getLocationId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -429,7 +423,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     getSerializedSize();
@@ -458,7 +451,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -625,7 +617,6 @@ public static com.google.cloud.videointelligence.v1.AnnotateVideoRequest parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -633,7 +624,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1.AnnotateVideoRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -661,7 +651,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_AnnotateVideoRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_AnnotateVideoRequest_fieldAccessorTable
@@ -684,7 +673,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       inputUri_ = "";
@@ -706,18 +694,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_AnnotateVideoRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.AnnotateVideoRequest getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1.AnnotateVideoRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.AnnotateVideoRequest build() {
       com.google.cloud.videointelligence.v1.AnnotateVideoRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -726,7 +711,6 @@ public com.google.cloud.videointelligence.v1.AnnotateVideoRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.AnnotateVideoRequest buildPartial() {
       com.google.cloud.videointelligence.v1.AnnotateVideoRequest result = new com.google.cloud.videointelligence.v1.AnnotateVideoRequest(this);
       int from_bitField0_ = bitField0_;
@@ -750,39 +734,32 @@ public com.google.cloud.videointelligence.v1.AnnotateVideoRequest buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1.AnnotateVideoRequest) {
         return mergeFrom((com.google.cloud.videointelligence.v1.AnnotateVideoRequest)other);
@@ -827,12 +804,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1.AnnotateVideoRequ
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1564,13 +1539,11 @@ public Builder setLocationIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1592,12 +1565,11 @@ public static com.google.cloud.videointelligence.v1.AnnotateVideoRequest getDefa
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnnotateVideoRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateVideoRequest(input, extensionRegistry);
+        return new AnnotateVideoRequest(input, extensionRegistry);
     }
   };
 
@@ -1610,7 +1582,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1.AnnotateVideoRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoResponse.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoResponse.java
index d7c4e718e5f2..bcf7a3df6d4e 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoResponse.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/AnnotateVideoResponse.java
@@ -35,9 +35,6 @@ private AnnotateVideoResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private AnnotateVideoResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               annotationResults_ = new java.util.ArrayList();
@@ -58,13 +62,6 @@ private AnnotateVideoResponse(
                 input.readMessage(com.google.cloud.videointelligence.v1.VideoAnnotationResults.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -85,7 +82,6 @@ private AnnotateVideoResponse(
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_AnnotateVideoResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_AnnotateVideoResponse_fieldAccessorTable
@@ -149,7 +145,6 @@ public com.google.cloud.videointelligence.v1.VideoAnnotationResultsOrBuilder get
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -159,7 +154,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < annotationResults_.size(); i++) {
@@ -168,7 +162,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -286,7 +279,6 @@ public static com.google.cloud.videointelligence.v1.AnnotateVideoResponse parseF
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -294,7 +286,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1.AnnotateVideoResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -324,7 +315,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_AnnotateVideoResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_AnnotateVideoResponse_fieldAccessorTable
@@ -348,7 +338,6 @@ private void maybeForceBuilderInitialization() {
         getAnnotationResultsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (annotationResultsBuilder_ == null) {
@@ -360,18 +349,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_AnnotateVideoResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.AnnotateVideoResponse getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1.AnnotateVideoResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.AnnotateVideoResponse build() {
       com.google.cloud.videointelligence.v1.AnnotateVideoResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -380,7 +366,6 @@ public com.google.cloud.videointelligence.v1.AnnotateVideoResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.AnnotateVideoResponse buildPartial() {
       com.google.cloud.videointelligence.v1.AnnotateVideoResponse result = new com.google.cloud.videointelligence.v1.AnnotateVideoResponse(this);
       int from_bitField0_ = bitField0_;
@@ -397,39 +382,32 @@ public com.google.cloud.videointelligence.v1.AnnotateVideoResponse buildPartial(
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1.AnnotateVideoResponse) {
         return mergeFrom((com.google.cloud.videointelligence.v1.AnnotateVideoResponse)other);
@@ -472,12 +450,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1.AnnotateVideoResp
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -808,13 +784,11 @@ public com.google.cloud.videointelligence.v1.VideoAnnotationResults.Builder addA
       }
       return annotationResultsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -836,12 +810,11 @@ public static com.google.cloud.videointelligence.v1.AnnotateVideoResponse getDef
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnnotateVideoResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateVideoResponse(input, extensionRegistry);
+        return new AnnotateVideoResponse(input, extensionRegistry);
     }
   };
 
@@ -854,7 +827,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1.AnnotateVideoResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/Entity.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/Entity.java
index c56018fe6d71..aa48a86b39de 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/Entity.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/Entity.java
@@ -35,9 +35,6 @@ private Entity(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private Entity(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -67,13 +71,6 @@ private Entity(
             languageCode_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private Entity(
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_Entity_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_Entity_fieldAccessorTable
@@ -230,7 +226,6 @@ public java.lang.String getLanguageCode() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -240,7 +235,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getEntityIdBytes().isEmpty()) {
@@ -255,7 +249,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -384,7 +377,6 @@ public static com.google.cloud.videointelligence.v1.Entity parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -392,7 +384,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1.Entity prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -420,7 +411,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_Entity_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_Entity_fieldAccessorTable
@@ -443,7 +433,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       entityId_ = "";
@@ -455,18 +444,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_Entity_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.Entity getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1.Entity.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.Entity build() {
       com.google.cloud.videointelligence.v1.Entity result = buildPartial();
       if (!result.isInitialized()) {
@@ -475,7 +461,6 @@ public com.google.cloud.videointelligence.v1.Entity build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.Entity buildPartial() {
       com.google.cloud.videointelligence.v1.Entity result = new com.google.cloud.videointelligence.v1.Entity(this);
       result.entityId_ = entityId_;
@@ -485,39 +470,32 @@ public com.google.cloud.videointelligence.v1.Entity buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1.Entity) {
         return mergeFrom((com.google.cloud.videointelligence.v1.Entity)other);
@@ -546,12 +524,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1.Entity other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -846,13 +822,11 @@ public Builder setLanguageCodeBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -874,12 +848,11 @@ public static com.google.cloud.videointelligence.v1.Entity getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Entity parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Entity(input, extensionRegistry);
+        return new Entity(input, extensionRegistry);
     }
   };
 
@@ -892,7 +865,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1.Entity getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentAnnotation.java
index ff6d2e2f32f3..e4c5aeaac040 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentAnnotation.java
@@ -35,9 +35,6 @@ private ExplicitContentAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ExplicitContentAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               frames_ = new java.util.ArrayList();
@@ -58,13 +62,6 @@ private ExplicitContentAnnotation(
                 input.readMessage(com.google.cloud.videointelligence.v1.ExplicitContentFrame.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -85,7 +82,6 @@ private ExplicitContentAnnotation(
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_ExplicitContentAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_ExplicitContentAnnotation_fieldAccessorTable
@@ -149,7 +145,6 @@ public com.google.cloud.videointelligence.v1.ExplicitContentFrameOrBuilder getFr
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -159,7 +154,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < frames_.size(); i++) {
@@ -168,7 +162,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -286,7 +279,6 @@ public static com.google.cloud.videointelligence.v1.ExplicitContentAnnotation pa
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -294,7 +286,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1.ExplicitContentAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -324,7 +315,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_ExplicitContentAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_ExplicitContentAnnotation_fieldAccessorTable
@@ -348,7 +338,6 @@ private void maybeForceBuilderInitialization() {
         getFramesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (framesBuilder_ == null) {
@@ -360,18 +349,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_ExplicitContentAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.ExplicitContentAnnotation getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1.ExplicitContentAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.ExplicitContentAnnotation build() {
       com.google.cloud.videointelligence.v1.ExplicitContentAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -380,7 +366,6 @@ public com.google.cloud.videointelligence.v1.ExplicitContentAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.ExplicitContentAnnotation buildPartial() {
       com.google.cloud.videointelligence.v1.ExplicitContentAnnotation result = new com.google.cloud.videointelligence.v1.ExplicitContentAnnotation(this);
       int from_bitField0_ = bitField0_;
@@ -397,39 +382,32 @@ public com.google.cloud.videointelligence.v1.ExplicitContentAnnotation buildPart
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1.ExplicitContentAnnotation) {
         return mergeFrom((com.google.cloud.videointelligence.v1.ExplicitContentAnnotation)other);
@@ -472,12 +450,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1.ExplicitContentAn
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -808,13 +784,11 @@ public com.google.cloud.videointelligence.v1.ExplicitContentFrame.Builder addFra
       }
       return framesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -836,12 +810,11 @@ public static com.google.cloud.videointelligence.v1.ExplicitContentAnnotation ge
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ExplicitContentAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ExplicitContentAnnotation(input, extensionRegistry);
+        return new ExplicitContentAnnotation(input, extensionRegistry);
     }
   };
 
@@ -854,7 +827,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1.ExplicitContentAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentDetectionConfig.java
index cb85cda7e0ed..1b2e77d826e2 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentDetectionConfig.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentDetectionConfig.java
@@ -33,9 +33,6 @@ private ExplicitContentDetectionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private ExplicitContentDetectionConfig(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            model_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private ExplicitContentDetectionConfig(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            model_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private ExplicitContentDetectionConfig(
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_ExplicitContentDetectionConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_ExplicitContentDetectionConfig_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getModel() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getModelBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.videointelligence.v1.ExplicitContentDetectionConf
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1.ExplicitContentDetectionConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_ExplicitContentDetectionConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_ExplicitContentDetectionConfig_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       model_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_ExplicitContentDetectionConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.ExplicitContentDetectionConfig getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1.ExplicitContentDetectionConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.ExplicitContentDetectionConfig build() {
       com.google.cloud.videointelligence.v1.ExplicitContentDetectionConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.videointelligence.v1.ExplicitContentDetectionConfig buil
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.ExplicitContentDetectionConfig buildPartial() {
       com.google.cloud.videointelligence.v1.ExplicitContentDetectionConfig result = new com.google.cloud.videointelligence.v1.ExplicitContentDetectionConfig(this);
       result.model_ = model_;
@@ -361,39 +346,32 @@ public com.google.cloud.videointelligence.v1.ExplicitContentDetectionConfig buil
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1.ExplicitContentDetectionConfig) {
         return mergeFrom((com.google.cloud.videointelligence.v1.ExplicitContentDetectionConfig)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1.ExplicitContentDe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setModelBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.videointelligence.v1.ExplicitContentDetectionConf
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ExplicitContentDetectionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ExplicitContentDetectionConfig(input, extensionRegistry);
+        return new ExplicitContentDetectionConfig(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForTy
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1.ExplicitContentDetectionConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentFrame.java
index 2c1405b8c52a..f32515a24bc6 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentFrame.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ExplicitContentFrame.java
@@ -33,9 +33,6 @@ private ExplicitContentFrame(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ExplicitContentFrame(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.protobuf.Duration.Builder subBuilder = null;
             if (timeOffset_ != null) {
@@ -66,13 +70,6 @@ private ExplicitContentFrame(
             pornographyLikelihood_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ExplicitContentFrame(
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_ExplicitContentFrame_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_ExplicitContentFrame_fieldAccessorTable
@@ -154,13 +150,11 @@ public int getPornographyLikelihoodValue() {
    * .google.cloud.videointelligence.v1.Likelihood pornography_likelihood = 2;
    */
   public com.google.cloud.videointelligence.v1.Likelihood getPornographyLikelihood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.videointelligence.v1.Likelihood result = com.google.cloud.videointelligence.v1.Likelihood.valueOf(pornographyLikelihood_);
     return result == null ? com.google.cloud.videointelligence.v1.Likelihood.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -170,7 +164,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (timeOffset_ != null) {
@@ -182,7 +175,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -310,7 +302,6 @@ public static com.google.cloud.videointelligence.v1.ExplicitContentFrame parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -318,7 +309,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1.ExplicitContentFrame prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -346,7 +336,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_ExplicitContentFrame_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_ExplicitContentFrame_fieldAccessorTable
@@ -369,7 +358,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (timeOffsetBuilder_ == null) {
@@ -383,18 +371,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_ExplicitContentFrame_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.ExplicitContentFrame getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1.ExplicitContentFrame.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.ExplicitContentFrame build() {
       com.google.cloud.videointelligence.v1.ExplicitContentFrame result = buildPartial();
       if (!result.isInitialized()) {
@@ -403,7 +388,6 @@ public com.google.cloud.videointelligence.v1.ExplicitContentFrame build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.ExplicitContentFrame buildPartial() {
       com.google.cloud.videointelligence.v1.ExplicitContentFrame result = new com.google.cloud.videointelligence.v1.ExplicitContentFrame(this);
       if (timeOffsetBuilder_ == null) {
@@ -416,39 +400,32 @@ public com.google.cloud.videointelligence.v1.ExplicitContentFrame buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1.ExplicitContentFrame) {
         return mergeFrom((com.google.cloud.videointelligence.v1.ExplicitContentFrame)other);
@@ -471,12 +448,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1.ExplicitContentFr
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -688,7 +663,6 @@ public Builder setPornographyLikelihoodValue(int value) {
      * .google.cloud.videointelligence.v1.Likelihood pornography_likelihood = 2;
      */
     public com.google.cloud.videointelligence.v1.Likelihood getPornographyLikelihood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.videointelligence.v1.Likelihood result = com.google.cloud.videointelligence.v1.Likelihood.valueOf(pornographyLikelihood_);
       return result == null ? com.google.cloud.videointelligence.v1.Likelihood.UNRECOGNIZED : result;
     }
@@ -721,13 +695,11 @@ public Builder clearPornographyLikelihood() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -749,12 +721,11 @@ public static com.google.cloud.videointelligence.v1.ExplicitContentFrame getDefa
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ExplicitContentFrame parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ExplicitContentFrame(input, extensionRegistry);
+        return new ExplicitContentFrame(input, extensionRegistry);
     }
   };
 
@@ -767,7 +738,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1.ExplicitContentFrame getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceAnnotation.java
index 3a5f35b2756f..267fda2b6e36 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceAnnotation.java
@@ -35,9 +35,6 @@ private FaceAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private FaceAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
 
             thumbnail_ = input.readBytes();
@@ -72,13 +76,6 @@ private FaceAnnotation(
                 input.readMessage(com.google.cloud.videointelligence.v1.FaceFrame.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -102,7 +99,6 @@ private FaceAnnotation(
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_FaceAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_FaceAnnotation_fieldAccessorTable
@@ -235,7 +231,6 @@ public com.google.cloud.videointelligence.v1.FaceFrameOrBuilder getFramesOrBuild
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -245,7 +240,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!thumbnail_.isEmpty()) {
@@ -260,7 +254,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -396,7 +389,6 @@ public static com.google.cloud.videointelligence.v1.FaceAnnotation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -404,7 +396,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1.FaceAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -432,7 +423,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_FaceAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_FaceAnnotation_fieldAccessorTable
@@ -457,7 +447,6 @@ private void maybeForceBuilderInitialization() {
         getFramesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       thumbnail_ = com.google.protobuf.ByteString.EMPTY;
@@ -477,18 +466,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_FaceAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.FaceAnnotation getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1.FaceAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.FaceAnnotation build() {
       com.google.cloud.videointelligence.v1.FaceAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -497,7 +483,6 @@ public com.google.cloud.videointelligence.v1.FaceAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.FaceAnnotation buildPartial() {
       com.google.cloud.videointelligence.v1.FaceAnnotation result = new com.google.cloud.videointelligence.v1.FaceAnnotation(this);
       int from_bitField0_ = bitField0_;
@@ -526,39 +511,32 @@ public com.google.cloud.videointelligence.v1.FaceAnnotation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1.FaceAnnotation) {
         return mergeFrom((com.google.cloud.videointelligence.v1.FaceAnnotation)other);
@@ -630,12 +608,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1.FaceAnnotation ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1319,13 +1295,11 @@ public com.google.cloud.videointelligence.v1.FaceFrame.Builder addFramesBuilder(
       }
       return framesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1347,12 +1321,11 @@ public static com.google.cloud.videointelligence.v1.FaceAnnotation getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public FaceAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FaceAnnotation(input, extensionRegistry);
+        return new FaceAnnotation(input, extensionRegistry);
     }
   };
 
@@ -1365,7 +1338,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1.FaceAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceDetectionConfig.java
index 20a1cf8e977a..cc057326f5b4 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceDetectionConfig.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceDetectionConfig.java
@@ -34,9 +34,6 @@ private FaceDetectionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private FaceDetectionConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -59,13 +63,6 @@ private FaceDetectionConfig(
             includeBoundingBoxes_ = input.readBool();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private FaceDetectionConfig(
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_FaceDetectionConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_FaceDetectionConfig_fieldAccessorTable
@@ -151,7 +147,6 @@ public boolean getIncludeBoundingBoxes() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -161,7 +156,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getModelBytes().isEmpty()) {
@@ -173,7 +167,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -297,7 +290,6 @@ public static com.google.cloud.videointelligence.v1.FaceDetectionConfig parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -305,7 +297,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1.FaceDetectionConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -333,7 +324,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_FaceDetectionConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_FaceDetectionConfig_fieldAccessorTable
@@ -356,7 +346,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       model_ = "";
@@ -366,18 +355,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_FaceDetectionConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.FaceDetectionConfig getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1.FaceDetectionConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.FaceDetectionConfig build() {
       com.google.cloud.videointelligence.v1.FaceDetectionConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -386,7 +372,6 @@ public com.google.cloud.videointelligence.v1.FaceDetectionConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.FaceDetectionConfig buildPartial() {
       com.google.cloud.videointelligence.v1.FaceDetectionConfig result = new com.google.cloud.videointelligence.v1.FaceDetectionConfig(this);
       result.model_ = model_;
@@ -395,39 +380,32 @@ public com.google.cloud.videointelligence.v1.FaceDetectionConfig buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1.FaceDetectionConfig) {
         return mergeFrom((com.google.cloud.videointelligence.v1.FaceDetectionConfig)other);
@@ -451,12 +429,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1.FaceDetectionConf
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -611,13 +587,11 @@ public Builder clearIncludeBoundingBoxes() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -639,12 +613,11 @@ public static com.google.cloud.videointelligence.v1.FaceDetectionConfig getDefau
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public FaceDetectionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FaceDetectionConfig(input, extensionRegistry);
+        return new FaceDetectionConfig(input, extensionRegistry);
     }
   };
 
@@ -657,7 +630,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1.FaceDetectionConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceFrame.java
index 5fcc1ad751fc..fc8b3345fc1c 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceFrame.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceFrame.java
@@ -33,9 +33,6 @@ private FaceFrame(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private FaceFrame(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               normalizedBoundingBoxes_ = new java.util.ArrayList();
@@ -69,13 +73,6 @@ private FaceFrame(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private FaceFrame(
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_FaceFrame_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_FaceFrame_fieldAccessorTable
@@ -207,7 +203,6 @@ public com.google.protobuf.DurationOrBuilder getTimeOffsetOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -217,7 +212,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < normalizedBoundingBoxes_.size(); i++) {
@@ -229,7 +223,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -360,7 +353,6 @@ public static com.google.cloud.videointelligence.v1.FaceFrame parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -368,7 +360,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1.FaceFrame prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -396,7 +387,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_FaceFrame_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_FaceFrame_fieldAccessorTable
@@ -420,7 +410,6 @@ private void maybeForceBuilderInitialization() {
         getNormalizedBoundingBoxesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (normalizedBoundingBoxesBuilder_ == null) {
@@ -438,18 +427,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_FaceFrame_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.FaceFrame getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1.FaceFrame.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.FaceFrame build() {
       com.google.cloud.videointelligence.v1.FaceFrame result = buildPartial();
       if (!result.isInitialized()) {
@@ -458,7 +444,6 @@ public com.google.cloud.videointelligence.v1.FaceFrame build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.FaceFrame buildPartial() {
       com.google.cloud.videointelligence.v1.FaceFrame result = new com.google.cloud.videointelligence.v1.FaceFrame(this);
       int from_bitField0_ = bitField0_;
@@ -482,39 +467,32 @@ public com.google.cloud.videointelligence.v1.FaceFrame buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1.FaceFrame) {
         return mergeFrom((com.google.cloud.videointelligence.v1.FaceFrame)other);
@@ -560,12 +538,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1.FaceFrame other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1094,13 +1070,11 @@ public com.google.protobuf.DurationOrBuilder getTimeOffsetOrBuilder() {
       }
       return timeOffsetBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1122,12 +1096,11 @@ public static com.google.cloud.videointelligence.v1.FaceFrame getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public FaceFrame parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FaceFrame(input, extensionRegistry);
+        return new FaceFrame(input, extensionRegistry);
     }
   };
 
@@ -1140,7 +1113,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1.FaceFrame getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceSegment.java
index 5b2349b21a95..8aab63729591 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceSegment.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/FaceSegment.java
@@ -32,9 +32,6 @@ private FaceSegment(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private FaceSegment(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.videointelligence.v1.VideoSegment.Builder subBuilder = null;
             if (segment_ != null) {
@@ -59,13 +63,6 @@ private FaceSegment(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private FaceSegment(
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_FaceSegment_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_FaceSegment_fieldAccessorTable
@@ -125,7 +121,6 @@ public com.google.cloud.videointelligence.v1.VideoSegmentOrBuilder getSegmentOrB
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -135,7 +130,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (segment_ != null) {
@@ -144,7 +138,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static com.google.cloud.videointelligence.v1.FaceSegment parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1.FaceSegment prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_FaceSegment_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_FaceSegment_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (segmentBuilder_ == null) {
@@ -336,18 +325,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_FaceSegment_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.FaceSegment getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1.FaceSegment.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.FaceSegment build() {
       com.google.cloud.videointelligence.v1.FaceSegment result = buildPartial();
       if (!result.isInitialized()) {
@@ -356,7 +342,6 @@ public com.google.cloud.videointelligence.v1.FaceSegment build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.FaceSegment buildPartial() {
       com.google.cloud.videointelligence.v1.FaceSegment result = new com.google.cloud.videointelligence.v1.FaceSegment(this);
       if (segmentBuilder_ == null) {
@@ -368,39 +353,32 @@ public com.google.cloud.videointelligence.v1.FaceSegment buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1.FaceSegment) {
         return mergeFrom((com.google.cloud.videointelligence.v1.FaceSegment)other);
@@ -420,12 +398,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1.FaceSegment other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -596,13 +572,11 @@ public com.google.cloud.videointelligence.v1.VideoSegmentOrBuilder getSegmentOrB
       }
       return segmentBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -624,12 +598,11 @@ public static com.google.cloud.videointelligence.v1.FaceSegment getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public FaceSegment parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FaceSegment(input, extensionRegistry);
+        return new FaceSegment(input, extensionRegistry);
     }
   };
 
@@ -642,7 +615,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1.FaceSegment getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelAnnotation.java
index d262f28503b5..a8227df47c84 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelAnnotation.java
@@ -35,9 +35,6 @@ private LabelAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private LabelAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.videointelligence.v1.Entity.Builder subBuilder = null;
             if (entity_ != null) {
@@ -89,13 +93,6 @@ private LabelAnnotation(
                 input.readMessage(com.google.cloud.videointelligence.v1.LabelFrame.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -122,7 +119,6 @@ private LabelAnnotation(
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_LabelAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_LabelAnnotation_fieldAccessorTable
@@ -345,7 +341,6 @@ public com.google.cloud.videointelligence.v1.LabelFrameOrBuilder getFramesOrBuil
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -355,7 +350,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (entity_ != null) {
@@ -373,7 +367,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -524,7 +517,6 @@ public static com.google.cloud.videointelligence.v1.LabelAnnotation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -532,7 +524,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1.LabelAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -560,7 +551,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_LabelAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_LabelAnnotation_fieldAccessorTable
@@ -586,7 +576,6 @@ private void maybeForceBuilderInitialization() {
         getFramesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (entityBuilder_ == null) {
@@ -616,18 +605,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_LabelAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.LabelAnnotation getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1.LabelAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.LabelAnnotation build() {
       com.google.cloud.videointelligence.v1.LabelAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -636,7 +622,6 @@ public com.google.cloud.videointelligence.v1.LabelAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.LabelAnnotation buildPartial() {
       com.google.cloud.videointelligence.v1.LabelAnnotation result = new com.google.cloud.videointelligence.v1.LabelAnnotation(this);
       int from_bitField0_ = bitField0_;
@@ -678,39 +663,32 @@ public com.google.cloud.videointelligence.v1.LabelAnnotation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1.LabelAnnotation) {
         return mergeFrom((com.google.cloud.videointelligence.v1.LabelAnnotation)other);
@@ -808,12 +786,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1.LabelAnnotation o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1975,13 +1951,11 @@ public com.google.cloud.videointelligence.v1.LabelFrame.Builder addFramesBuilder
       }
       return framesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2003,12 +1977,11 @@ public static com.google.cloud.videointelligence.v1.LabelAnnotation getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LabelAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LabelAnnotation(input, extensionRegistry);
+        return new LabelAnnotation(input, extensionRegistry);
     }
   };
 
@@ -2021,7 +1994,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1.LabelAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelDetectionConfig.java
index 201f4a5f4076..99a65c824943 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelDetectionConfig.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelDetectionConfig.java
@@ -35,9 +35,6 @@ private LabelDetectionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private LabelDetectionConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -66,13 +70,6 @@ private LabelDetectionConfig(
             model_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private LabelDetectionConfig(
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_LabelDetectionConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_LabelDetectionConfig_fieldAccessorTable
@@ -122,7 +118,6 @@ public int getLabelDetectionModeValue() {
    * .google.cloud.videointelligence.v1.LabelDetectionMode label_detection_mode = 1;
    */
   public com.google.cloud.videointelligence.v1.LabelDetectionMode getLabelDetectionMode() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.videointelligence.v1.LabelDetectionMode result = com.google.cloud.videointelligence.v1.LabelDetectionMode.valueOf(labelDetectionMode_);
     return result == null ? com.google.cloud.videointelligence.v1.LabelDetectionMode.UNRECOGNIZED : result;
   }
@@ -189,7 +184,6 @@ public java.lang.String getModel() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -199,7 +193,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (labelDetectionMode_ != com.google.cloud.videointelligence.v1.LabelDetectionMode.LABEL_DETECTION_MODE_UNSPECIFIED.getNumber()) {
@@ -214,7 +207,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -345,7 +337,6 @@ public static com.google.cloud.videointelligence.v1.LabelDetectionConfig parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -353,7 +344,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1.LabelDetectionConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -381,7 +371,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_LabelDetectionConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_LabelDetectionConfig_fieldAccessorTable
@@ -404,7 +393,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       labelDetectionMode_ = 0;
@@ -416,18 +404,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_LabelDetectionConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.LabelDetectionConfig getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1.LabelDetectionConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.LabelDetectionConfig build() {
       com.google.cloud.videointelligence.v1.LabelDetectionConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -436,7 +421,6 @@ public com.google.cloud.videointelligence.v1.LabelDetectionConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.LabelDetectionConfig buildPartial() {
       com.google.cloud.videointelligence.v1.LabelDetectionConfig result = new com.google.cloud.videointelligence.v1.LabelDetectionConfig(this);
       result.labelDetectionMode_ = labelDetectionMode_;
@@ -446,39 +430,32 @@ public com.google.cloud.videointelligence.v1.LabelDetectionConfig buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1.LabelDetectionConfig) {
         return mergeFrom((com.google.cloud.videointelligence.v1.LabelDetectionConfig)other);
@@ -505,12 +482,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1.LabelDetectionCon
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -566,7 +541,6 @@ public Builder setLabelDetectionModeValue(int value) {
      * .google.cloud.videointelligence.v1.LabelDetectionMode label_detection_mode = 1;
      */
     public com.google.cloud.videointelligence.v1.LabelDetectionMode getLabelDetectionMode() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.videointelligence.v1.LabelDetectionMode result = com.google.cloud.videointelligence.v1.LabelDetectionMode.valueOf(labelDetectionMode_);
       return result == null ? com.google.cloud.videointelligence.v1.LabelDetectionMode.UNRECOGNIZED : result;
     }
@@ -746,13 +720,11 @@ public Builder setModelBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -774,12 +746,11 @@ public static com.google.cloud.videointelligence.v1.LabelDetectionConfig getDefa
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LabelDetectionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LabelDetectionConfig(input, extensionRegistry);
+        return new LabelDetectionConfig(input, extensionRegistry);
     }
   };
 
@@ -792,7 +763,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1.LabelDetectionConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelFrame.java
index 3f343d1fbbcb..7a89b7e7fd24 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelFrame.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelFrame.java
@@ -33,9 +33,6 @@ private LabelFrame(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private LabelFrame(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.protobuf.Duration.Builder subBuilder = null;
             if (timeOffset_ != null) {
@@ -65,13 +69,6 @@ private LabelFrame(
             confidence_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -89,7 +86,6 @@ private LabelFrame(
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_LabelFrame_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_LabelFrame_fieldAccessorTable
@@ -147,7 +143,6 @@ public float getConfidence() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (timeOffset_ != null) {
@@ -169,7 +163,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -301,7 +294,6 @@ public static com.google.cloud.videointelligence.v1.LabelFrame parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -309,7 +301,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1.LabelFrame prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -337,7 +328,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_LabelFrame_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_LabelFrame_fieldAccessorTable
@@ -360,7 +350,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (timeOffsetBuilder_ == null) {
@@ -374,18 +363,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_LabelFrame_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.LabelFrame getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1.LabelFrame.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.LabelFrame build() {
       com.google.cloud.videointelligence.v1.LabelFrame result = buildPartial();
       if (!result.isInitialized()) {
@@ -394,7 +380,6 @@ public com.google.cloud.videointelligence.v1.LabelFrame build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.LabelFrame buildPartial() {
       com.google.cloud.videointelligence.v1.LabelFrame result = new com.google.cloud.videointelligence.v1.LabelFrame(this);
       if (timeOffsetBuilder_ == null) {
@@ -407,39 +392,32 @@ public com.google.cloud.videointelligence.v1.LabelFrame buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1.LabelFrame) {
         return mergeFrom((com.google.cloud.videointelligence.v1.LabelFrame)other);
@@ -462,12 +440,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1.LabelFrame other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -685,13 +661,11 @@ public Builder clearConfidence() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -713,12 +687,11 @@ public static com.google.cloud.videointelligence.v1.LabelFrame getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LabelFrame parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LabelFrame(input, extensionRegistry);
+        return new LabelFrame(input, extensionRegistry);
     }
   };
 
@@ -731,7 +704,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1.LabelFrame getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelSegment.java
index 7e304cfc0340..355570125b33 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelSegment.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/LabelSegment.java
@@ -33,9 +33,6 @@ private LabelSegment(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private LabelSegment(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.videointelligence.v1.VideoSegment.Builder subBuilder = null;
             if (segment_ != null) {
@@ -65,13 +69,6 @@ private LabelSegment(
             confidence_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -89,7 +86,6 @@ private LabelSegment(
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_LabelSegment_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_LabelSegment_fieldAccessorTable
@@ -144,7 +140,6 @@ public float getConfidence() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -154,7 +149,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (segment_ != null) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -298,7 +291,6 @@ public static com.google.cloud.videointelligence.v1.LabelSegment parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -306,7 +298,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1.LabelSegment prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -334,7 +325,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_LabelSegment_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_LabelSegment_fieldAccessorTable
@@ -357,7 +347,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (segmentBuilder_ == null) {
@@ -371,18 +360,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_LabelSegment_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.LabelSegment getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1.LabelSegment.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.LabelSegment build() {
       com.google.cloud.videointelligence.v1.LabelSegment result = buildPartial();
       if (!result.isInitialized()) {
@@ -391,7 +377,6 @@ public com.google.cloud.videointelligence.v1.LabelSegment build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.LabelSegment buildPartial() {
       com.google.cloud.videointelligence.v1.LabelSegment result = new com.google.cloud.videointelligence.v1.LabelSegment(this);
       if (segmentBuilder_ == null) {
@@ -404,39 +389,32 @@ public com.google.cloud.videointelligence.v1.LabelSegment buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1.LabelSegment) {
         return mergeFrom((com.google.cloud.videointelligence.v1.LabelSegment)other);
@@ -459,12 +437,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1.LabelSegment othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -673,13 +649,11 @@ public Builder clearConfidence() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -701,12 +675,11 @@ public static com.google.cloud.videointelligence.v1.LabelSegment getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LabelSegment parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LabelSegment(input, extensionRegistry);
+        return new LabelSegment(input, extensionRegistry);
     }
   };
 
@@ -719,7 +692,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1.LabelSegment getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/NormalizedBoundingBox.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/NormalizedBoundingBox.java
index ae9f95f6820e..39e6f6303d66 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/NormalizedBoundingBox.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/NormalizedBoundingBox.java
@@ -38,9 +38,6 @@ private NormalizedBoundingBox(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private NormalizedBoundingBox(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 13: {
 
             left_ = input.readFloat();
@@ -72,13 +76,6 @@ private NormalizedBoundingBox(
             bottom_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private NormalizedBoundingBox(
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_NormalizedBoundingBox_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_NormalizedBoundingBox_fieldAccessorTable
@@ -157,7 +153,6 @@ public float getBottom() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -167,7 +162,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (left_ != 0F) {
@@ -185,7 +179,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -337,7 +330,6 @@ public static com.google.cloud.videointelligence.v1.NormalizedBoundingBox parseF
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -345,7 +337,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1.NormalizedBoundingBox prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -375,7 +366,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_NormalizedBoundingBox_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_NormalizedBoundingBox_fieldAccessorTable
@@ -398,7 +388,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       left_ = 0F;
@@ -412,18 +401,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_NormalizedBoundingBox_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.NormalizedBoundingBox getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1.NormalizedBoundingBox.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.NormalizedBoundingBox build() {
       com.google.cloud.videointelligence.v1.NormalizedBoundingBox result = buildPartial();
       if (!result.isInitialized()) {
@@ -432,7 +418,6 @@ public com.google.cloud.videointelligence.v1.NormalizedBoundingBox build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.NormalizedBoundingBox buildPartial() {
       com.google.cloud.videointelligence.v1.NormalizedBoundingBox result = new com.google.cloud.videointelligence.v1.NormalizedBoundingBox(this);
       result.left_ = left_;
@@ -443,39 +428,32 @@ public com.google.cloud.videointelligence.v1.NormalizedBoundingBox buildPartial(
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1.NormalizedBoundingBox) {
         return mergeFrom((com.google.cloud.videointelligence.v1.NormalizedBoundingBox)other);
@@ -504,12 +482,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1.NormalizedBoundin
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -679,13 +655,11 @@ public Builder clearBottom() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -707,12 +681,11 @@ public static com.google.cloud.videointelligence.v1.NormalizedBoundingBox getDef
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public NormalizedBoundingBox parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new NormalizedBoundingBox(input, extensionRegistry);
+        return new NormalizedBoundingBox(input, extensionRegistry);
     }
   };
 
@@ -725,7 +698,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1.NormalizedBoundingBox getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ShotChangeDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ShotChangeDetectionConfig.java
index 0172fdfb9e41..894a90436dc3 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ShotChangeDetectionConfig.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/ShotChangeDetectionConfig.java
@@ -33,9 +33,6 @@ private ShotChangeDetectionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private ShotChangeDetectionConfig(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            model_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private ShotChangeDetectionConfig(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            model_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private ShotChangeDetectionConfig(
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_ShotChangeDetectionConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_ShotChangeDetectionConfig_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getModel() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getModelBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.videointelligence.v1.ShotChangeDetectionConfig pa
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1.ShotChangeDetectionConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_ShotChangeDetectionConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_ShotChangeDetectionConfig_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       model_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_ShotChangeDetectionConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.ShotChangeDetectionConfig getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1.ShotChangeDetectionConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.ShotChangeDetectionConfig build() {
       com.google.cloud.videointelligence.v1.ShotChangeDetectionConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.videointelligence.v1.ShotChangeDetectionConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.ShotChangeDetectionConfig buildPartial() {
       com.google.cloud.videointelligence.v1.ShotChangeDetectionConfig result = new com.google.cloud.videointelligence.v1.ShotChangeDetectionConfig(this);
       result.model_ = model_;
@@ -361,39 +346,32 @@ public com.google.cloud.videointelligence.v1.ShotChangeDetectionConfig buildPart
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1.ShotChangeDetectionConfig) {
         return mergeFrom((com.google.cloud.videointelligence.v1.ShotChangeDetectionConfig)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1.ShotChangeDetecti
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setModelBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.videointelligence.v1.ShotChangeDetectionConfig ge
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ShotChangeDetectionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ShotChangeDetectionConfig(input, extensionRegistry);
+        return new ShotChangeDetectionConfig(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1.ShotChangeDetectionConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoAnnotationProgress.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoAnnotationProgress.java
index 96049ba27a19..c15ce718939f 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoAnnotationProgress.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoAnnotationProgress.java
@@ -34,9 +34,6 @@ private VideoAnnotationProgress(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private VideoAnnotationProgress(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -85,13 +89,6 @@ private VideoAnnotationProgress(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -109,7 +106,6 @@ private VideoAnnotationProgress(
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_VideoAnnotationProgress_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_VideoAnnotationProgress_fieldAccessorTable
@@ -242,7 +238,6 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -252,7 +247,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getInputUriBytes().isEmpty()) {
@@ -270,7 +264,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -419,7 +412,6 @@ public static com.google.cloud.videointelligence.v1.VideoAnnotationProgress pars
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -427,7 +419,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1.VideoAnnotationProgress prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -455,7 +446,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_VideoAnnotationProgress_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_VideoAnnotationProgress_fieldAccessorTable
@@ -478,7 +468,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       inputUri_ = "";
@@ -500,18 +489,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_VideoAnnotationProgress_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.VideoAnnotationProgress getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1.VideoAnnotationProgress.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.VideoAnnotationProgress build() {
       com.google.cloud.videointelligence.v1.VideoAnnotationProgress result = buildPartial();
       if (!result.isInitialized()) {
@@ -520,7 +506,6 @@ public com.google.cloud.videointelligence.v1.VideoAnnotationProgress build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.VideoAnnotationProgress buildPartial() {
       com.google.cloud.videointelligence.v1.VideoAnnotationProgress result = new com.google.cloud.videointelligence.v1.VideoAnnotationProgress(this);
       result.inputUri_ = inputUri_;
@@ -539,39 +524,32 @@ public com.google.cloud.videointelligence.v1.VideoAnnotationProgress buildPartia
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1.VideoAnnotationProgress) {
         return mergeFrom((com.google.cloud.videointelligence.v1.VideoAnnotationProgress)other);
@@ -601,12 +579,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1.VideoAnnotationPr
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1065,13 +1041,11 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
       }
       return updateTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1093,12 +1067,11 @@ public static com.google.cloud.videointelligence.v1.VideoAnnotationProgress getD
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public VideoAnnotationProgress parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoAnnotationProgress(input, extensionRegistry);
+        return new VideoAnnotationProgress(input, extensionRegistry);
     }
   };
 
@@ -1111,7 +1084,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1.VideoAnnotationProgress getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoAnnotationResults.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoAnnotationResults.java
index 59df3c6dd851..39967c55ae4b 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoAnnotationResults.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoAnnotationResults.java
@@ -38,9 +38,6 @@ private VideoAnnotationResults(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private VideoAnnotationResults(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -129,13 +133,6 @@ private VideoAnnotationResults(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -168,7 +165,6 @@ private VideoAnnotationResults(
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_VideoAnnotationResults_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_VideoAnnotationResults_fieldAccessorTable
@@ -581,7 +577,6 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -591,7 +586,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getInputUriBytes().isEmpty()) {
@@ -621,7 +615,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -812,7 +805,6 @@ public static com.google.cloud.videointelligence.v1.VideoAnnotationResults parse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -820,7 +812,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1.VideoAnnotationResults prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -848,7 +839,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_VideoAnnotationResults_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_VideoAnnotationResults_fieldAccessorTable
@@ -876,7 +866,6 @@ private void maybeForceBuilderInitialization() {
         getShotAnnotationsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       inputUri_ = "";
@@ -926,18 +915,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_VideoAnnotationResults_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.VideoAnnotationResults getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1.VideoAnnotationResults.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.VideoAnnotationResults build() {
       com.google.cloud.videointelligence.v1.VideoAnnotationResults result = buildPartial();
       if (!result.isInitialized()) {
@@ -946,7 +932,6 @@ public com.google.cloud.videointelligence.v1.VideoAnnotationResults build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.VideoAnnotationResults buildPartial() {
       com.google.cloud.videointelligence.v1.VideoAnnotationResults result = new com.google.cloud.videointelligence.v1.VideoAnnotationResults(this);
       int from_bitField0_ = bitField0_;
@@ -1012,39 +997,32 @@ public com.google.cloud.videointelligence.v1.VideoAnnotationResults buildPartial
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1.VideoAnnotationResults) {
         return mergeFrom((com.google.cloud.videointelligence.v1.VideoAnnotationResults)other);
@@ -1201,12 +1179,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1.VideoAnnotationRe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3248,13 +3224,11 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() {
       }
       return errorBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -3276,12 +3250,11 @@ public static com.google.cloud.videointelligence.v1.VideoAnnotationResults getDe
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public VideoAnnotationResults parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoAnnotationResults(input, extensionRegistry);
+        return new VideoAnnotationResults(input, extensionRegistry);
     }
   };
 
@@ -3294,7 +3267,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1.VideoAnnotationResults getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoContext.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoContext.java
index 794e62b240a2..5f11200b4fca 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoContext.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoContext.java
@@ -33,9 +33,6 @@ private VideoContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private VideoContext(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               segments_ = new java.util.ArrayList();
@@ -108,13 +112,6 @@ private VideoContext(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -135,7 +132,6 @@ private VideoContext(
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_VideoContext_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_VideoContext_fieldAccessorTable
@@ -342,7 +338,6 @@ public com.google.cloud.videointelligence.v1.FaceDetectionConfigOrBuilder getFac
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -352,7 +347,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < segments_.size(); i++) {
@@ -373,7 +367,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -543,7 +536,6 @@ public static com.google.cloud.videointelligence.v1.VideoContext parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -551,7 +543,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1.VideoContext prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -579,7 +570,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_VideoContext_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_VideoContext_fieldAccessorTable
@@ -603,7 +593,6 @@ private void maybeForceBuilderInitialization() {
         getSegmentsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (segmentsBuilder_ == null) {
@@ -639,18 +628,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_VideoContext_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.VideoContext getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1.VideoContext.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.VideoContext build() {
       com.google.cloud.videointelligence.v1.VideoContext result = buildPartial();
       if (!result.isInitialized()) {
@@ -659,7 +645,6 @@ public com.google.cloud.videointelligence.v1.VideoContext build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.VideoContext buildPartial() {
       com.google.cloud.videointelligence.v1.VideoContext result = new com.google.cloud.videointelligence.v1.VideoContext(this);
       int from_bitField0_ = bitField0_;
@@ -698,39 +683,32 @@ public com.google.cloud.videointelligence.v1.VideoContext buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1.VideoContext) {
         return mergeFrom((com.google.cloud.videointelligence.v1.VideoContext)other);
@@ -785,12 +763,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1.VideoContext othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1769,13 +1745,11 @@ public com.google.cloud.videointelligence.v1.FaceDetectionConfigOrBuilder getFac
       }
       return faceDetectionConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1797,12 +1771,11 @@ public static com.google.cloud.videointelligence.v1.VideoContext getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public VideoContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoContext(input, extensionRegistry);
+        return new VideoContext(input, extensionRegistry);
     }
   };
 
@@ -1815,7 +1788,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1.VideoContext getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceProto.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceProto.java
index 8f1c0530c092..c407e4a7bf55 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoIntelligenceServiceProto.java
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       "status.proto\"\357\001\n\024AnnotateVideoRequest\022\021\n" +
       "\tinput_uri\030\001 \001(\t\022\025\n\rinput_content\030\006 \001(\014\022" +
       "<\n\010features\030\002 \003(\0162*.google.cloud.videoin" +
-      "telligence.v1.Feature\022F\n\rvideo_context\030\003" +
+      "telligence.v1.Feature\022F\n\rvideo_context\030\003",
       " \001(\0132/.google.cloud.videointelligence.v1" +
       ".VideoContext\022\022\n\noutput_uri\030\004 \001(\t\022\023\n\013loc" +
       "ation_id\030\005 \001(\t\"\323\003\n\014VideoContext\022A\n\010segme" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "nce.v1.LabelDetectionConfig\022b\n\034shot_chan" +
       "ge_detection_config\030\003 \001(\0132<.google.cloud" +
       ".videointelligence.v1.ShotChangeDetectio" +
-      "nConfig\022l\n!explicit_content_detection_co" +
+      "nConfig\022l\n!explicit_content_detection_co",
       "nfig\030\004 \001(\0132A.google.cloud.videointellige" +
       "nce.v1.ExplicitContentDetectionConfig\022U\n" +
       "\025face_detection_config\030\005 \001(\01326.google.cl" +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       "intelligence.v1.LabelDetectionMode\022\031\n\021st" +
       "ationary_camera\030\002 \001(\010\022\r\n\005model\030\003 \001(\t\"*\n\031" +
       "ShotChangeDetectionConfig\022\r\n\005model\030\001 \001(\t" +
-      "\"/\n\036ExplicitContentDetectionConfig\022\r\n\005mo" +
+      "\"/\n\036ExplicitContentDetectionConfig\022\r\n\005mo",
       "del\030\001 \001(\t\"D\n\023FaceDetectionConfig\022\r\n\005mode" +
       "l\030\001 \001(\t\022\036\n\026include_bounding_boxes\030\002 \001(\010\"" +
       "x\n\014VideoSegment\0224\n\021start_time_offset\030\001 \001" +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       "gle.cloud.videointelligence.v1.VideoSegm" +
       "ent\022\022\n\nconfidence\030\002 \001(\002\"P\n\nLabelFrame\022.\n" +
       "\013time_offset\030\001 \001(\0132\031.google.protobuf.Dur" +
-      "ation\022\022\n\nconfidence\030\002 \001(\002\"G\n\006Entity\022\021\n\te" +
+      "ation\022\022\n\nconfidence\030\002 \001(\002\"G\n\006Entity\022\021\n\te",
       "ntity_id\030\001 \001(\t\022\023\n\013description\030\002 \001(\t\022\025\n\rl" +
       "anguage_code\030\003 \001(\t\"\224\002\n\017LabelAnnotation\0229" +
       "\n\006entity\030\001 \001(\0132).google.cloud.videointel" +
@@ -177,7 +177,7 @@ public static void registerAllExtensions(
       ".videointelligence.v1.LabelSegment\022=\n\006fr" +
       "ames\030\004 \003(\0132-.google.cloud.videointellige" +
       "nce.v1.LabelFrame\"\225\001\n\024ExplicitContentFra" +
-      "me\022.\n\013time_offset\030\001 \001(\0132\031.google.protobu" +
+      "me\022.\n\013time_offset\030\001 \001(\0132\031.google.protobu",
       "f.Duration\022M\n\026pornography_likelihood\030\002 \001" +
       "(\0162-.google.cloud.videointelligence.v1.L" +
       "ikelihood\"d\n\031ExplicitContentAnnotation\022G" +
@@ -187,7 +187,7 @@ public static void registerAllExtensions(
       "\001(\002\022\r\n\005right\030\003 \001(\002\022\016\n\006bottom\030\004 \001(\002\"O\n\013Fa" +
       "ceSegment\022@\n\007segment\030\001 \001(\0132/.google.clou" +
       "d.videointelligence.v1.VideoSegment\"\230\001\n\t" +
-      "FaceFrame\022[\n\031normalized_bounding_boxes\030\001" +
+      "FaceFrame\022[\n\031normalized_bounding_boxes\030\001",
       " \003(\01328.google.cloud.videointelligence.v1" +
       ".NormalizedBoundingBox\022.\n\013time_offset\030\002 " +
       "\001(\0132\031.google.protobuf.Duration\"\243\001\n\016FaceA" +
@@ -197,7 +197,7 @@ public static void registerAllExtensions(
       "cloud.videointelligence.v1.FaceFrame\"\301\004\n" +
       "\026VideoAnnotationResults\022\021\n\tinput_uri\030\001 \001" +
       "(\t\022U\n\031segment_label_annotations\030\002 \003(\01322." +
-      "google.cloud.videointelligence.v1.LabelA" +
+      "google.cloud.videointelligence.v1.LabelA",
       "nnotation\022R\n\026shot_label_annotations\030\003 \003(" +
       "\01322.google.cloud.videointelligence.v1.La" +
       "belAnnotation\022S\n\027frame_label_annotations" +
@@ -207,7 +207,7 @@ public static void registerAllExtensions(
       ".FaceAnnotation\022I\n\020shot_annotations\030\006 \003(" +
       "\0132/.google.cloud.videointelligence.v1.Vi" +
       "deoSegment\022Y\n\023explicit_annotation\030\007 \001(\0132" +
-      "<.google.cloud.videointelligence.v1.Expl" +
+      "<.google.cloud.videointelligence.v1.Expl",
       "icitContentAnnotation\022!\n\005error\030\t \001(\0132\022.g" +
       "oogle.rpc.Status\"n\n\025AnnotateVideoRespons" +
       "e\022U\n\022annotation_results\030\001 \003(\01329.google.c" +
@@ -217,7 +217,7 @@ public static void registerAllExtensions(
       "\005\022.\n\nstart_time\030\003 \001(\0132\032.google.protobuf." +
       "Timestamp\022/\n\013update_time\030\004 \001(\0132\032.google." +
       "protobuf.Timestamp\"p\n\025AnnotateVideoProgr" +
-      "ess\022W\n\023annotation_progress\030\001 \003(\0132:.googl" +
+      "ess\022W\n\023annotation_progress\030\001 \003(\0132:.googl",
       "e.cloud.videointelligence.v1.VideoAnnota" +
       "tionProgress*\206\001\n\007Feature\022\027\n\023FEATURE_UNSP" +
       "ECIFIED\020\000\022\023\n\017LABEL_DETECTION\020\001\022\031\n\025SHOT_C" +
@@ -227,7 +227,7 @@ public static void registerAllExtensions(
       "ECIFIED\020\000\022\r\n\tSHOT_MODE\020\001\022\016\n\nFRAME_MODE\020\002" +
       "\022\027\n\023SHOT_AND_FRAME_MODE\020\003*t\n\nLikelihood\022" +
       "\032\n\026LIKELIHOOD_UNSPECIFIED\020\000\022\021\n\rVERY_UNLI" +
-      "KELY\020\001\022\014\n\010UNLIKELY\020\002\022\014\n\010POSSIBLE\020\003\022\n\n\006LI" +
+      "KELY\020\001\022\014\n\010UNLIKELY\020\002\022\014\n\010POSSIBLE\020\003\022\n\n\006LI",
       "KELY\020\004\022\017\n\013VERY_LIKELY\020\0052\244\001\n\030VideoIntelli" +
       "genceService\022\207\001\n\rAnnotateVideo\0227.google." +
       "cloud.videointelligence.v1.AnnotateVideo" +
@@ -237,7 +237,7 @@ public static void registerAllExtensions(
       "ntelligenceServiceProtoP\001ZRgoogle.golang" +
       ".org/genproto/googleapis/cloud/videointe" +
       "lligence/v1;videointelligence\252\002!Google.C" +
-      "loud.VideoIntelligence.V1\312\002!Google\\Cloud" +
+      "loud.VideoIntelligence.V1\312\002!Google\\Cloud",
       "\\VideoIntelligence\\V1b\006proto3"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoSegment.java
index 88417141774c..6d52ff692c66 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoSegment.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1/src/main/java/com/google/cloud/videointelligence/v1/VideoSegment.java
@@ -32,9 +32,6 @@ private VideoSegment(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private VideoSegment(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.protobuf.Duration.Builder subBuilder = null;
             if (startTimeOffset_ != null) {
@@ -72,13 +76,6 @@ private VideoSegment(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private VideoSegment(
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_VideoSegment_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_VideoSegment_fieldAccessorTable
@@ -177,7 +173,6 @@ public com.google.protobuf.DurationOrBuilder getEndTimeOffsetOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -187,7 +182,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (startTimeOffset_ != null) {
@@ -199,7 +193,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -333,7 +326,6 @@ public static com.google.cloud.videointelligence.v1.VideoSegment parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -341,7 +333,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1.VideoSegment prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -369,7 +360,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_VideoSegment_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_VideoSegment_fieldAccessorTable
@@ -392,7 +382,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (startTimeOffsetBuilder_ == null) {
@@ -410,18 +399,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1_VideoSegment_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.VideoSegment getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1.VideoSegment.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.VideoSegment build() {
       com.google.cloud.videointelligence.v1.VideoSegment result = buildPartial();
       if (!result.isInitialized()) {
@@ -430,7 +416,6 @@ public com.google.cloud.videointelligence.v1.VideoSegment build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1.VideoSegment buildPartial() {
       com.google.cloud.videointelligence.v1.VideoSegment result = new com.google.cloud.videointelligence.v1.VideoSegment(this);
       if (startTimeOffsetBuilder_ == null) {
@@ -447,39 +432,32 @@ public com.google.cloud.videointelligence.v1.VideoSegment buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1.VideoSegment) {
         return mergeFrom((com.google.cloud.videointelligence.v1.VideoSegment)other);
@@ -502,12 +480,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1.VideoSegment othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -849,13 +825,11 @@ public com.google.protobuf.DurationOrBuilder getEndTimeOffsetOrBuilder() {
       }
       return endTimeOffsetBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -877,12 +851,11 @@ public static com.google.cloud.videointelligence.v1.VideoSegment getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public VideoSegment parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoSegment(input, extensionRegistry);
+        return new VideoSegment(input, extensionRegistry);
     }
   };
 
@@ -895,7 +868,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1.VideoSegment getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoProgress.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoProgress.java
index d3fb112f5e27..b5db845c5bb7 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoProgress.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoProgress.java
@@ -35,9 +35,6 @@ private AnnotateVideoProgress(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private AnnotateVideoProgress(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               annotationProgress_ = new java.util.ArrayList();
@@ -58,13 +62,6 @@ private AnnotateVideoProgress(
                 input.readMessage(com.google.cloud.videointelligence.v1beta1.VideoAnnotationProgress.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -85,7 +82,6 @@ private AnnotateVideoProgress(
     return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_AnnotateVideoProgress_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_AnnotateVideoProgress_fieldAccessorTable
@@ -149,7 +145,6 @@ public com.google.cloud.videointelligence.v1beta1.VideoAnnotationProgressOrBuild
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -159,7 +154,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < annotationProgress_.size(); i++) {
@@ -168,7 +162,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -286,7 +279,6 @@ public static com.google.cloud.videointelligence.v1beta1.AnnotateVideoProgress p
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -294,7 +286,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta1.AnnotateVideoProgress prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -324,7 +315,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_AnnotateVideoProgress_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_AnnotateVideoProgress_fieldAccessorTable
@@ -348,7 +338,6 @@ private void maybeForceBuilderInitialization() {
         getAnnotationProgressFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (annotationProgressBuilder_ == null) {
@@ -360,18 +349,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_AnnotateVideoProgress_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.AnnotateVideoProgress getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta1.AnnotateVideoProgress.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.AnnotateVideoProgress build() {
       com.google.cloud.videointelligence.v1beta1.AnnotateVideoProgress result = buildPartial();
       if (!result.isInitialized()) {
@@ -380,7 +366,6 @@ public com.google.cloud.videointelligence.v1beta1.AnnotateVideoProgress build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.AnnotateVideoProgress buildPartial() {
       com.google.cloud.videointelligence.v1beta1.AnnotateVideoProgress result = new com.google.cloud.videointelligence.v1beta1.AnnotateVideoProgress(this);
       int from_bitField0_ = bitField0_;
@@ -397,39 +382,32 @@ public com.google.cloud.videointelligence.v1beta1.AnnotateVideoProgress buildPar
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta1.AnnotateVideoProgress) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta1.AnnotateVideoProgress)other);
@@ -472,12 +450,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta1.AnnotateVide
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -808,13 +784,11 @@ public com.google.cloud.videointelligence.v1beta1.VideoAnnotationProgress.Builde
       }
       return annotationProgressBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -836,12 +810,11 @@ public static com.google.cloud.videointelligence.v1beta1.AnnotateVideoProgress g
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnnotateVideoProgress parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateVideoProgress(input, extensionRegistry);
+        return new AnnotateVideoProgress(input, extensionRegistry);
     }
   };
 
@@ -854,7 +827,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta1.AnnotateVideoProgress getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoRequest.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoRequest.java
index 822750f9d97d..3b91c30b7fe6 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoRequest.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoRequest.java
@@ -37,9 +37,6 @@ private AnnotateVideoRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private AnnotateVideoRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -111,13 +115,6 @@ private AnnotateVideoRequest(
             inputContent_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -138,7 +135,6 @@ private AnnotateVideoRequest(
     return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_AnnotateVideoRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_AnnotateVideoRequest_fieldAccessorTable
@@ -258,7 +254,6 @@ public java.lang.String getInputContent() {
           new com.google.protobuf.Internal.ListAdapter.Converter<
               java.lang.Integer, com.google.cloud.videointelligence.v1beta1.Feature>() {
             public com.google.cloud.videointelligence.v1beta1.Feature convert(java.lang.Integer from) {
-              @SuppressWarnings("deprecation")
               com.google.cloud.videointelligence.v1beta1.Feature result = com.google.cloud.videointelligence.v1beta1.Feature.valueOf(from);
               return result == null ? com.google.cloud.videointelligence.v1beta1.Feature.UNRECOGNIZED : result;
             }
@@ -449,7 +444,6 @@ public java.lang.String getLocationId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -459,7 +453,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     getSerializedSize();
@@ -488,7 +481,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -654,7 +646,6 @@ public static com.google.cloud.videointelligence.v1beta1.AnnotateVideoRequest pa
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -662,7 +653,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta1.AnnotateVideoRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -690,7 +680,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_AnnotateVideoRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_AnnotateVideoRequest_fieldAccessorTable
@@ -713,7 +702,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       inputUri_ = "";
@@ -735,18 +723,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_AnnotateVideoRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.AnnotateVideoRequest getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta1.AnnotateVideoRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.AnnotateVideoRequest build() {
       com.google.cloud.videointelligence.v1beta1.AnnotateVideoRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -755,7 +740,6 @@ public com.google.cloud.videointelligence.v1beta1.AnnotateVideoRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.AnnotateVideoRequest buildPartial() {
       com.google.cloud.videointelligence.v1beta1.AnnotateVideoRequest result = new com.google.cloud.videointelligence.v1beta1.AnnotateVideoRequest(this);
       int from_bitField0_ = bitField0_;
@@ -779,39 +763,32 @@ public com.google.cloud.videointelligence.v1beta1.AnnotateVideoRequest buildPart
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta1.AnnotateVideoRequest) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta1.AnnotateVideoRequest)other);
@@ -857,12 +834,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta1.AnnotateVide
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1641,13 +1616,11 @@ public Builder setLocationIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1669,12 +1642,11 @@ public static com.google.cloud.videointelligence.v1beta1.AnnotateVideoRequest ge
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnnotateVideoRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateVideoRequest(input, extensionRegistry);
+        return new AnnotateVideoRequest(input, extensionRegistry);
     }
   };
 
@@ -1687,7 +1659,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta1.AnnotateVideoRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoResponse.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoResponse.java
index 05b6e346c731..ac38e7c55d61 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoResponse.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/AnnotateVideoResponse.java
@@ -35,9 +35,6 @@ private AnnotateVideoResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private AnnotateVideoResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               annotationResults_ = new java.util.ArrayList();
@@ -58,13 +62,6 @@ private AnnotateVideoResponse(
                 input.readMessage(com.google.cloud.videointelligence.v1beta1.VideoAnnotationResults.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -85,7 +82,6 @@ private AnnotateVideoResponse(
     return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_AnnotateVideoResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_AnnotateVideoResponse_fieldAccessorTable
@@ -149,7 +145,6 @@ public com.google.cloud.videointelligence.v1beta1.VideoAnnotationResultsOrBuilde
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -159,7 +154,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < annotationResults_.size(); i++) {
@@ -168,7 +162,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -286,7 +279,6 @@ public static com.google.cloud.videointelligence.v1beta1.AnnotateVideoResponse p
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -294,7 +286,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta1.AnnotateVideoResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -324,7 +315,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_AnnotateVideoResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_AnnotateVideoResponse_fieldAccessorTable
@@ -348,7 +338,6 @@ private void maybeForceBuilderInitialization() {
         getAnnotationResultsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (annotationResultsBuilder_ == null) {
@@ -360,18 +349,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_AnnotateVideoResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.AnnotateVideoResponse getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta1.AnnotateVideoResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.AnnotateVideoResponse build() {
       com.google.cloud.videointelligence.v1beta1.AnnotateVideoResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -380,7 +366,6 @@ public com.google.cloud.videointelligence.v1beta1.AnnotateVideoResponse build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.AnnotateVideoResponse buildPartial() {
       com.google.cloud.videointelligence.v1beta1.AnnotateVideoResponse result = new com.google.cloud.videointelligence.v1beta1.AnnotateVideoResponse(this);
       int from_bitField0_ = bitField0_;
@@ -397,39 +382,32 @@ public com.google.cloud.videointelligence.v1beta1.AnnotateVideoResponse buildPar
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta1.AnnotateVideoResponse) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta1.AnnotateVideoResponse)other);
@@ -472,12 +450,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta1.AnnotateVide
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -808,13 +784,11 @@ public com.google.cloud.videointelligence.v1beta1.VideoAnnotationResults.Builder
       }
       return annotationResultsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -836,12 +810,11 @@ public static com.google.cloud.videointelligence.v1beta1.AnnotateVideoResponse g
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnnotateVideoResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateVideoResponse(input, extensionRegistry);
+        return new AnnotateVideoResponse(input, extensionRegistry);
     }
   };
 
@@ -854,7 +827,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta1.AnnotateVideoResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/BoundingBox.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/BoundingBox.java
index 4840d66d45d8..355c5be6f465 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/BoundingBox.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/BoundingBox.java
@@ -36,9 +36,6 @@ private BoundingBox(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private BoundingBox(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
 
             left_ = input.readInt32();
@@ -70,13 +74,6 @@ private BoundingBox(
             top_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -94,7 +91,6 @@ private BoundingBox(
     return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_BoundingBox_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_BoundingBox_fieldAccessorTable
@@ -155,7 +151,6 @@ public int getTop() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -165,7 +160,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (left_ != 0) {
@@ -183,7 +177,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -323,7 +316,6 @@ public static com.google.cloud.videointelligence.v1beta1.BoundingBox parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -331,7 +323,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta1.BoundingBox prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -359,7 +350,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_BoundingBox_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_BoundingBox_fieldAccessorTable
@@ -382,7 +372,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       left_ = 0;
@@ -396,18 +385,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_BoundingBox_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.BoundingBox getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta1.BoundingBox.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.BoundingBox build() {
       com.google.cloud.videointelligence.v1beta1.BoundingBox result = buildPartial();
       if (!result.isInitialized()) {
@@ -416,7 +402,6 @@ public com.google.cloud.videointelligence.v1beta1.BoundingBox build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.BoundingBox buildPartial() {
       com.google.cloud.videointelligence.v1beta1.BoundingBox result = new com.google.cloud.videointelligence.v1beta1.BoundingBox(this);
       result.left_ = left_;
@@ -427,39 +412,32 @@ public com.google.cloud.videointelligence.v1beta1.BoundingBox buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta1.BoundingBox) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta1.BoundingBox)other);
@@ -488,12 +466,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta1.BoundingBox
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -663,13 +639,11 @@ public Builder clearTop() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -691,12 +665,11 @@ public static com.google.cloud.videointelligence.v1beta1.BoundingBox getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BoundingBox parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BoundingBox(input, extensionRegistry);
+        return new BoundingBox(input, extensionRegistry);
     }
   };
 
@@ -709,7 +682,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta1.BoundingBox getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/FaceAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/FaceAnnotation.java
index 888c77128d62..a01242dac9f3 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/FaceAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/FaceAnnotation.java
@@ -35,9 +35,6 @@ private FaceAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private FaceAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private FaceAnnotation(
                 input.readMessage(com.google.cloud.videointelligence.v1beta1.FaceLocation.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private FaceAnnotation(
     return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_FaceAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_FaceAnnotation_fieldAccessorTable
@@ -275,7 +271,6 @@ public com.google.cloud.videointelligence.v1beta1.FaceLocationOrBuilder getLocat
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -285,7 +280,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getThumbnailBytes().isEmpty()) {
@@ -300,7 +294,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -435,7 +428,6 @@ public static com.google.cloud.videointelligence.v1beta1.FaceAnnotation parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -443,7 +435,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta1.FaceAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -471,7 +462,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_FaceAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_FaceAnnotation_fieldAccessorTable
@@ -496,7 +486,6 @@ private void maybeForceBuilderInitialization() {
         getLocationsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       thumbnail_ = "";
@@ -516,18 +505,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_FaceAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.FaceAnnotation getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta1.FaceAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.FaceAnnotation build() {
       com.google.cloud.videointelligence.v1beta1.FaceAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -536,7 +522,6 @@ public com.google.cloud.videointelligence.v1beta1.FaceAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.FaceAnnotation buildPartial() {
       com.google.cloud.videointelligence.v1beta1.FaceAnnotation result = new com.google.cloud.videointelligence.v1beta1.FaceAnnotation(this);
       int from_bitField0_ = bitField0_;
@@ -565,39 +550,32 @@ public com.google.cloud.videointelligence.v1beta1.FaceAnnotation buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta1.FaceAnnotation) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta1.FaceAnnotation)other);
@@ -670,12 +648,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta1.FaceAnnotati
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1443,13 +1419,11 @@ public com.google.cloud.videointelligence.v1beta1.FaceLocation.Builder addLocati
       }
       return locationsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1471,12 +1445,11 @@ public static com.google.cloud.videointelligence.v1beta1.FaceAnnotation getDefau
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public FaceAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FaceAnnotation(input, extensionRegistry);
+        return new FaceAnnotation(input, extensionRegistry);
     }
   };
 
@@ -1489,7 +1462,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta1.FaceAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/FaceLocation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/FaceLocation.java
index c99f83754903..72263f6c7898 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/FaceLocation.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/FaceLocation.java
@@ -33,9 +33,6 @@ private FaceLocation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private FaceLocation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.videointelligence.v1beta1.BoundingBox.Builder subBuilder = null;
             if (boundingBox_ != null) {
@@ -65,13 +69,6 @@ private FaceLocation(
             timeOffset_ = input.readInt64();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -89,7 +86,6 @@ private FaceLocation(
     return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_FaceLocation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_FaceLocation_fieldAccessorTable
@@ -144,7 +140,6 @@ public long getTimeOffset() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -154,7 +149,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (boundingBox_ != null) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -296,7 +289,6 @@ public static com.google.cloud.videointelligence.v1beta1.FaceLocation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -304,7 +296,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta1.FaceLocation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -332,7 +323,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_FaceLocation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_FaceLocation_fieldAccessorTable
@@ -355,7 +345,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (boundingBoxBuilder_ == null) {
@@ -369,18 +358,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_FaceLocation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.FaceLocation getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta1.FaceLocation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.FaceLocation build() {
       com.google.cloud.videointelligence.v1beta1.FaceLocation result = buildPartial();
       if (!result.isInitialized()) {
@@ -389,7 +375,6 @@ public com.google.cloud.videointelligence.v1beta1.FaceLocation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.FaceLocation buildPartial() {
       com.google.cloud.videointelligence.v1beta1.FaceLocation result = new com.google.cloud.videointelligence.v1beta1.FaceLocation(this);
       if (boundingBoxBuilder_ == null) {
@@ -402,39 +387,32 @@ public com.google.cloud.videointelligence.v1beta1.FaceLocation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta1.FaceLocation) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta1.FaceLocation)other);
@@ -457,12 +435,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta1.FaceLocation
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -671,13 +647,11 @@ public Builder clearTimeOffset() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -699,12 +673,11 @@ public static com.google.cloud.videointelligence.v1beta1.FaceLocation getDefault
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public FaceLocation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FaceLocation(input, extensionRegistry);
+        return new FaceLocation(input, extensionRegistry);
     }
   };
 
@@ -717,7 +690,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta1.FaceLocation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/LabelAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/LabelAnnotation.java
index c907ad50ce1f..7e67d5ee5b48 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/LabelAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/LabelAnnotation.java
@@ -35,9 +35,6 @@ private LabelAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private LabelAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -70,13 +74,6 @@ private LabelAnnotation(
                 input.readMessage(com.google.cloud.videointelligence.v1beta1.LabelLocation.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private LabelAnnotation(
     return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_LabelAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_LabelAnnotation_fieldAccessorTable
@@ -246,7 +242,6 @@ public com.google.cloud.videointelligence.v1beta1.LabelLocationOrBuilder getLoca
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -256,7 +251,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getDescriptionBytes().isEmpty()) {
@@ -271,7 +265,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -403,7 +396,6 @@ public static com.google.cloud.videointelligence.v1beta1.LabelAnnotation parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -411,7 +403,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta1.LabelAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -439,7 +430,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_LabelAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_LabelAnnotation_fieldAccessorTable
@@ -463,7 +453,6 @@ private void maybeForceBuilderInitialization() {
         getLocationsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       description_ = "";
@@ -479,18 +468,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_LabelAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.LabelAnnotation getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta1.LabelAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.LabelAnnotation build() {
       com.google.cloud.videointelligence.v1beta1.LabelAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -499,7 +485,6 @@ public com.google.cloud.videointelligence.v1beta1.LabelAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.LabelAnnotation buildPartial() {
       com.google.cloud.videointelligence.v1beta1.LabelAnnotation result = new com.google.cloud.videointelligence.v1beta1.LabelAnnotation(this);
       int from_bitField0_ = bitField0_;
@@ -520,39 +505,32 @@ public com.google.cloud.videointelligence.v1beta1.LabelAnnotation buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta1.LabelAnnotation) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta1.LabelAnnotation)other);
@@ -603,12 +581,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta1.LabelAnnotat
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1117,13 +1093,11 @@ public com.google.cloud.videointelligence.v1beta1.LabelLocation.Builder addLocat
       }
       return locationsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1145,12 +1119,11 @@ public static com.google.cloud.videointelligence.v1beta1.LabelAnnotation getDefa
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LabelAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LabelAnnotation(input, extensionRegistry);
+        return new LabelAnnotation(input, extensionRegistry);
     }
   };
 
@@ -1163,7 +1136,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta1.LabelAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/LabelLocation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/LabelLocation.java
index 3b3741e520b2..5809618cf496 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/LabelLocation.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/LabelLocation.java
@@ -34,9 +34,6 @@ private LabelLocation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private LabelLocation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.videointelligence.v1beta1.VideoSegment.Builder subBuilder = null;
             if (segment_ != null) {
@@ -72,13 +76,6 @@ private LabelLocation(
             level_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private LabelLocation(
     return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_LabelLocation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_LabelLocation_fieldAccessorTable
@@ -179,13 +175,11 @@ public int getLevelValue() {
    * .google.cloud.videointelligence.v1beta1.LabelLevel level = 3;
    */
   public com.google.cloud.videointelligence.v1beta1.LabelLevel getLevel() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.videointelligence.v1beta1.LabelLevel result = com.google.cloud.videointelligence.v1beta1.LabelLevel.valueOf(level_);
     return result == null ? com.google.cloud.videointelligence.v1beta1.LabelLevel.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -195,7 +189,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (segment_ != null) {
@@ -210,7 +203,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -349,7 +341,6 @@ public static com.google.cloud.videointelligence.v1beta1.LabelLocation parseFrom
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -357,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta1.LabelLocation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -385,7 +375,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_LabelLocation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_LabelLocation_fieldAccessorTable
@@ -408,7 +397,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (segmentBuilder_ == null) {
@@ -424,18 +412,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_LabelLocation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.LabelLocation getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta1.LabelLocation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.LabelLocation build() {
       com.google.cloud.videointelligence.v1beta1.LabelLocation result = buildPartial();
       if (!result.isInitialized()) {
@@ -444,7 +429,6 @@ public com.google.cloud.videointelligence.v1beta1.LabelLocation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.LabelLocation buildPartial() {
       com.google.cloud.videointelligence.v1beta1.LabelLocation result = new com.google.cloud.videointelligence.v1beta1.LabelLocation(this);
       if (segmentBuilder_ == null) {
@@ -458,39 +442,32 @@ public com.google.cloud.videointelligence.v1beta1.LabelLocation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta1.LabelLocation) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta1.LabelLocation)other);
@@ -516,12 +493,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta1.LabelLocatio
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -789,7 +764,6 @@ public Builder setLevelValue(int value) {
      * .google.cloud.videointelligence.v1beta1.LabelLevel level = 3;
      */
     public com.google.cloud.videointelligence.v1beta1.LabelLevel getLevel() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.videointelligence.v1beta1.LabelLevel result = com.google.cloud.videointelligence.v1beta1.LabelLevel.valueOf(level_);
       return result == null ? com.google.cloud.videointelligence.v1beta1.LabelLevel.UNRECOGNIZED : result;
     }
@@ -822,13 +796,11 @@ public Builder clearLevel() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -850,12 +822,11 @@ public static com.google.cloud.videointelligence.v1beta1.LabelLocation getDefaul
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LabelLocation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LabelLocation(input, extensionRegistry);
+        return new LabelLocation(input, extensionRegistry);
     }
   };
 
@@ -868,7 +839,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta1.LabelLocation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/SafeSearchAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/SafeSearchAnnotation.java
index bb05662c6aa7..cfd747c36969 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/SafeSearchAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/SafeSearchAnnotation.java
@@ -42,9 +42,6 @@ private SafeSearchAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -56,6 +53,13 @@ private SafeSearchAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -91,13 +95,6 @@ private SafeSearchAnnotation(
             timeOffset_ = input.readInt64();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -115,7 +112,6 @@ private SafeSearchAnnotation(
     return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_SafeSearchAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_SafeSearchAnnotation_fieldAccessorTable
@@ -143,7 +139,6 @@ public int getAdultValue() {
    * .google.cloud.videointelligence.v1beta1.Likelihood adult = 1;
    */
   public com.google.cloud.videointelligence.v1beta1.Likelihood getAdult() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.videointelligence.v1beta1.Likelihood result = com.google.cloud.videointelligence.v1beta1.Likelihood.valueOf(adult_);
     return result == null ? com.google.cloud.videointelligence.v1beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -170,7 +165,6 @@ public int getSpoofValue() {
    * .google.cloud.videointelligence.v1beta1.Likelihood spoof = 2;
    */
   public com.google.cloud.videointelligence.v1beta1.Likelihood getSpoof() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.videointelligence.v1beta1.Likelihood result = com.google.cloud.videointelligence.v1beta1.Likelihood.valueOf(spoof_);
     return result == null ? com.google.cloud.videointelligence.v1beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -195,7 +189,6 @@ public int getMedicalValue() {
    * .google.cloud.videointelligence.v1beta1.Likelihood medical = 3;
    */
   public com.google.cloud.videointelligence.v1beta1.Likelihood getMedical() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.videointelligence.v1beta1.Likelihood result = com.google.cloud.videointelligence.v1beta1.Likelihood.valueOf(medical_);
     return result == null ? com.google.cloud.videointelligence.v1beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -220,7 +213,6 @@ public int getViolentValue() {
    * .google.cloud.videointelligence.v1beta1.Likelihood violent = 4;
    */
   public com.google.cloud.videointelligence.v1beta1.Likelihood getViolent() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.videointelligence.v1beta1.Likelihood result = com.google.cloud.videointelligence.v1beta1.Likelihood.valueOf(violent_);
     return result == null ? com.google.cloud.videointelligence.v1beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -245,7 +237,6 @@ public int getRacyValue() {
    * .google.cloud.videointelligence.v1beta1.Likelihood racy = 5;
    */
   public com.google.cloud.videointelligence.v1beta1.Likelihood getRacy() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.videointelligence.v1beta1.Likelihood result = com.google.cloud.videointelligence.v1beta1.Likelihood.valueOf(racy_);
     return result == null ? com.google.cloud.videointelligence.v1beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -264,7 +255,6 @@ public long getTimeOffset() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -274,7 +264,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (adult_ != com.google.cloud.videointelligence.v1beta1.Likelihood.UNKNOWN.getNumber()) {
@@ -298,7 +287,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -450,7 +438,6 @@ public static com.google.cloud.videointelligence.v1beta1.SafeSearchAnnotation pa
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -458,7 +445,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta1.SafeSearchAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -490,7 +476,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_SafeSearchAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_SafeSearchAnnotation_fieldAccessorTable
@@ -513,7 +498,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       adult_ = 0;
@@ -531,18 +515,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_SafeSearchAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.SafeSearchAnnotation getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta1.SafeSearchAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.SafeSearchAnnotation build() {
       com.google.cloud.videointelligence.v1beta1.SafeSearchAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -551,7 +532,6 @@ public com.google.cloud.videointelligence.v1beta1.SafeSearchAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.SafeSearchAnnotation buildPartial() {
       com.google.cloud.videointelligence.v1beta1.SafeSearchAnnotation result = new com.google.cloud.videointelligence.v1beta1.SafeSearchAnnotation(this);
       result.adult_ = adult_;
@@ -564,39 +544,32 @@ public com.google.cloud.videointelligence.v1beta1.SafeSearchAnnotation buildPart
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta1.SafeSearchAnnotation) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta1.SafeSearchAnnotation)other);
@@ -631,12 +604,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta1.SafeSearchAn
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -686,7 +657,6 @@ public Builder setAdultValue(int value) {
      * .google.cloud.videointelligence.v1beta1.Likelihood adult = 1;
      */
     public com.google.cloud.videointelligence.v1beta1.Likelihood getAdult() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.videointelligence.v1beta1.Likelihood result = com.google.cloud.videointelligence.v1beta1.Likelihood.valueOf(adult_);
       return result == null ? com.google.cloud.videointelligence.v1beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -754,7 +724,6 @@ public Builder setSpoofValue(int value) {
      * .google.cloud.videointelligence.v1beta1.Likelihood spoof = 2;
      */
     public com.google.cloud.videointelligence.v1beta1.Likelihood getSpoof() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.videointelligence.v1beta1.Likelihood result = com.google.cloud.videointelligence.v1beta1.Likelihood.valueOf(spoof_);
       return result == null ? com.google.cloud.videointelligence.v1beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -821,7 +790,6 @@ public Builder setMedicalValue(int value) {
      * .google.cloud.videointelligence.v1beta1.Likelihood medical = 3;
      */
     public com.google.cloud.videointelligence.v1beta1.Likelihood getMedical() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.videointelligence.v1beta1.Likelihood result = com.google.cloud.videointelligence.v1beta1.Likelihood.valueOf(medical_);
       return result == null ? com.google.cloud.videointelligence.v1beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -886,7 +854,6 @@ public Builder setViolentValue(int value) {
      * .google.cloud.videointelligence.v1beta1.Likelihood violent = 4;
      */
     public com.google.cloud.videointelligence.v1beta1.Likelihood getViolent() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.videointelligence.v1beta1.Likelihood result = com.google.cloud.videointelligence.v1beta1.Likelihood.valueOf(violent_);
       return result == null ? com.google.cloud.videointelligence.v1beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -951,7 +918,6 @@ public Builder setRacyValue(int value) {
      * .google.cloud.videointelligence.v1beta1.Likelihood racy = 5;
      */
     public com.google.cloud.videointelligence.v1beta1.Likelihood getRacy() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.videointelligence.v1beta1.Likelihood result = com.google.cloud.videointelligence.v1beta1.Likelihood.valueOf(racy_);
       return result == null ? com.google.cloud.videointelligence.v1beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -1022,13 +988,11 @@ public Builder clearTimeOffset() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1050,12 +1014,11 @@ public static com.google.cloud.videointelligence.v1beta1.SafeSearchAnnotation ge
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SafeSearchAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SafeSearchAnnotation(input, extensionRegistry);
+        return new SafeSearchAnnotation(input, extensionRegistry);
     }
   };
 
@@ -1068,7 +1031,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta1.SafeSearchAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoAnnotationProgress.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoAnnotationProgress.java
index c2516f1ccb12..b254846e0cd6 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoAnnotationProgress.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoAnnotationProgress.java
@@ -34,9 +34,6 @@ private VideoAnnotationProgress(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private VideoAnnotationProgress(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -85,13 +89,6 @@ private VideoAnnotationProgress(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -109,7 +106,6 @@ private VideoAnnotationProgress(
     return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_VideoAnnotationProgress_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_VideoAnnotationProgress_fieldAccessorTable
@@ -242,7 +238,6 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -252,7 +247,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getInputUriBytes().isEmpty()) {
@@ -270,7 +264,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -419,7 +412,6 @@ public static com.google.cloud.videointelligence.v1beta1.VideoAnnotationProgress
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -427,7 +419,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta1.VideoAnnotationProgress prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -455,7 +446,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_VideoAnnotationProgress_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_VideoAnnotationProgress_fieldAccessorTable
@@ -478,7 +468,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       inputUri_ = "";
@@ -500,18 +489,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_VideoAnnotationProgress_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.VideoAnnotationProgress getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta1.VideoAnnotationProgress.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.VideoAnnotationProgress build() {
       com.google.cloud.videointelligence.v1beta1.VideoAnnotationProgress result = buildPartial();
       if (!result.isInitialized()) {
@@ -520,7 +506,6 @@ public com.google.cloud.videointelligence.v1beta1.VideoAnnotationProgress build(
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.VideoAnnotationProgress buildPartial() {
       com.google.cloud.videointelligence.v1beta1.VideoAnnotationProgress result = new com.google.cloud.videointelligence.v1beta1.VideoAnnotationProgress(this);
       result.inputUri_ = inputUri_;
@@ -539,39 +524,32 @@ public com.google.cloud.videointelligence.v1beta1.VideoAnnotationProgress buildP
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta1.VideoAnnotationProgress) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta1.VideoAnnotationProgress)other);
@@ -601,12 +579,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta1.VideoAnnotat
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1065,13 +1041,11 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
       }
       return updateTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1093,12 +1067,11 @@ public static com.google.cloud.videointelligence.v1beta1.VideoAnnotationProgress
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public VideoAnnotationProgress parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoAnnotationProgress(input, extensionRegistry);
+        return new VideoAnnotationProgress(input, extensionRegistry);
     }
   };
 
@@ -1111,7 +1084,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta1.VideoAnnotationProgress getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoAnnotationResults.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoAnnotationResults.java
index f71e3f8824b7..acbc8fb44f77 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoAnnotationResults.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoAnnotationResults.java
@@ -37,9 +37,6 @@ private VideoAnnotationResults(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private VideoAnnotationResults(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -106,13 +110,6 @@ private VideoAnnotationResults(
                 input.readMessage(com.google.cloud.videointelligence.v1beta1.SafeSearchAnnotation.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -142,7 +139,6 @@ private VideoAnnotationResults(
     return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_VideoAnnotationResults_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_VideoAnnotationResults_fieldAccessorTable
@@ -452,7 +448,6 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -462,7 +457,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getInputUriBytes().isEmpty()) {
@@ -486,7 +480,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -654,7 +647,6 @@ public static com.google.cloud.videointelligence.v1beta1.VideoAnnotationResults
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -662,7 +654,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta1.VideoAnnotationResults prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -690,7 +681,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_VideoAnnotationResults_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_VideoAnnotationResults_fieldAccessorTable
@@ -717,7 +707,6 @@ private void maybeForceBuilderInitialization() {
         getSafeSearchAnnotationsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       inputUri_ = "";
@@ -755,18 +744,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_VideoAnnotationResults_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.VideoAnnotationResults getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta1.VideoAnnotationResults.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.VideoAnnotationResults build() {
       com.google.cloud.videointelligence.v1beta1.VideoAnnotationResults result = buildPartial();
       if (!result.isInitialized()) {
@@ -775,7 +761,6 @@ public com.google.cloud.videointelligence.v1beta1.VideoAnnotationResults build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.VideoAnnotationResults buildPartial() {
       com.google.cloud.videointelligence.v1beta1.VideoAnnotationResults result = new com.google.cloud.videointelligence.v1beta1.VideoAnnotationResults(this);
       int from_bitField0_ = bitField0_;
@@ -827,39 +812,32 @@ public com.google.cloud.videointelligence.v1beta1.VideoAnnotationResults buildPa
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta1.VideoAnnotationResults) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta1.VideoAnnotationResults)other);
@@ -987,12 +965,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta1.VideoAnnotat
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2515,13 +2491,11 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() {
       }
       return errorBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2543,12 +2517,11 @@ public static com.google.cloud.videointelligence.v1beta1.VideoAnnotationResults
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public VideoAnnotationResults parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoAnnotationResults(input, extensionRegistry);
+        return new VideoAnnotationResults(input, extensionRegistry);
     }
   };
 
@@ -2561,7 +2534,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta1.VideoAnnotationResults getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoContext.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoContext.java
index a4228fb23416..e3c6b3c9e625 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoContext.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoContext.java
@@ -39,9 +39,6 @@ private VideoContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private VideoContext(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               segments_ = new java.util.ArrayList();
@@ -97,13 +101,6 @@ private VideoContext(
             safeSearchDetectionModel_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -124,7 +121,6 @@ private VideoContext(
     return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_VideoContext_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_VideoContext_fieldAccessorTable
@@ -222,7 +218,6 @@ public int getLabelDetectionModeValue() {
    * .google.cloud.videointelligence.v1beta1.LabelDetectionMode label_detection_mode = 2;
    */
   public com.google.cloud.videointelligence.v1beta1.LabelDetectionMode getLabelDetectionMode() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.videointelligence.v1beta1.LabelDetectionMode result = com.google.cloud.videointelligence.v1beta1.LabelDetectionMode.valueOf(labelDetectionMode_);
     return result == null ? com.google.cloud.videointelligence.v1beta1.LabelDetectionMode.UNRECOGNIZED : result;
   }
@@ -418,7 +413,6 @@ public java.lang.String getSafeSearchDetectionModel() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -428,7 +422,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < segments_.size(); i++) {
@@ -455,7 +448,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -617,7 +609,6 @@ public static com.google.cloud.videointelligence.v1beta1.VideoContext parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -625,7 +616,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta1.VideoContext prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -653,7 +643,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_VideoContext_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_VideoContext_fieldAccessorTable
@@ -677,7 +666,6 @@ private void maybeForceBuilderInitialization() {
         getSegmentsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (segmentsBuilder_ == null) {
@@ -701,18 +689,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_VideoContext_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.VideoContext getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta1.VideoContext.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.VideoContext build() {
       com.google.cloud.videointelligence.v1beta1.VideoContext result = buildPartial();
       if (!result.isInitialized()) {
@@ -721,7 +706,6 @@ public com.google.cloud.videointelligence.v1beta1.VideoContext build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.VideoContext buildPartial() {
       com.google.cloud.videointelligence.v1beta1.VideoContext result = new com.google.cloud.videointelligence.v1beta1.VideoContext(this);
       int from_bitField0_ = bitField0_;
@@ -746,39 +730,32 @@ public com.google.cloud.videointelligence.v1beta1.VideoContext buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta1.VideoContext) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta1.VideoContext)other);
@@ -843,12 +820,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta1.VideoContext
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1253,7 +1228,6 @@ public Builder setLabelDetectionModeValue(int value) {
      * .google.cloud.videointelligence.v1beta1.LabelDetectionMode label_detection_mode = 2;
      */
     public com.google.cloud.videointelligence.v1beta1.LabelDetectionMode getLabelDetectionMode() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.videointelligence.v1beta1.LabelDetectionMode result = com.google.cloud.videointelligence.v1beta1.LabelDetectionMode.valueOf(labelDetectionMode_);
       return result == null ? com.google.cloud.videointelligence.v1beta1.LabelDetectionMode.UNRECOGNIZED : result;
     }
@@ -1707,13 +1681,11 @@ public Builder setSafeSearchDetectionModelBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1735,12 +1707,11 @@ public static com.google.cloud.videointelligence.v1beta1.VideoContext getDefault
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public VideoContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoContext(input, extensionRegistry);
+        return new VideoContext(input, extensionRegistry);
     }
   };
 
@@ -1753,7 +1724,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta1.VideoContext getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceProto.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceProto.java
index 445cded9cc75..c11823b89f06 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoIntelligenceServiceProto.java
@@ -97,7 +97,7 @@ public static void registerAllExtensions(
       "ateVideoRequest\022\021\n\tinput_uri\030\001 \001(\t\022\025\n\rin" +
       "put_content\030\006 \001(\t\022A\n\010features\030\002 \003(\0162/.go" +
       "ogle.cloud.videointelligence.v1beta1.Fea" +
-      "ture\022K\n\rvideo_context\030\003 \001(\01324.google.clo" +
+      "ture\022K\n\rvideo_context\030\003 \001(\01324.google.clo",
       "ud.videointelligence.v1beta1.VideoContex" +
       "t\022\022\n\noutput_uri\030\004 \001(\t\022\023\n\013location_id\030\005 \001" +
       "(\t\"\322\002\n\014VideoContext\022F\n\010segments\030\001 \003(\01324." +
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "a1.LabelDetectionMode\022\031\n\021stationary_came" +
       "ra\030\003 \001(\010\022\035\n\025label_detection_model\030\004 \001(\t\022" +
       "\034\n\024face_detection_model\030\005 \001(\t\022#\n\033shot_ch" +
-      "ange_detection_model\030\006 \001(\t\022#\n\033safe_searc" +
+      "ange_detection_model\030\006 \001(\t\022#\n\033safe_searc",
       "h_detection_model\030\007 \001(\t\"B\n\014VideoSegment\022" +
       "\031\n\021start_time_offset\030\001 \001(\003\022\027\n\017end_time_o" +
       "ffset\030\002 \001(\003\"\255\001\n\rLabelLocation\022E\n\007segment" +
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       "lligence.v1beta1.LabelLevel\"\207\001\n\017LabelAnn" +
       "otation\022\023\n\013description\030\001 \001(\t\022\025\n\rlanguage" +
       "_code\030\002 \001(\t\022H\n\tlocations\030\003 \003(\01325.google." +
-      "cloud.videointelligence.v1beta1.LabelLoc" +
+      "cloud.videointelligence.v1beta1.LabelLoc",
       "ation\"\375\002\n\024SafeSearchAnnotation\022A\n\005adult\030" +
       "\001 \001(\01622.google.cloud.videointelligence.v" +
       "1beta1.Likelihood\022A\n\005spoof\030\002 \001(\01622.googl" +
@@ -127,7 +127,7 @@ public static void registerAllExtensions(
       "lent\030\004 \001(\01622.google.cloud.videointellige" +
       "nce.v1beta1.Likelihood\022@\n\004racy\030\005 \001(\01622.g" +
       "oogle.cloud.videointelligence.v1beta1.Li" +
-      "kelihood\022\023\n\013time_offset\030\006 \001(\003\"G\n\013Boundin" +
+      "kelihood\022\023\n\013time_offset\030\006 \001(\003\"G\n\013Boundin",
       "gBox\022\014\n\004left\030\001 \001(\005\022\r\n\005right\030\002 \001(\005\022\016\n\006bot" +
       "tom\030\003 \001(\005\022\013\n\003top\030\004 \001(\005\"n\n\014FaceLocation\022I" +
       "\n\014bounding_box\030\001 \001(\01323.google.cloud.vide" +
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       "cloud.videointelligence.v1beta1.VideoSeg" +
       "ment\022G\n\tlocations\030\003 \003(\01324.google.cloud.v" +
       "ideointelligence.v1beta1.FaceLocation\"\243\003" +
-      "\n\026VideoAnnotationResults\022\021\n\tinput_uri\030\001 " +
+      "\n\026VideoAnnotationResults\022\021\n\tinput_uri\030\001 ",
       "\001(\t\022R\n\021label_annotations\030\002 \003(\01327.google." +
       "cloud.videointelligence.v1beta1.LabelAnn" +
       "otation\022P\n\020face_annotations\030\003 \003(\01326.goog" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "eoSegment\022]\n\027safe_search_annotations\030\006 \003" +
       "(\0132<.google.cloud.videointelligence.v1be" +
       "ta1.SafeSearchAnnotation\022!\n\005error\030\005 \001(\0132" +
-      "\022.google.rpc.Status\"s\n\025AnnotateVideoResp" +
+      "\022.google.rpc.Status\"s\n\025AnnotateVideoResp",
       "onse\022Z\n\022annotation_results\030\001 \003(\0132>.googl" +
       "e.cloud.videointelligence.v1beta1.VideoA" +
       "nnotationResults\"\247\001\n\027VideoAnnotationProg" +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       ".google.protobuf.Timestamp\"u\n\025AnnotateVi" +
       "deoProgress\022\\\n\023annotation_progress\030\001 \003(\013" +
       "2?.google.cloud.videointelligence.v1beta" +
-      "1.VideoAnnotationProgress*\201\001\n\007Feature\022\027\n" +
+      "1.VideoAnnotationProgress*\201\001\n\007Feature\022\027\n",
       "\023FEATURE_UNSPECIFIED\020\000\022\023\n\017LABEL_DETECTIO" +
       "N\020\001\022\022\n\016FACE_DETECTION\020\002\022\031\n\025SHOT_CHANGE_D" +
       "ETECTION\020\003\022\031\n\025SAFE_SEARCH_DETECTION\020\004*n\n" +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       "tectionMode\022$\n LABEL_DETECTION_MODE_UNSP" +
       "ECIFIED\020\000\022\r\n\tSHOT_MODE\020\001\022\016\n\nFRAME_MODE\020\002" +
       "\022\027\n\023SHOT_AND_FRAME_MODE\020\003*e\n\nLikelihood\022" +
-      "\013\n\007UNKNOWN\020\000\022\021\n\rVERY_UNLIKELY\020\001\022\014\n\010UNLIK" +
+      "\013\n\007UNKNOWN\020\000\022\021\n\rVERY_UNLIKELY\020\001\022\014\n\010UNLIK",
       "ELY\020\002\022\014\n\010POSSIBLE\020\003\022\n\n\006LIKELY\020\004\022\017\n\013VERY_" +
       "LIKELY\020\0052\256\001\n\030VideoIntelligenceService\022\221\001" +
       "\n\rAnnotateVideo\022<.google.cloud.videointe" +
@@ -177,7 +177,7 @@ public static void registerAllExtensions(
       ".cloud.videointelligence.v1beta1B\035VideoI" +
       "ntelligenceServiceProtoP\001ZWgoogle.golang" +
       ".org/genproto/googleapis/cloud/videointe" +
-      "lligence/v1beta1;videointelligence\252\002&Goo" +
+      "lligence/v1beta1;videointelligence\252\002&Goo",
       "gle.Cloud.VideoIntelligence.V1Beta1\312\002&Go" +
       "ogle\\Cloud\\VideoIntelligence\\V1beta1b\006pr" +
       "oto3"
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoSegment.java
index efde2bf4234b..81f8355f4f6a 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoSegment.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta1/src/main/java/com/google/cloud/videointelligence/v1beta1/VideoSegment.java
@@ -34,9 +34,6 @@ private VideoSegment(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private VideoSegment(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
 
             startTimeOffset_ = input.readInt64();
@@ -58,13 +62,6 @@ private VideoSegment(
             endTimeOffset_ = input.readInt64();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -82,7 +79,6 @@ private VideoSegment(
     return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_VideoSegment_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_VideoSegment_fieldAccessorTable
@@ -117,7 +113,6 @@ public long getEndTimeOffset() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -127,7 +122,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (startTimeOffset_ != 0L) {
@@ -139,7 +133,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static com.google.cloud.videointelligence.v1beta1.VideoSegment parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta1.VideoSegment prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_VideoSegment_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_VideoSegment_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       startTimeOffset_ = 0L;
@@ -334,18 +323,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta1_VideoSegment_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.VideoSegment getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta1.VideoSegment.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.VideoSegment build() {
       com.google.cloud.videointelligence.v1beta1.VideoSegment result = buildPartial();
       if (!result.isInitialized()) {
@@ -354,7 +340,6 @@ public com.google.cloud.videointelligence.v1beta1.VideoSegment build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta1.VideoSegment buildPartial() {
       com.google.cloud.videointelligence.v1beta1.VideoSegment result = new com.google.cloud.videointelligence.v1beta1.VideoSegment(this);
       result.startTimeOffset_ = startTimeOffset_;
@@ -363,39 +348,32 @@ public com.google.cloud.videointelligence.v1beta1.VideoSegment buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta1.VideoSegment) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta1.VideoSegment)other);
@@ -418,12 +396,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta1.VideoSegment
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -517,13 +493,11 @@ public Builder clearEndTimeOffset() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -545,12 +519,11 @@ public static com.google.cloud.videointelligence.v1beta1.VideoSegment getDefault
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public VideoSegment parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoSegment(input, extensionRegistry);
+        return new VideoSegment(input, extensionRegistry);
     }
   };
 
@@ -563,7 +536,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta1.VideoSegment getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoProgress.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoProgress.java
index 43bf6dceb44b..65c4e26a91d4 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoProgress.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoProgress.java
@@ -35,9 +35,6 @@ private AnnotateVideoProgress(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private AnnotateVideoProgress(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               annotationProgress_ = new java.util.ArrayList();
@@ -58,13 +62,6 @@ private AnnotateVideoProgress(
                 input.readMessage(com.google.cloud.videointelligence.v1beta2.VideoAnnotationProgress.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -85,7 +82,6 @@ private AnnotateVideoProgress(
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_AnnotateVideoProgress_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_AnnotateVideoProgress_fieldAccessorTable
@@ -149,7 +145,6 @@ public com.google.cloud.videointelligence.v1beta2.VideoAnnotationProgressOrBuild
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -159,7 +154,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < annotationProgress_.size(); i++) {
@@ -168,7 +162,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -286,7 +279,6 @@ public static com.google.cloud.videointelligence.v1beta2.AnnotateVideoProgress p
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -294,7 +286,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta2.AnnotateVideoProgress prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -324,7 +315,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_AnnotateVideoProgress_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_AnnotateVideoProgress_fieldAccessorTable
@@ -348,7 +338,6 @@ private void maybeForceBuilderInitialization() {
         getAnnotationProgressFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (annotationProgressBuilder_ == null) {
@@ -360,18 +349,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_AnnotateVideoProgress_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.AnnotateVideoProgress getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta2.AnnotateVideoProgress.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.AnnotateVideoProgress build() {
       com.google.cloud.videointelligence.v1beta2.AnnotateVideoProgress result = buildPartial();
       if (!result.isInitialized()) {
@@ -380,7 +366,6 @@ public com.google.cloud.videointelligence.v1beta2.AnnotateVideoProgress build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.AnnotateVideoProgress buildPartial() {
       com.google.cloud.videointelligence.v1beta2.AnnotateVideoProgress result = new com.google.cloud.videointelligence.v1beta2.AnnotateVideoProgress(this);
       int from_bitField0_ = bitField0_;
@@ -397,39 +382,32 @@ public com.google.cloud.videointelligence.v1beta2.AnnotateVideoProgress buildPar
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta2.AnnotateVideoProgress) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta2.AnnotateVideoProgress)other);
@@ -472,12 +450,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta2.AnnotateVide
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -808,13 +784,11 @@ public com.google.cloud.videointelligence.v1beta2.VideoAnnotationProgress.Builde
       }
       return annotationProgressBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -836,12 +810,11 @@ public static com.google.cloud.videointelligence.v1beta2.AnnotateVideoProgress g
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnnotateVideoProgress parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateVideoProgress(input, extensionRegistry);
+        return new AnnotateVideoProgress(input, extensionRegistry);
     }
   };
 
@@ -854,7 +827,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta2.AnnotateVideoProgress getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoRequest.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoRequest.java
index 07070bc0382d..e4d7dc7195d1 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoRequest.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoRequest.java
@@ -37,9 +37,6 @@ private AnnotateVideoRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private AnnotateVideoRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -110,13 +114,6 @@ private AnnotateVideoRequest(
             inputContent_ = input.readBytes();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -137,7 +134,6 @@ private AnnotateVideoRequest(
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_AnnotateVideoRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_AnnotateVideoRequest_fieldAccessorTable
@@ -228,7 +224,6 @@ public com.google.protobuf.ByteString getInputContent() {
           new com.google.protobuf.Internal.ListAdapter.Converter<
               java.lang.Integer, com.google.cloud.videointelligence.v1beta2.Feature>() {
             public com.google.cloud.videointelligence.v1beta2.Feature convert(java.lang.Integer from) {
-              @SuppressWarnings("deprecation")
               com.google.cloud.videointelligence.v1beta2.Feature result = com.google.cloud.videointelligence.v1beta2.Feature.valueOf(from);
               return result == null ? com.google.cloud.videointelligence.v1beta2.Feature.UNRECOGNIZED : result;
             }
@@ -419,7 +414,6 @@ public java.lang.String getLocationId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -429,7 +423,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     getSerializedSize();
@@ -458,7 +451,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -625,7 +617,6 @@ public static com.google.cloud.videointelligence.v1beta2.AnnotateVideoRequest pa
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -633,7 +624,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta2.AnnotateVideoRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -661,7 +651,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_AnnotateVideoRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_AnnotateVideoRequest_fieldAccessorTable
@@ -684,7 +673,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       inputUri_ = "";
@@ -706,18 +694,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_AnnotateVideoRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.AnnotateVideoRequest getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta2.AnnotateVideoRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.AnnotateVideoRequest build() {
       com.google.cloud.videointelligence.v1beta2.AnnotateVideoRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -726,7 +711,6 @@ public com.google.cloud.videointelligence.v1beta2.AnnotateVideoRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.AnnotateVideoRequest buildPartial() {
       com.google.cloud.videointelligence.v1beta2.AnnotateVideoRequest result = new com.google.cloud.videointelligence.v1beta2.AnnotateVideoRequest(this);
       int from_bitField0_ = bitField0_;
@@ -750,39 +734,32 @@ public com.google.cloud.videointelligence.v1beta2.AnnotateVideoRequest buildPart
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta2.AnnotateVideoRequest) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta2.AnnotateVideoRequest)other);
@@ -827,12 +804,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta2.AnnotateVide
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1564,13 +1539,11 @@ public Builder setLocationIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1592,12 +1565,11 @@ public static com.google.cloud.videointelligence.v1beta2.AnnotateVideoRequest ge
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnnotateVideoRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateVideoRequest(input, extensionRegistry);
+        return new AnnotateVideoRequest(input, extensionRegistry);
     }
   };
 
@@ -1610,7 +1582,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta2.AnnotateVideoRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoResponse.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoResponse.java
index 4dc370d28f0a..e4a0777e6c74 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoResponse.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/AnnotateVideoResponse.java
@@ -35,9 +35,6 @@ private AnnotateVideoResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private AnnotateVideoResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               annotationResults_ = new java.util.ArrayList();
@@ -58,13 +62,6 @@ private AnnotateVideoResponse(
                 input.readMessage(com.google.cloud.videointelligence.v1beta2.VideoAnnotationResults.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -85,7 +82,6 @@ private AnnotateVideoResponse(
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_AnnotateVideoResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_AnnotateVideoResponse_fieldAccessorTable
@@ -149,7 +145,6 @@ public com.google.cloud.videointelligence.v1beta2.VideoAnnotationResultsOrBuilde
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -159,7 +154,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < annotationResults_.size(); i++) {
@@ -168,7 +162,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -286,7 +279,6 @@ public static com.google.cloud.videointelligence.v1beta2.AnnotateVideoResponse p
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -294,7 +286,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta2.AnnotateVideoResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -324,7 +315,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_AnnotateVideoResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_AnnotateVideoResponse_fieldAccessorTable
@@ -348,7 +338,6 @@ private void maybeForceBuilderInitialization() {
         getAnnotationResultsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (annotationResultsBuilder_ == null) {
@@ -360,18 +349,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_AnnotateVideoResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.AnnotateVideoResponse getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta2.AnnotateVideoResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.AnnotateVideoResponse build() {
       com.google.cloud.videointelligence.v1beta2.AnnotateVideoResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -380,7 +366,6 @@ public com.google.cloud.videointelligence.v1beta2.AnnotateVideoResponse build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.AnnotateVideoResponse buildPartial() {
       com.google.cloud.videointelligence.v1beta2.AnnotateVideoResponse result = new com.google.cloud.videointelligence.v1beta2.AnnotateVideoResponse(this);
       int from_bitField0_ = bitField0_;
@@ -397,39 +382,32 @@ public com.google.cloud.videointelligence.v1beta2.AnnotateVideoResponse buildPar
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta2.AnnotateVideoResponse) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta2.AnnotateVideoResponse)other);
@@ -472,12 +450,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta2.AnnotateVide
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -808,13 +784,11 @@ public com.google.cloud.videointelligence.v1beta2.VideoAnnotationResults.Builder
       }
       return annotationResultsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -836,12 +810,11 @@ public static com.google.cloud.videointelligence.v1beta2.AnnotateVideoResponse g
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnnotateVideoResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateVideoResponse(input, extensionRegistry);
+        return new AnnotateVideoResponse(input, extensionRegistry);
     }
   };
 
@@ -854,7 +827,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta2.AnnotateVideoResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/Entity.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/Entity.java
index acfc7753382a..d630fd56f843 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/Entity.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/Entity.java
@@ -35,9 +35,6 @@ private Entity(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private Entity(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -67,13 +71,6 @@ private Entity(
             languageCode_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private Entity(
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_Entity_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_Entity_fieldAccessorTable
@@ -230,7 +226,6 @@ public java.lang.String getLanguageCode() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -240,7 +235,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getEntityIdBytes().isEmpty()) {
@@ -255,7 +249,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -384,7 +377,6 @@ public static com.google.cloud.videointelligence.v1beta2.Entity parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -392,7 +384,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta2.Entity prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -420,7 +411,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_Entity_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_Entity_fieldAccessorTable
@@ -443,7 +433,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       entityId_ = "";
@@ -455,18 +444,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_Entity_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.Entity getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta2.Entity.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.Entity build() {
       com.google.cloud.videointelligence.v1beta2.Entity result = buildPartial();
       if (!result.isInitialized()) {
@@ -475,7 +461,6 @@ public com.google.cloud.videointelligence.v1beta2.Entity build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.Entity buildPartial() {
       com.google.cloud.videointelligence.v1beta2.Entity result = new com.google.cloud.videointelligence.v1beta2.Entity(this);
       result.entityId_ = entityId_;
@@ -485,39 +470,32 @@ public com.google.cloud.videointelligence.v1beta2.Entity buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta2.Entity) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta2.Entity)other);
@@ -546,12 +524,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta2.Entity other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -846,13 +822,11 @@ public Builder setLanguageCodeBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -874,12 +848,11 @@ public static com.google.cloud.videointelligence.v1beta2.Entity getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Entity parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Entity(input, extensionRegistry);
+        return new Entity(input, extensionRegistry);
     }
   };
 
@@ -892,7 +865,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta2.Entity getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentAnnotation.java
index 12599d128172..9f6c8af61abf 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentAnnotation.java
@@ -35,9 +35,6 @@ private ExplicitContentAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ExplicitContentAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               frames_ = new java.util.ArrayList();
@@ -58,13 +62,6 @@ private ExplicitContentAnnotation(
                 input.readMessage(com.google.cloud.videointelligence.v1beta2.ExplicitContentFrame.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -85,7 +82,6 @@ private ExplicitContentAnnotation(
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_ExplicitContentAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_ExplicitContentAnnotation_fieldAccessorTable
@@ -149,7 +145,6 @@ public com.google.cloud.videointelligence.v1beta2.ExplicitContentFrameOrBuilder
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -159,7 +154,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < frames_.size(); i++) {
@@ -168,7 +162,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -286,7 +279,6 @@ public static com.google.cloud.videointelligence.v1beta2.ExplicitContentAnnotati
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -294,7 +286,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta2.ExplicitContentAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -324,7 +315,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_ExplicitContentAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_ExplicitContentAnnotation_fieldAccessorTable
@@ -348,7 +338,6 @@ private void maybeForceBuilderInitialization() {
         getFramesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (framesBuilder_ == null) {
@@ -360,18 +349,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_ExplicitContentAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.ExplicitContentAnnotation getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta2.ExplicitContentAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.ExplicitContentAnnotation build() {
       com.google.cloud.videointelligence.v1beta2.ExplicitContentAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -380,7 +366,6 @@ public com.google.cloud.videointelligence.v1beta2.ExplicitContentAnnotation buil
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.ExplicitContentAnnotation buildPartial() {
       com.google.cloud.videointelligence.v1beta2.ExplicitContentAnnotation result = new com.google.cloud.videointelligence.v1beta2.ExplicitContentAnnotation(this);
       int from_bitField0_ = bitField0_;
@@ -397,39 +382,32 @@ public com.google.cloud.videointelligence.v1beta2.ExplicitContentAnnotation buil
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta2.ExplicitContentAnnotation) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta2.ExplicitContentAnnotation)other);
@@ -472,12 +450,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta2.ExplicitCont
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -808,13 +784,11 @@ public com.google.cloud.videointelligence.v1beta2.ExplicitContentFrame.Builder a
       }
       return framesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -836,12 +810,11 @@ public static com.google.cloud.videointelligence.v1beta2.ExplicitContentAnnotati
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ExplicitContentAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ExplicitContentAnnotation(input, extensionRegistry);
+        return new ExplicitContentAnnotation(input, extensionRegistry);
     }
   };
 
@@ -854,7 +827,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta2.ExplicitContentAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentDetectionConfig.java
index 364634b61158..73ce34ef268d 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentDetectionConfig.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentDetectionConfig.java
@@ -33,9 +33,6 @@ private ExplicitContentDetectionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private ExplicitContentDetectionConfig(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            model_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private ExplicitContentDetectionConfig(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            model_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private ExplicitContentDetectionConfig(
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_ExplicitContentDetectionConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_ExplicitContentDetectionConfig_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getModel() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getModelBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.videointelligence.v1beta2.ExplicitContentDetectio
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta2.ExplicitContentDetectionConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_ExplicitContentDetectionConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_ExplicitContentDetectionConfig_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       model_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_ExplicitContentDetectionConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.ExplicitContentDetectionConfig getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta2.ExplicitContentDetectionConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.ExplicitContentDetectionConfig build() {
       com.google.cloud.videointelligence.v1beta2.ExplicitContentDetectionConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.videointelligence.v1beta2.ExplicitContentDetectionConfig
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.ExplicitContentDetectionConfig buildPartial() {
       com.google.cloud.videointelligence.v1beta2.ExplicitContentDetectionConfig result = new com.google.cloud.videointelligence.v1beta2.ExplicitContentDetectionConfig(this);
       result.model_ = model_;
@@ -361,39 +346,32 @@ public com.google.cloud.videointelligence.v1beta2.ExplicitContentDetectionConfig
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta2.ExplicitContentDetectionConfig) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta2.ExplicitContentDetectionConfig)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta2.ExplicitCont
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setModelBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.videointelligence.v1beta2.ExplicitContentDetectio
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ExplicitContentDetectionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ExplicitContentDetectionConfig(input, extensionRegistry);
+        return new ExplicitContentDetectionConfig(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForTy
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta2.ExplicitContentDetectionConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentFrame.java
index 8d0097712949..20bde768f1e2 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentFrame.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ExplicitContentFrame.java
@@ -33,9 +33,6 @@ private ExplicitContentFrame(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ExplicitContentFrame(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.protobuf.Duration.Builder subBuilder = null;
             if (timeOffset_ != null) {
@@ -66,13 +70,6 @@ private ExplicitContentFrame(
             pornographyLikelihood_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ExplicitContentFrame(
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_ExplicitContentFrame_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_ExplicitContentFrame_fieldAccessorTable
@@ -154,13 +150,11 @@ public int getPornographyLikelihoodValue() {
    * .google.cloud.videointelligence.v1beta2.Likelihood pornography_likelihood = 2;
    */
   public com.google.cloud.videointelligence.v1beta2.Likelihood getPornographyLikelihood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.videointelligence.v1beta2.Likelihood result = com.google.cloud.videointelligence.v1beta2.Likelihood.valueOf(pornographyLikelihood_);
     return result == null ? com.google.cloud.videointelligence.v1beta2.Likelihood.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -170,7 +164,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (timeOffset_ != null) {
@@ -182,7 +175,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -310,7 +302,6 @@ public static com.google.cloud.videointelligence.v1beta2.ExplicitContentFrame pa
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -318,7 +309,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta2.ExplicitContentFrame prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -346,7 +336,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_ExplicitContentFrame_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_ExplicitContentFrame_fieldAccessorTable
@@ -369,7 +358,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (timeOffsetBuilder_ == null) {
@@ -383,18 +371,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_ExplicitContentFrame_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.ExplicitContentFrame getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta2.ExplicitContentFrame.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.ExplicitContentFrame build() {
       com.google.cloud.videointelligence.v1beta2.ExplicitContentFrame result = buildPartial();
       if (!result.isInitialized()) {
@@ -403,7 +388,6 @@ public com.google.cloud.videointelligence.v1beta2.ExplicitContentFrame build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.ExplicitContentFrame buildPartial() {
       com.google.cloud.videointelligence.v1beta2.ExplicitContentFrame result = new com.google.cloud.videointelligence.v1beta2.ExplicitContentFrame(this);
       if (timeOffsetBuilder_ == null) {
@@ -416,39 +400,32 @@ public com.google.cloud.videointelligence.v1beta2.ExplicitContentFrame buildPart
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta2.ExplicitContentFrame) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta2.ExplicitContentFrame)other);
@@ -471,12 +448,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta2.ExplicitCont
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -688,7 +663,6 @@ public Builder setPornographyLikelihoodValue(int value) {
      * .google.cloud.videointelligence.v1beta2.Likelihood pornography_likelihood = 2;
      */
     public com.google.cloud.videointelligence.v1beta2.Likelihood getPornographyLikelihood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.videointelligence.v1beta2.Likelihood result = com.google.cloud.videointelligence.v1beta2.Likelihood.valueOf(pornographyLikelihood_);
       return result == null ? com.google.cloud.videointelligence.v1beta2.Likelihood.UNRECOGNIZED : result;
     }
@@ -721,13 +695,11 @@ public Builder clearPornographyLikelihood() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -749,12 +721,11 @@ public static com.google.cloud.videointelligence.v1beta2.ExplicitContentFrame ge
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ExplicitContentFrame parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ExplicitContentFrame(input, extensionRegistry);
+        return new ExplicitContentFrame(input, extensionRegistry);
     }
   };
 
@@ -767,7 +738,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta2.ExplicitContentFrame getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceAnnotation.java
index f664947e565e..322add054250 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceAnnotation.java
@@ -35,9 +35,6 @@ private FaceAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private FaceAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
 
             thumbnail_ = input.readBytes();
@@ -72,13 +76,6 @@ private FaceAnnotation(
                 input.readMessage(com.google.cloud.videointelligence.v1beta2.FaceFrame.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -102,7 +99,6 @@ private FaceAnnotation(
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_FaceAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_FaceAnnotation_fieldAccessorTable
@@ -235,7 +231,6 @@ public com.google.cloud.videointelligence.v1beta2.FaceFrameOrBuilder getFramesOr
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -245,7 +240,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!thumbnail_.isEmpty()) {
@@ -260,7 +254,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -396,7 +389,6 @@ public static com.google.cloud.videointelligence.v1beta2.FaceAnnotation parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -404,7 +396,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta2.FaceAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -432,7 +423,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_FaceAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_FaceAnnotation_fieldAccessorTable
@@ -457,7 +447,6 @@ private void maybeForceBuilderInitialization() {
         getFramesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       thumbnail_ = com.google.protobuf.ByteString.EMPTY;
@@ -477,18 +466,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_FaceAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.FaceAnnotation getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta2.FaceAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.FaceAnnotation build() {
       com.google.cloud.videointelligence.v1beta2.FaceAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -497,7 +483,6 @@ public com.google.cloud.videointelligence.v1beta2.FaceAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.FaceAnnotation buildPartial() {
       com.google.cloud.videointelligence.v1beta2.FaceAnnotation result = new com.google.cloud.videointelligence.v1beta2.FaceAnnotation(this);
       int from_bitField0_ = bitField0_;
@@ -526,39 +511,32 @@ public com.google.cloud.videointelligence.v1beta2.FaceAnnotation buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta2.FaceAnnotation) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta2.FaceAnnotation)other);
@@ -630,12 +608,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta2.FaceAnnotati
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1319,13 +1295,11 @@ public com.google.cloud.videointelligence.v1beta2.FaceFrame.Builder addFramesBui
       }
       return framesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1347,12 +1321,11 @@ public static com.google.cloud.videointelligence.v1beta2.FaceAnnotation getDefau
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public FaceAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FaceAnnotation(input, extensionRegistry);
+        return new FaceAnnotation(input, extensionRegistry);
     }
   };
 
@@ -1365,7 +1338,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta2.FaceAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceDetectionConfig.java
index d32b5f8e8e0b..360cdd968096 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceDetectionConfig.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceDetectionConfig.java
@@ -34,9 +34,6 @@ private FaceDetectionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private FaceDetectionConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -59,13 +63,6 @@ private FaceDetectionConfig(
             includeBoundingBoxes_ = input.readBool();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private FaceDetectionConfig(
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_FaceDetectionConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_FaceDetectionConfig_fieldAccessorTable
@@ -151,7 +147,6 @@ public boolean getIncludeBoundingBoxes() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -161,7 +156,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getModelBytes().isEmpty()) {
@@ -173,7 +167,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -297,7 +290,6 @@ public static com.google.cloud.videointelligence.v1beta2.FaceDetectionConfig par
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -305,7 +297,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta2.FaceDetectionConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -333,7 +324,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_FaceDetectionConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_FaceDetectionConfig_fieldAccessorTable
@@ -356,7 +346,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       model_ = "";
@@ -366,18 +355,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_FaceDetectionConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.FaceDetectionConfig getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta2.FaceDetectionConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.FaceDetectionConfig build() {
       com.google.cloud.videointelligence.v1beta2.FaceDetectionConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -386,7 +372,6 @@ public com.google.cloud.videointelligence.v1beta2.FaceDetectionConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.FaceDetectionConfig buildPartial() {
       com.google.cloud.videointelligence.v1beta2.FaceDetectionConfig result = new com.google.cloud.videointelligence.v1beta2.FaceDetectionConfig(this);
       result.model_ = model_;
@@ -395,39 +380,32 @@ public com.google.cloud.videointelligence.v1beta2.FaceDetectionConfig buildParti
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta2.FaceDetectionConfig) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta2.FaceDetectionConfig)other);
@@ -451,12 +429,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta2.FaceDetectio
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -611,13 +587,11 @@ public Builder clearIncludeBoundingBoxes() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -639,12 +613,11 @@ public static com.google.cloud.videointelligence.v1beta2.FaceDetectionConfig get
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public FaceDetectionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FaceDetectionConfig(input, extensionRegistry);
+        return new FaceDetectionConfig(input, extensionRegistry);
     }
   };
 
@@ -657,7 +630,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta2.FaceDetectionConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceFrame.java
index 03f475e5f58b..3d561ebdb346 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceFrame.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceFrame.java
@@ -33,9 +33,6 @@ private FaceFrame(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private FaceFrame(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               normalizedBoundingBoxes_ = new java.util.ArrayList();
@@ -69,13 +73,6 @@ private FaceFrame(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private FaceFrame(
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_FaceFrame_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_FaceFrame_fieldAccessorTable
@@ -207,7 +203,6 @@ public com.google.protobuf.DurationOrBuilder getTimeOffsetOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -217,7 +212,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < normalizedBoundingBoxes_.size(); i++) {
@@ -229,7 +223,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -360,7 +353,6 @@ public static com.google.cloud.videointelligence.v1beta2.FaceFrame parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -368,7 +360,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta2.FaceFrame prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -396,7 +387,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_FaceFrame_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_FaceFrame_fieldAccessorTable
@@ -420,7 +410,6 @@ private void maybeForceBuilderInitialization() {
         getNormalizedBoundingBoxesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (normalizedBoundingBoxesBuilder_ == null) {
@@ -438,18 +427,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_FaceFrame_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.FaceFrame getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta2.FaceFrame.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.FaceFrame build() {
       com.google.cloud.videointelligence.v1beta2.FaceFrame result = buildPartial();
       if (!result.isInitialized()) {
@@ -458,7 +444,6 @@ public com.google.cloud.videointelligence.v1beta2.FaceFrame build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.FaceFrame buildPartial() {
       com.google.cloud.videointelligence.v1beta2.FaceFrame result = new com.google.cloud.videointelligence.v1beta2.FaceFrame(this);
       int from_bitField0_ = bitField0_;
@@ -482,39 +467,32 @@ public com.google.cloud.videointelligence.v1beta2.FaceFrame buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta2.FaceFrame) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta2.FaceFrame)other);
@@ -560,12 +538,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta2.FaceFrame ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1094,13 +1070,11 @@ public com.google.protobuf.DurationOrBuilder getTimeOffsetOrBuilder() {
       }
       return timeOffsetBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1122,12 +1096,11 @@ public static com.google.cloud.videointelligence.v1beta2.FaceFrame getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public FaceFrame parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FaceFrame(input, extensionRegistry);
+        return new FaceFrame(input, extensionRegistry);
     }
   };
 
@@ -1140,7 +1113,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta2.FaceFrame getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceSegment.java
index bb08ca1b4b91..9cb84f3759f0 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceSegment.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/FaceSegment.java
@@ -32,9 +32,6 @@ private FaceSegment(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private FaceSegment(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.videointelligence.v1beta2.VideoSegment.Builder subBuilder = null;
             if (segment_ != null) {
@@ -59,13 +63,6 @@ private FaceSegment(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private FaceSegment(
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_FaceSegment_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_FaceSegment_fieldAccessorTable
@@ -125,7 +121,6 @@ public com.google.cloud.videointelligence.v1beta2.VideoSegmentOrBuilder getSegme
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -135,7 +130,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (segment_ != null) {
@@ -144,7 +138,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static com.google.cloud.videointelligence.v1beta2.FaceSegment parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta2.FaceSegment prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_FaceSegment_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_FaceSegment_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (segmentBuilder_ == null) {
@@ -336,18 +325,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_FaceSegment_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.FaceSegment getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta2.FaceSegment.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.FaceSegment build() {
       com.google.cloud.videointelligence.v1beta2.FaceSegment result = buildPartial();
       if (!result.isInitialized()) {
@@ -356,7 +342,6 @@ public com.google.cloud.videointelligence.v1beta2.FaceSegment build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.FaceSegment buildPartial() {
       com.google.cloud.videointelligence.v1beta2.FaceSegment result = new com.google.cloud.videointelligence.v1beta2.FaceSegment(this);
       if (segmentBuilder_ == null) {
@@ -368,39 +353,32 @@ public com.google.cloud.videointelligence.v1beta2.FaceSegment buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta2.FaceSegment) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta2.FaceSegment)other);
@@ -420,12 +398,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta2.FaceSegment
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -596,13 +572,11 @@ public com.google.cloud.videointelligence.v1beta2.VideoSegmentOrBuilder getSegme
       }
       return segmentBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -624,12 +598,11 @@ public static com.google.cloud.videointelligence.v1beta2.FaceSegment getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public FaceSegment parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FaceSegment(input, extensionRegistry);
+        return new FaceSegment(input, extensionRegistry);
     }
   };
 
@@ -642,7 +615,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta2.FaceSegment getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelAnnotation.java
index 5e6a3e946dd7..d7ad4b4d8561 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelAnnotation.java
@@ -35,9 +35,6 @@ private LabelAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private LabelAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.videointelligence.v1beta2.Entity.Builder subBuilder = null;
             if (entity_ != null) {
@@ -89,13 +93,6 @@ private LabelAnnotation(
                 input.readMessage(com.google.cloud.videointelligence.v1beta2.LabelFrame.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -122,7 +119,6 @@ private LabelAnnotation(
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_LabelAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_LabelAnnotation_fieldAccessorTable
@@ -345,7 +341,6 @@ public com.google.cloud.videointelligence.v1beta2.LabelFrameOrBuilder getFramesO
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -355,7 +350,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (entity_ != null) {
@@ -373,7 +367,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -524,7 +517,6 @@ public static com.google.cloud.videointelligence.v1beta2.LabelAnnotation parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -532,7 +524,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta2.LabelAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -560,7 +551,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_LabelAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_LabelAnnotation_fieldAccessorTable
@@ -586,7 +576,6 @@ private void maybeForceBuilderInitialization() {
         getFramesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (entityBuilder_ == null) {
@@ -616,18 +605,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_LabelAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.LabelAnnotation getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta2.LabelAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.LabelAnnotation build() {
       com.google.cloud.videointelligence.v1beta2.LabelAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -636,7 +622,6 @@ public com.google.cloud.videointelligence.v1beta2.LabelAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.LabelAnnotation buildPartial() {
       com.google.cloud.videointelligence.v1beta2.LabelAnnotation result = new com.google.cloud.videointelligence.v1beta2.LabelAnnotation(this);
       int from_bitField0_ = bitField0_;
@@ -678,39 +663,32 @@ public com.google.cloud.videointelligence.v1beta2.LabelAnnotation buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta2.LabelAnnotation) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta2.LabelAnnotation)other);
@@ -808,12 +786,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta2.LabelAnnotat
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1975,13 +1951,11 @@ public com.google.cloud.videointelligence.v1beta2.LabelFrame.Builder addFramesBu
       }
       return framesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2003,12 +1977,11 @@ public static com.google.cloud.videointelligence.v1beta2.LabelAnnotation getDefa
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LabelAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LabelAnnotation(input, extensionRegistry);
+        return new LabelAnnotation(input, extensionRegistry);
     }
   };
 
@@ -2021,7 +1994,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta2.LabelAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelDetectionConfig.java
index d1d8abc8560c..2326c9b4bbe2 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelDetectionConfig.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelDetectionConfig.java
@@ -35,9 +35,6 @@ private LabelDetectionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private LabelDetectionConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -66,13 +70,6 @@ private LabelDetectionConfig(
             model_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private LabelDetectionConfig(
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_LabelDetectionConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_LabelDetectionConfig_fieldAccessorTable
@@ -122,7 +118,6 @@ public int getLabelDetectionModeValue() {
    * .google.cloud.videointelligence.v1beta2.LabelDetectionMode label_detection_mode = 1;
    */
   public com.google.cloud.videointelligence.v1beta2.LabelDetectionMode getLabelDetectionMode() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.videointelligence.v1beta2.LabelDetectionMode result = com.google.cloud.videointelligence.v1beta2.LabelDetectionMode.valueOf(labelDetectionMode_);
     return result == null ? com.google.cloud.videointelligence.v1beta2.LabelDetectionMode.UNRECOGNIZED : result;
   }
@@ -189,7 +184,6 @@ public java.lang.String getModel() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -199,7 +193,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (labelDetectionMode_ != com.google.cloud.videointelligence.v1beta2.LabelDetectionMode.LABEL_DETECTION_MODE_UNSPECIFIED.getNumber()) {
@@ -214,7 +207,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -345,7 +337,6 @@ public static com.google.cloud.videointelligence.v1beta2.LabelDetectionConfig pa
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -353,7 +344,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta2.LabelDetectionConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -381,7 +371,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_LabelDetectionConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_LabelDetectionConfig_fieldAccessorTable
@@ -404,7 +393,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       labelDetectionMode_ = 0;
@@ -416,18 +404,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_LabelDetectionConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.LabelDetectionConfig getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta2.LabelDetectionConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.LabelDetectionConfig build() {
       com.google.cloud.videointelligence.v1beta2.LabelDetectionConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -436,7 +421,6 @@ public com.google.cloud.videointelligence.v1beta2.LabelDetectionConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.LabelDetectionConfig buildPartial() {
       com.google.cloud.videointelligence.v1beta2.LabelDetectionConfig result = new com.google.cloud.videointelligence.v1beta2.LabelDetectionConfig(this);
       result.labelDetectionMode_ = labelDetectionMode_;
@@ -446,39 +430,32 @@ public com.google.cloud.videointelligence.v1beta2.LabelDetectionConfig buildPart
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta2.LabelDetectionConfig) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta2.LabelDetectionConfig)other);
@@ -505,12 +482,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta2.LabelDetecti
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -566,7 +541,6 @@ public Builder setLabelDetectionModeValue(int value) {
      * .google.cloud.videointelligence.v1beta2.LabelDetectionMode label_detection_mode = 1;
      */
     public com.google.cloud.videointelligence.v1beta2.LabelDetectionMode getLabelDetectionMode() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.videointelligence.v1beta2.LabelDetectionMode result = com.google.cloud.videointelligence.v1beta2.LabelDetectionMode.valueOf(labelDetectionMode_);
       return result == null ? com.google.cloud.videointelligence.v1beta2.LabelDetectionMode.UNRECOGNIZED : result;
     }
@@ -746,13 +720,11 @@ public Builder setModelBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -774,12 +746,11 @@ public static com.google.cloud.videointelligence.v1beta2.LabelDetectionConfig ge
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LabelDetectionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LabelDetectionConfig(input, extensionRegistry);
+        return new LabelDetectionConfig(input, extensionRegistry);
     }
   };
 
@@ -792,7 +763,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta2.LabelDetectionConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelFrame.java
index ed8d88425e35..644883f78ef7 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelFrame.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelFrame.java
@@ -33,9 +33,6 @@ private LabelFrame(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private LabelFrame(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.protobuf.Duration.Builder subBuilder = null;
             if (timeOffset_ != null) {
@@ -65,13 +69,6 @@ private LabelFrame(
             confidence_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -89,7 +86,6 @@ private LabelFrame(
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_LabelFrame_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_LabelFrame_fieldAccessorTable
@@ -147,7 +143,6 @@ public float getConfidence() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (timeOffset_ != null) {
@@ -169,7 +163,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -301,7 +294,6 @@ public static com.google.cloud.videointelligence.v1beta2.LabelFrame parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -309,7 +301,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta2.LabelFrame prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -337,7 +328,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_LabelFrame_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_LabelFrame_fieldAccessorTable
@@ -360,7 +350,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (timeOffsetBuilder_ == null) {
@@ -374,18 +363,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_LabelFrame_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.LabelFrame getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta2.LabelFrame.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.LabelFrame build() {
       com.google.cloud.videointelligence.v1beta2.LabelFrame result = buildPartial();
       if (!result.isInitialized()) {
@@ -394,7 +380,6 @@ public com.google.cloud.videointelligence.v1beta2.LabelFrame build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.LabelFrame buildPartial() {
       com.google.cloud.videointelligence.v1beta2.LabelFrame result = new com.google.cloud.videointelligence.v1beta2.LabelFrame(this);
       if (timeOffsetBuilder_ == null) {
@@ -407,39 +392,32 @@ public com.google.cloud.videointelligence.v1beta2.LabelFrame buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta2.LabelFrame) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta2.LabelFrame)other);
@@ -462,12 +440,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta2.LabelFrame o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -685,13 +661,11 @@ public Builder clearConfidence() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -713,12 +687,11 @@ public static com.google.cloud.videointelligence.v1beta2.LabelFrame getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LabelFrame parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LabelFrame(input, extensionRegistry);
+        return new LabelFrame(input, extensionRegistry);
     }
   };
 
@@ -731,7 +704,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta2.LabelFrame getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelSegment.java
index 7adf08b7a040..ef205323489b 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelSegment.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/LabelSegment.java
@@ -33,9 +33,6 @@ private LabelSegment(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private LabelSegment(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.videointelligence.v1beta2.VideoSegment.Builder subBuilder = null;
             if (segment_ != null) {
@@ -65,13 +69,6 @@ private LabelSegment(
             confidence_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -89,7 +86,6 @@ private LabelSegment(
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_LabelSegment_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_LabelSegment_fieldAccessorTable
@@ -144,7 +140,6 @@ public float getConfidence() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -154,7 +149,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (segment_ != null) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -298,7 +291,6 @@ public static com.google.cloud.videointelligence.v1beta2.LabelSegment parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -306,7 +298,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta2.LabelSegment prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -334,7 +325,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_LabelSegment_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_LabelSegment_fieldAccessorTable
@@ -357,7 +347,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (segmentBuilder_ == null) {
@@ -371,18 +360,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_LabelSegment_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.LabelSegment getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta2.LabelSegment.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.LabelSegment build() {
       com.google.cloud.videointelligence.v1beta2.LabelSegment result = buildPartial();
       if (!result.isInitialized()) {
@@ -391,7 +377,6 @@ public com.google.cloud.videointelligence.v1beta2.LabelSegment build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.LabelSegment buildPartial() {
       com.google.cloud.videointelligence.v1beta2.LabelSegment result = new com.google.cloud.videointelligence.v1beta2.LabelSegment(this);
       if (segmentBuilder_ == null) {
@@ -404,39 +389,32 @@ public com.google.cloud.videointelligence.v1beta2.LabelSegment buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta2.LabelSegment) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta2.LabelSegment)other);
@@ -459,12 +437,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta2.LabelSegment
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -673,13 +649,11 @@ public Builder clearConfidence() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -701,12 +675,11 @@ public static com.google.cloud.videointelligence.v1beta2.LabelSegment getDefault
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LabelSegment parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LabelSegment(input, extensionRegistry);
+        return new LabelSegment(input, extensionRegistry);
     }
   };
 
@@ -719,7 +692,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta2.LabelSegment getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/NormalizedBoundingBox.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/NormalizedBoundingBox.java
index 85fd0715dc68..d66f9bff9f79 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/NormalizedBoundingBox.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/NormalizedBoundingBox.java
@@ -38,9 +38,6 @@ private NormalizedBoundingBox(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private NormalizedBoundingBox(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 13: {
 
             left_ = input.readFloat();
@@ -72,13 +76,6 @@ private NormalizedBoundingBox(
             bottom_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private NormalizedBoundingBox(
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_NormalizedBoundingBox_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_NormalizedBoundingBox_fieldAccessorTable
@@ -157,7 +153,6 @@ public float getBottom() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -167,7 +162,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (left_ != 0F) {
@@ -185,7 +179,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -337,7 +330,6 @@ public static com.google.cloud.videointelligence.v1beta2.NormalizedBoundingBox p
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -345,7 +337,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta2.NormalizedBoundingBox prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -375,7 +366,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_NormalizedBoundingBox_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_NormalizedBoundingBox_fieldAccessorTable
@@ -398,7 +388,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       left_ = 0F;
@@ -412,18 +401,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_NormalizedBoundingBox_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.NormalizedBoundingBox getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta2.NormalizedBoundingBox.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.NormalizedBoundingBox build() {
       com.google.cloud.videointelligence.v1beta2.NormalizedBoundingBox result = buildPartial();
       if (!result.isInitialized()) {
@@ -432,7 +418,6 @@ public com.google.cloud.videointelligence.v1beta2.NormalizedBoundingBox build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.NormalizedBoundingBox buildPartial() {
       com.google.cloud.videointelligence.v1beta2.NormalizedBoundingBox result = new com.google.cloud.videointelligence.v1beta2.NormalizedBoundingBox(this);
       result.left_ = left_;
@@ -443,39 +428,32 @@ public com.google.cloud.videointelligence.v1beta2.NormalizedBoundingBox buildPar
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta2.NormalizedBoundingBox) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta2.NormalizedBoundingBox)other);
@@ -504,12 +482,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta2.NormalizedBo
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -679,13 +655,11 @@ public Builder clearBottom() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -707,12 +681,11 @@ public static com.google.cloud.videointelligence.v1beta2.NormalizedBoundingBox g
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public NormalizedBoundingBox parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new NormalizedBoundingBox(input, extensionRegistry);
+        return new NormalizedBoundingBox(input, extensionRegistry);
     }
   };
 
@@ -725,7 +698,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta2.NormalizedBoundingBox getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ShotChangeDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ShotChangeDetectionConfig.java
index b929c8d2bbb4..316475e0a84f 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ShotChangeDetectionConfig.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/ShotChangeDetectionConfig.java
@@ -33,9 +33,6 @@ private ShotChangeDetectionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private ShotChangeDetectionConfig(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            model_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private ShotChangeDetectionConfig(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            model_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private ShotChangeDetectionConfig(
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_ShotChangeDetectionConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_ShotChangeDetectionConfig_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getModel() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getModelBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.videointelligence.v1beta2.ShotChangeDetectionConf
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta2.ShotChangeDetectionConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_ShotChangeDetectionConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_ShotChangeDetectionConfig_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       model_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_ShotChangeDetectionConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.ShotChangeDetectionConfig getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta2.ShotChangeDetectionConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.ShotChangeDetectionConfig build() {
       com.google.cloud.videointelligence.v1beta2.ShotChangeDetectionConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.videointelligence.v1beta2.ShotChangeDetectionConfig buil
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.ShotChangeDetectionConfig buildPartial() {
       com.google.cloud.videointelligence.v1beta2.ShotChangeDetectionConfig result = new com.google.cloud.videointelligence.v1beta2.ShotChangeDetectionConfig(this);
       result.model_ = model_;
@@ -361,39 +346,32 @@ public com.google.cloud.videointelligence.v1beta2.ShotChangeDetectionConfig buil
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta2.ShotChangeDetectionConfig) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta2.ShotChangeDetectionConfig)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta2.ShotChangeDe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setModelBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.videointelligence.v1beta2.ShotChangeDetectionConf
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ShotChangeDetectionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ShotChangeDetectionConfig(input, extensionRegistry);
+        return new ShotChangeDetectionConfig(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta2.ShotChangeDetectionConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoAnnotationProgress.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoAnnotationProgress.java
index 8d833ce3bafb..9ff8fe127114 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoAnnotationProgress.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoAnnotationProgress.java
@@ -34,9 +34,6 @@ private VideoAnnotationProgress(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private VideoAnnotationProgress(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -85,13 +89,6 @@ private VideoAnnotationProgress(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -109,7 +106,6 @@ private VideoAnnotationProgress(
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_VideoAnnotationProgress_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_VideoAnnotationProgress_fieldAccessorTable
@@ -242,7 +238,6 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -252,7 +247,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getInputUriBytes().isEmpty()) {
@@ -270,7 +264,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -419,7 +412,6 @@ public static com.google.cloud.videointelligence.v1beta2.VideoAnnotationProgress
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -427,7 +419,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta2.VideoAnnotationProgress prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -455,7 +446,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_VideoAnnotationProgress_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_VideoAnnotationProgress_fieldAccessorTable
@@ -478,7 +468,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       inputUri_ = "";
@@ -500,18 +489,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_VideoAnnotationProgress_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.VideoAnnotationProgress getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta2.VideoAnnotationProgress.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.VideoAnnotationProgress build() {
       com.google.cloud.videointelligence.v1beta2.VideoAnnotationProgress result = buildPartial();
       if (!result.isInitialized()) {
@@ -520,7 +506,6 @@ public com.google.cloud.videointelligence.v1beta2.VideoAnnotationProgress build(
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.VideoAnnotationProgress buildPartial() {
       com.google.cloud.videointelligence.v1beta2.VideoAnnotationProgress result = new com.google.cloud.videointelligence.v1beta2.VideoAnnotationProgress(this);
       result.inputUri_ = inputUri_;
@@ -539,39 +524,32 @@ public com.google.cloud.videointelligence.v1beta2.VideoAnnotationProgress buildP
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta2.VideoAnnotationProgress) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta2.VideoAnnotationProgress)other);
@@ -601,12 +579,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta2.VideoAnnotat
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1065,13 +1041,11 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
       }
       return updateTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1093,12 +1067,11 @@ public static com.google.cloud.videointelligence.v1beta2.VideoAnnotationProgress
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public VideoAnnotationProgress parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoAnnotationProgress(input, extensionRegistry);
+        return new VideoAnnotationProgress(input, extensionRegistry);
     }
   };
 
@@ -1111,7 +1084,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta2.VideoAnnotationProgress getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoAnnotationResults.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoAnnotationResults.java
index 13f17e488b41..4b2b67c936b1 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoAnnotationResults.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoAnnotationResults.java
@@ -38,9 +38,6 @@ private VideoAnnotationResults(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private VideoAnnotationResults(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -129,13 +133,6 @@ private VideoAnnotationResults(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -168,7 +165,6 @@ private VideoAnnotationResults(
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_VideoAnnotationResults_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_VideoAnnotationResults_fieldAccessorTable
@@ -581,7 +577,6 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -591,7 +586,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getInputUriBytes().isEmpty()) {
@@ -621,7 +615,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -812,7 +805,6 @@ public static com.google.cloud.videointelligence.v1beta2.VideoAnnotationResults
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -820,7 +812,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta2.VideoAnnotationResults prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -848,7 +839,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_VideoAnnotationResults_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_VideoAnnotationResults_fieldAccessorTable
@@ -876,7 +866,6 @@ private void maybeForceBuilderInitialization() {
         getShotAnnotationsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       inputUri_ = "";
@@ -926,18 +915,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_VideoAnnotationResults_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.VideoAnnotationResults getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta2.VideoAnnotationResults.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.VideoAnnotationResults build() {
       com.google.cloud.videointelligence.v1beta2.VideoAnnotationResults result = buildPartial();
       if (!result.isInitialized()) {
@@ -946,7 +932,6 @@ public com.google.cloud.videointelligence.v1beta2.VideoAnnotationResults build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.VideoAnnotationResults buildPartial() {
       com.google.cloud.videointelligence.v1beta2.VideoAnnotationResults result = new com.google.cloud.videointelligence.v1beta2.VideoAnnotationResults(this);
       int from_bitField0_ = bitField0_;
@@ -1012,39 +997,32 @@ public com.google.cloud.videointelligence.v1beta2.VideoAnnotationResults buildPa
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta2.VideoAnnotationResults) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta2.VideoAnnotationResults)other);
@@ -1201,12 +1179,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta2.VideoAnnotat
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3248,13 +3224,11 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() {
       }
       return errorBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -3276,12 +3250,11 @@ public static com.google.cloud.videointelligence.v1beta2.VideoAnnotationResults
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public VideoAnnotationResults parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoAnnotationResults(input, extensionRegistry);
+        return new VideoAnnotationResults(input, extensionRegistry);
     }
   };
 
@@ -3294,7 +3267,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta2.VideoAnnotationResults getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoContext.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoContext.java
index 8aeb8ee760f7..afc3dec3a9ab 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoContext.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoContext.java
@@ -33,9 +33,6 @@ private VideoContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private VideoContext(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               segments_ = new java.util.ArrayList();
@@ -108,13 +112,6 @@ private VideoContext(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -135,7 +132,6 @@ private VideoContext(
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_VideoContext_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_VideoContext_fieldAccessorTable
@@ -342,7 +338,6 @@ public com.google.cloud.videointelligence.v1beta2.FaceDetectionConfigOrBuilder g
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -352,7 +347,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < segments_.size(); i++) {
@@ -373,7 +367,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -543,7 +536,6 @@ public static com.google.cloud.videointelligence.v1beta2.VideoContext parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -551,7 +543,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta2.VideoContext prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -579,7 +570,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_VideoContext_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_VideoContext_fieldAccessorTable
@@ -603,7 +593,6 @@ private void maybeForceBuilderInitialization() {
         getSegmentsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (segmentsBuilder_ == null) {
@@ -639,18 +628,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_VideoContext_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.VideoContext getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta2.VideoContext.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.VideoContext build() {
       com.google.cloud.videointelligence.v1beta2.VideoContext result = buildPartial();
       if (!result.isInitialized()) {
@@ -659,7 +645,6 @@ public com.google.cloud.videointelligence.v1beta2.VideoContext build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.VideoContext buildPartial() {
       com.google.cloud.videointelligence.v1beta2.VideoContext result = new com.google.cloud.videointelligence.v1beta2.VideoContext(this);
       int from_bitField0_ = bitField0_;
@@ -698,39 +683,32 @@ public com.google.cloud.videointelligence.v1beta2.VideoContext buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta2.VideoContext) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta2.VideoContext)other);
@@ -785,12 +763,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta2.VideoContext
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1769,13 +1745,11 @@ public com.google.cloud.videointelligence.v1beta2.FaceDetectionConfigOrBuilder g
       }
       return faceDetectionConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1797,12 +1771,11 @@ public static com.google.cloud.videointelligence.v1beta2.VideoContext getDefault
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public VideoContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoContext(input, extensionRegistry);
+        return new VideoContext(input, extensionRegistry);
     }
   };
 
@@ -1815,7 +1788,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta2.VideoContext getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceProto.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceProto.java
index 30b0c58e3805..170d6593630d 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoIntelligenceServiceProto.java
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       "oogle/rpc/status.proto\"\371\001\n\024AnnotateVideo" +
       "Request\022\021\n\tinput_uri\030\001 \001(\t\022\025\n\rinput_cont" +
       "ent\030\006 \001(\014\022A\n\010features\030\002 \003(\0162/.google.clo" +
-      "ud.videointelligence.v1beta2.Feature\022K\n\r" +
+      "ud.videointelligence.v1beta2.Feature\022K\n\r",
       "video_context\030\003 \001(\01324.google.cloud.video" +
       "intelligence.v1beta2.VideoContext\022\022\n\nout" +
       "put_uri\030\004 \001(\t\022\023\n\013location_id\030\005 \001(\t\"\354\003\n\014V" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "ogle.cloud.videointelligence.v1beta2.Lab" +
       "elDetectionConfig\022g\n\034shot_change_detecti" +
       "on_config\030\003 \001(\0132A.google.cloud.videointe" +
-      "lligence.v1beta2.ShotChangeDetectionConf" +
+      "lligence.v1beta2.ShotChangeDetectionConf",
       "ig\022q\n!explicit_content_detection_config\030" +
       "\004 \001(\0132F.google.cloud.videointelligence.v" +
       "1beta2.ExplicitContentDetectionConfig\022Z\n" +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       "bel_detection_mode\030\001 \001(\0162:.google.cloud." +
       "videointelligence.v1beta2.LabelDetection" +
       "Mode\022\031\n\021stationary_camera\030\002 \001(\010\022\r\n\005model" +
-      "\030\003 \001(\t\"*\n\031ShotChangeDetectionConfig\022\r\n\005m" +
+      "\030\003 \001(\t\"*\n\031ShotChangeDetectionConfig\022\r\n\005m",
       "odel\030\001 \001(\t\"/\n\036ExplicitContentDetectionCo" +
       "nfig\022\r\n\005model\030\001 \001(\t\"D\n\023FaceDetectionConf" +
       "ig\022\r\n\005model\030\001 \001(\t\022\036\n\026include_bounding_bo" +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       "uf.Duration\"i\n\014LabelSegment\022E\n\007segment\030\001" +
       " \001(\01324.google.cloud.videointelligence.v1" +
       "beta2.VideoSegment\022\022\n\nconfidence\030\002 \001(\002\"P" +
-      "\n\nLabelFrame\022.\n\013time_offset\030\001 \001(\0132\031.goog" +
+      "\n\nLabelFrame\022.\n\013time_offset\030\001 \001(\0132\031.goog",
       "le.protobuf.Duration\022\022\n\nconfidence\030\002 \001(\002" +
       "\"G\n\006Entity\022\021\n\tentity_id\030\001 \001(\t\022\023\n\013descrip" +
       "tion\030\002 \001(\t\022\025\n\rlanguage_code\030\003 \001(\t\"\250\002\n\017La" +
@@ -177,7 +177,7 @@ public static void registerAllExtensions(
       "videointelligence.v1beta2.Entity\022F\n\010segm" +
       "ents\030\003 \003(\01324.google.cloud.videointellige" +
       "nce.v1beta2.LabelSegment\022B\n\006frames\030\004 \003(\013" +
-      "22.google.cloud.videointelligence.v1beta" +
+      "22.google.cloud.videointelligence.v1beta",
       "2.LabelFrame\"\232\001\n\024ExplicitContentFrame\022.\n" +
       "\013time_offset\030\001 \001(\0132\031.google.protobuf.Dur" +
       "ation\022R\n\026pornography_likelihood\030\002 \001(\01622." +
@@ -187,7 +187,7 @@ public static void registerAllExtensions(
       "ligence.v1beta2.ExplicitContentFrame\"Q\n\025" +
       "NormalizedBoundingBox\022\014\n\004left\030\001 \001(\002\022\013\n\003t" +
       "op\030\002 \001(\002\022\r\n\005right\030\003 \001(\002\022\016\n\006bottom\030\004 \001(\002\"" +
-      "T\n\013FaceSegment\022E\n\007segment\030\001 \001(\01324.google" +
+      "T\n\013FaceSegment\022E\n\007segment\030\001 \001(\01324.google",
       ".cloud.videointelligence.v1beta2.VideoSe" +
       "gment\"\235\001\n\tFaceFrame\022`\n\031normalized_boundi" +
       "ng_boxes\030\001 \003(\0132=.google.cloud.videointel" +
@@ -197,7 +197,7 @@ public static void registerAllExtensions(
       "\001(\014\022E\n\010segments\030\002 \003(\01323.google.cloud.vid" +
       "eointelligence.v1beta2.FaceSegment\022A\n\006fr" +
       "ames\030\003 \003(\01321.google.cloud.videointellige" +
-      "nce.v1beta2.FaceFrame\"\337\004\n\026VideoAnnotatio" +
+      "nce.v1beta2.FaceFrame\"\337\004\n\026VideoAnnotatio",
       "nResults\022\021\n\tinput_uri\030\001 \001(\t\022Z\n\031segment_l" +
       "abel_annotations\030\002 \003(\01327.google.cloud.vi" +
       "deointelligence.v1beta2.LabelAnnotation\022" +
@@ -207,7 +207,7 @@ public static void registerAllExtensions(
       "\01327.google.cloud.videointelligence.v1bet" +
       "a2.LabelAnnotation\022P\n\020face_annotations\030\005" +
       " \003(\01326.google.cloud.videointelligence.v1" +
-      "beta2.FaceAnnotation\022N\n\020shot_annotations" +
+      "beta2.FaceAnnotation\022N\n\020shot_annotations",
       "\030\006 \003(\01324.google.cloud.videointelligence." +
       "v1beta2.VideoSegment\022^\n\023explicit_annotat" +
       "ion\030\007 \001(\0132A.google.cloud.videointelligen" +
@@ -217,7 +217,7 @@ public static void registerAllExtensions(
       " \003(\0132>.google.cloud.videointelligence.v1" +
       "beta2.VideoAnnotationResults\"\247\001\n\027VideoAn" +
       "notationProgress\022\021\n\tinput_uri\030\001 \001(\t\022\030\n\020p" +
-      "rogress_percent\030\002 \001(\005\022.\n\nstart_time\030\003 \001(" +
+      "rogress_percent\030\002 \001(\005\022.\n\nstart_time\030\003 \001(",
       "\0132\032.google.protobuf.Timestamp\022/\n\013update_" +
       "time\030\004 \001(\0132\032.google.protobuf.Timestamp\"u" +
       "\n\025AnnotateVideoProgress\022\\\n\023annotation_pr" +
@@ -227,7 +227,7 @@ public static void registerAllExtensions(
       "BEL_DETECTION\020\001\022\031\n\025SHOT_CHANGE_DETECTION" +
       "\020\002\022\036\n\032EXPLICIT_CONTENT_DETECTION\020\003\022\022\n\016FA" +
       "CE_DETECTION\020\004*r\n\022LabelDetectionMode\022$\n " +
-      "LABEL_DETECTION_MODE_UNSPECIFIED\020\000\022\r\n\tSH" +
+      "LABEL_DETECTION_MODE_UNSPECIFIED\020\000\022\r\n\tSH",
       "OT_MODE\020\001\022\016\n\nFRAME_MODE\020\002\022\027\n\023SHOT_AND_FR" +
       "AME_MODE\020\003*t\n\nLikelihood\022\032\n\026LIKELIHOOD_U" +
       "NSPECIFIED\020\000\022\021\n\rVERY_UNLIKELY\020\001\022\014\n\010UNLIK" +
@@ -237,7 +237,7 @@ public static void registerAllExtensions(
       "lligence.v1beta2.AnnotateVideoRequest\032\035." +
       "google.longrunning.Operation\"#\202\323\344\223\002\035\"\030/v" +
       "1beta2/videos:annotate:\001*B\370\001\n*com.google" +
-      ".cloud.videointelligence.v1beta2B\035VideoI" +
+      ".cloud.videointelligence.v1beta2B\035VideoI",
       "ntelligenceServiceProtoP\001ZWgoogle.golang" +
       ".org/genproto/googleapis/cloud/videointe" +
       "lligence/v1beta2;videointelligence\252\002&Goo" +
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoSegment.java
index 5ae0e1710444..88e952c193d0 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoSegment.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1beta2/src/main/java/com/google/cloud/videointelligence/v1beta2/VideoSegment.java
@@ -32,9 +32,6 @@ private VideoSegment(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private VideoSegment(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.protobuf.Duration.Builder subBuilder = null;
             if (startTimeOffset_ != null) {
@@ -72,13 +76,6 @@ private VideoSegment(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private VideoSegment(
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_VideoSegment_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_VideoSegment_fieldAccessorTable
@@ -177,7 +173,6 @@ public com.google.protobuf.DurationOrBuilder getEndTimeOffsetOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -187,7 +182,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (startTimeOffset_ != null) {
@@ -199,7 +193,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -333,7 +326,6 @@ public static com.google.cloud.videointelligence.v1beta2.VideoSegment parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -341,7 +333,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1beta2.VideoSegment prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -369,7 +360,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_VideoSegment_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_VideoSegment_fieldAccessorTable
@@ -392,7 +382,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (startTimeOffsetBuilder_ == null) {
@@ -410,18 +399,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1beta2.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1beta2_VideoSegment_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.VideoSegment getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1beta2.VideoSegment.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.VideoSegment build() {
       com.google.cloud.videointelligence.v1beta2.VideoSegment result = buildPartial();
       if (!result.isInitialized()) {
@@ -430,7 +416,6 @@ public com.google.cloud.videointelligence.v1beta2.VideoSegment build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1beta2.VideoSegment buildPartial() {
       com.google.cloud.videointelligence.v1beta2.VideoSegment result = new com.google.cloud.videointelligence.v1beta2.VideoSegment(this);
       if (startTimeOffsetBuilder_ == null) {
@@ -447,39 +432,32 @@ public com.google.cloud.videointelligence.v1beta2.VideoSegment buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1beta2.VideoSegment) {
         return mergeFrom((com.google.cloud.videointelligence.v1beta2.VideoSegment)other);
@@ -502,12 +480,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1beta2.VideoSegment
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -849,13 +825,11 @@ public com.google.protobuf.DurationOrBuilder getEndTimeOffsetOrBuilder() {
       }
       return endTimeOffsetBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -877,12 +851,11 @@ public static com.google.cloud.videointelligence.v1beta2.VideoSegment getDefault
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public VideoSegment parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoSegment(input, extensionRegistry);
+        return new VideoSegment(input, extensionRegistry);
     }
   };
 
@@ -895,7 +868,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1beta2.VideoSegment getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoProgress.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoProgress.java
index 546ebc42cdd4..b1a3acb632ce 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoProgress.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoProgress.java
@@ -35,9 +35,6 @@ private AnnotateVideoProgress(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private AnnotateVideoProgress(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               annotationProgress_ = new java.util.ArrayList();
@@ -58,13 +62,6 @@ private AnnotateVideoProgress(
                 input.readMessage(com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationProgress.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -85,7 +82,6 @@ private AnnotateVideoProgress(
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_AnnotateVideoProgress_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_AnnotateVideoProgress_fieldAccessorTable
@@ -149,7 +145,6 @@ public com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationProgressOrBui
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -159,7 +154,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < annotationProgress_.size(); i++) {
@@ -168,7 +162,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -286,7 +279,6 @@ public static com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoProgress
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -294,7 +286,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoProgress prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -324,7 +315,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_AnnotateVideoProgress_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_AnnotateVideoProgress_fieldAccessorTable
@@ -348,7 +338,6 @@ private void maybeForceBuilderInitialization() {
         getAnnotationProgressFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (annotationProgressBuilder_ == null) {
@@ -360,18 +349,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_AnnotateVideoProgress_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoProgress getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoProgress.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoProgress build() {
       com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoProgress result = buildPartial();
       if (!result.isInitialized()) {
@@ -380,7 +366,6 @@ public com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoProgress build(
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoProgress buildPartial() {
       com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoProgress result = new com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoProgress(this);
       int from_bitField0_ = bitField0_;
@@ -397,39 +382,32 @@ public com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoProgress buildP
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoProgress) {
         return mergeFrom((com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoProgress)other);
@@ -472,12 +450,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1p1beta1.AnnotateVi
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -808,13 +784,11 @@ public com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationProgress.Buil
       }
       return annotationProgressBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -836,12 +810,11 @@ public static com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoProgress
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnnotateVideoProgress parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateVideoProgress(input, extensionRegistry);
+        return new AnnotateVideoProgress(input, extensionRegistry);
     }
   };
 
@@ -854,7 +827,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoProgress getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoRequest.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoRequest.java
index 32591e0493b1..715fd750d022 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoRequest.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoRequest.java
@@ -37,9 +37,6 @@ private AnnotateVideoRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private AnnotateVideoRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -110,13 +114,6 @@ private AnnotateVideoRequest(
             inputContent_ = input.readBytes();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -137,7 +134,6 @@ private AnnotateVideoRequest(
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_AnnotateVideoRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_AnnotateVideoRequest_fieldAccessorTable
@@ -228,7 +224,6 @@ public com.google.protobuf.ByteString getInputContent() {
           new com.google.protobuf.Internal.ListAdapter.Converter<
               java.lang.Integer, com.google.cloud.videointelligence.v1p1beta1.Feature>() {
             public com.google.cloud.videointelligence.v1p1beta1.Feature convert(java.lang.Integer from) {
-              @SuppressWarnings("deprecation")
               com.google.cloud.videointelligence.v1p1beta1.Feature result = com.google.cloud.videointelligence.v1p1beta1.Feature.valueOf(from);
               return result == null ? com.google.cloud.videointelligence.v1p1beta1.Feature.UNRECOGNIZED : result;
             }
@@ -419,7 +414,6 @@ public java.lang.String getLocationId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -429,7 +423,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     getSerializedSize();
@@ -458,7 +451,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -625,7 +617,6 @@ public static com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoRequest
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -633,7 +624,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -661,7 +651,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_AnnotateVideoRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_AnnotateVideoRequest_fieldAccessorTable
@@ -684,7 +673,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       inputUri_ = "";
@@ -706,18 +694,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_AnnotateVideoRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoRequest getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoRequest build() {
       com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -726,7 +711,6 @@ public com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoRequest build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoRequest buildPartial() {
       com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoRequest result = new com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoRequest(this);
       int from_bitField0_ = bitField0_;
@@ -750,39 +734,32 @@ public com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoRequest buildPa
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoRequest) {
         return mergeFrom((com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoRequest)other);
@@ -827,12 +804,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1p1beta1.AnnotateVi
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1564,13 +1539,11 @@ public Builder setLocationIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1592,12 +1565,11 @@ public static com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoRequest
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnnotateVideoRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateVideoRequest(input, extensionRegistry);
+        return new AnnotateVideoRequest(input, extensionRegistry);
     }
   };
 
@@ -1610,7 +1582,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoResponse.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoResponse.java
index f6bb8bc5ab6b..f7830bd5c092 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoResponse.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/AnnotateVideoResponse.java
@@ -35,9 +35,6 @@ private AnnotateVideoResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private AnnotateVideoResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               annotationResults_ = new java.util.ArrayList();
@@ -58,13 +62,6 @@ private AnnotateVideoResponse(
                 input.readMessage(com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationResults.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -85,7 +82,6 @@ private AnnotateVideoResponse(
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_AnnotateVideoResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_AnnotateVideoResponse_fieldAccessorTable
@@ -149,7 +145,6 @@ public com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationResultsOrBuil
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -159,7 +154,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < annotationResults_.size(); i++) {
@@ -168,7 +162,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -286,7 +279,6 @@ public static com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoResponse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -294,7 +286,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -324,7 +315,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_AnnotateVideoResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_AnnotateVideoResponse_fieldAccessorTable
@@ -348,7 +338,6 @@ private void maybeForceBuilderInitialization() {
         getAnnotationResultsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (annotationResultsBuilder_ == null) {
@@ -360,18 +349,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_AnnotateVideoResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoResponse getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoResponse build() {
       com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -380,7 +366,6 @@ public com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoResponse build(
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoResponse buildPartial() {
       com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoResponse result = new com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoResponse(this);
       int from_bitField0_ = bitField0_;
@@ -397,39 +382,32 @@ public com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoResponse buildP
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoResponse) {
         return mergeFrom((com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoResponse)other);
@@ -472,12 +450,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1p1beta1.AnnotateVi
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -808,13 +784,11 @@ public com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationResults.Build
       }
       return annotationResultsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -836,12 +810,11 @@ public static com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoResponse
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnnotateVideoResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateVideoResponse(input, extensionRegistry);
+        return new AnnotateVideoResponse(input, extensionRegistry);
     }
   };
 
@@ -854,7 +827,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1p1beta1.AnnotateVideoResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/Entity.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/Entity.java
index 7cf9f87fe451..192f2a41090c 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/Entity.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/Entity.java
@@ -35,9 +35,6 @@ private Entity(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private Entity(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -67,13 +71,6 @@ private Entity(
             languageCode_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -91,7 +88,6 @@ private Entity(
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_Entity_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_Entity_fieldAccessorTable
@@ -230,7 +226,6 @@ public java.lang.String getLanguageCode() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -240,7 +235,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getEntityIdBytes().isEmpty()) {
@@ -255,7 +249,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -384,7 +377,6 @@ public static com.google.cloud.videointelligence.v1p1beta1.Entity parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -392,7 +384,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1p1beta1.Entity prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -420,7 +411,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_Entity_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_Entity_fieldAccessorTable
@@ -443,7 +433,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       entityId_ = "";
@@ -455,18 +444,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_Entity_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.Entity getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1p1beta1.Entity.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.Entity build() {
       com.google.cloud.videointelligence.v1p1beta1.Entity result = buildPartial();
       if (!result.isInitialized()) {
@@ -475,7 +461,6 @@ public com.google.cloud.videointelligence.v1p1beta1.Entity build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.Entity buildPartial() {
       com.google.cloud.videointelligence.v1p1beta1.Entity result = new com.google.cloud.videointelligence.v1p1beta1.Entity(this);
       result.entityId_ = entityId_;
@@ -485,39 +470,32 @@ public com.google.cloud.videointelligence.v1p1beta1.Entity buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1p1beta1.Entity) {
         return mergeFrom((com.google.cloud.videointelligence.v1p1beta1.Entity)other);
@@ -546,12 +524,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1p1beta1.Entity oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -846,13 +822,11 @@ public Builder setLanguageCodeBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -874,12 +848,11 @@ public static com.google.cloud.videointelligence.v1p1beta1.Entity getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Entity parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Entity(input, extensionRegistry);
+        return new Entity(input, extensionRegistry);
     }
   };
 
@@ -892,7 +865,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1p1beta1.Entity getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentAnnotation.java
index 233713c645ae..b6d54a78c96a 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentAnnotation.java
@@ -35,9 +35,6 @@ private ExplicitContentAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ExplicitContentAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               frames_ = new java.util.ArrayList();
@@ -58,13 +62,6 @@ private ExplicitContentAnnotation(
                 input.readMessage(com.google.cloud.videointelligence.v1p1beta1.ExplicitContentFrame.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -85,7 +82,6 @@ private ExplicitContentAnnotation(
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_ExplicitContentAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_ExplicitContentAnnotation_fieldAccessorTable
@@ -149,7 +145,6 @@ public com.google.cloud.videointelligence.v1p1beta1.ExplicitContentFrameOrBuilde
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -159,7 +154,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < frames_.size(); i++) {
@@ -168,7 +162,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -286,7 +279,6 @@ public static com.google.cloud.videointelligence.v1p1beta1.ExplicitContentAnnota
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -294,7 +286,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1p1beta1.ExplicitContentAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -324,7 +315,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_ExplicitContentAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_ExplicitContentAnnotation_fieldAccessorTable
@@ -348,7 +338,6 @@ private void maybeForceBuilderInitialization() {
         getFramesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (framesBuilder_ == null) {
@@ -360,18 +349,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_ExplicitContentAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.ExplicitContentAnnotation getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1p1beta1.ExplicitContentAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.ExplicitContentAnnotation build() {
       com.google.cloud.videointelligence.v1p1beta1.ExplicitContentAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -380,7 +366,6 @@ public com.google.cloud.videointelligence.v1p1beta1.ExplicitContentAnnotation bu
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.ExplicitContentAnnotation buildPartial() {
       com.google.cloud.videointelligence.v1p1beta1.ExplicitContentAnnotation result = new com.google.cloud.videointelligence.v1p1beta1.ExplicitContentAnnotation(this);
       int from_bitField0_ = bitField0_;
@@ -397,39 +382,32 @@ public com.google.cloud.videointelligence.v1p1beta1.ExplicitContentAnnotation bu
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1p1beta1.ExplicitContentAnnotation) {
         return mergeFrom((com.google.cloud.videointelligence.v1p1beta1.ExplicitContentAnnotation)other);
@@ -472,12 +450,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1p1beta1.ExplicitCo
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -808,13 +784,11 @@ public com.google.cloud.videointelligence.v1p1beta1.ExplicitContentFrame.Builder
       }
       return framesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -836,12 +810,11 @@ public static com.google.cloud.videointelligence.v1p1beta1.ExplicitContentAnnota
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ExplicitContentAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ExplicitContentAnnotation(input, extensionRegistry);
+        return new ExplicitContentAnnotation(input, extensionRegistry);
     }
   };
 
@@ -854,7 +827,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1p1beta1.ExplicitContentAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentDetectionConfig.java
index 25bda2ab9198..e207b8079545 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentDetectionConfig.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentDetectionConfig.java
@@ -33,9 +33,6 @@ private ExplicitContentDetectionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private ExplicitContentDetectionConfig(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            model_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private ExplicitContentDetectionConfig(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            model_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private ExplicitContentDetectionConfig(
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_ExplicitContentDetectionConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_ExplicitContentDetectionConfig_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getModel() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getModelBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.videointelligence.v1p1beta1.ExplicitContentDetect
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1p1beta1.ExplicitContentDetectionConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_ExplicitContentDetectionConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_ExplicitContentDetectionConfig_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       model_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_ExplicitContentDetectionConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.ExplicitContentDetectionConfig getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1p1beta1.ExplicitContentDetectionConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.ExplicitContentDetectionConfig build() {
       com.google.cloud.videointelligence.v1p1beta1.ExplicitContentDetectionConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.videointelligence.v1p1beta1.ExplicitContentDetectionConf
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.ExplicitContentDetectionConfig buildPartial() {
       com.google.cloud.videointelligence.v1p1beta1.ExplicitContentDetectionConfig result = new com.google.cloud.videointelligence.v1p1beta1.ExplicitContentDetectionConfig(this);
       result.model_ = model_;
@@ -361,39 +346,32 @@ public com.google.cloud.videointelligence.v1p1beta1.ExplicitContentDetectionConf
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1p1beta1.ExplicitContentDetectionConfig) {
         return mergeFrom((com.google.cloud.videointelligence.v1p1beta1.ExplicitContentDetectionConfig)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1p1beta1.ExplicitCo
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setModelBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.videointelligence.v1p1beta1.ExplicitContentDetect
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ExplicitContentDetectionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ExplicitContentDetectionConfig(input, extensionRegistry);
+        return new ExplicitContentDetectionConfig(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForTy
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1p1beta1.ExplicitContentDetectionConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentFrame.java
index be3ee63a63c3..66976f4040bc 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentFrame.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ExplicitContentFrame.java
@@ -33,9 +33,6 @@ private ExplicitContentFrame(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ExplicitContentFrame(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.protobuf.Duration.Builder subBuilder = null;
             if (timeOffset_ != null) {
@@ -66,13 +70,6 @@ private ExplicitContentFrame(
             pornographyLikelihood_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ExplicitContentFrame(
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_ExplicitContentFrame_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_ExplicitContentFrame_fieldAccessorTable
@@ -154,13 +150,11 @@ public int getPornographyLikelihoodValue() {
    * .google.cloud.videointelligence.v1p1beta1.Likelihood pornography_likelihood = 2;
    */
   public com.google.cloud.videointelligence.v1p1beta1.Likelihood getPornographyLikelihood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.videointelligence.v1p1beta1.Likelihood result = com.google.cloud.videointelligence.v1p1beta1.Likelihood.valueOf(pornographyLikelihood_);
     return result == null ? com.google.cloud.videointelligence.v1p1beta1.Likelihood.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -170,7 +164,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (timeOffset_ != null) {
@@ -182,7 +175,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -310,7 +302,6 @@ public static com.google.cloud.videointelligence.v1p1beta1.ExplicitContentFrame
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -318,7 +309,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1p1beta1.ExplicitContentFrame prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -346,7 +336,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_ExplicitContentFrame_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_ExplicitContentFrame_fieldAccessorTable
@@ -369,7 +358,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (timeOffsetBuilder_ == null) {
@@ -383,18 +371,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_ExplicitContentFrame_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.ExplicitContentFrame getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1p1beta1.ExplicitContentFrame.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.ExplicitContentFrame build() {
       com.google.cloud.videointelligence.v1p1beta1.ExplicitContentFrame result = buildPartial();
       if (!result.isInitialized()) {
@@ -403,7 +388,6 @@ public com.google.cloud.videointelligence.v1p1beta1.ExplicitContentFrame build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.ExplicitContentFrame buildPartial() {
       com.google.cloud.videointelligence.v1p1beta1.ExplicitContentFrame result = new com.google.cloud.videointelligence.v1p1beta1.ExplicitContentFrame(this);
       if (timeOffsetBuilder_ == null) {
@@ -416,39 +400,32 @@ public com.google.cloud.videointelligence.v1p1beta1.ExplicitContentFrame buildPa
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1p1beta1.ExplicitContentFrame) {
         return mergeFrom((com.google.cloud.videointelligence.v1p1beta1.ExplicitContentFrame)other);
@@ -471,12 +448,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1p1beta1.ExplicitCo
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -688,7 +663,6 @@ public Builder setPornographyLikelihoodValue(int value) {
      * .google.cloud.videointelligence.v1p1beta1.Likelihood pornography_likelihood = 2;
      */
     public com.google.cloud.videointelligence.v1p1beta1.Likelihood getPornographyLikelihood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.videointelligence.v1p1beta1.Likelihood result = com.google.cloud.videointelligence.v1p1beta1.Likelihood.valueOf(pornographyLikelihood_);
       return result == null ? com.google.cloud.videointelligence.v1p1beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -721,13 +695,11 @@ public Builder clearPornographyLikelihood() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -749,12 +721,11 @@ public static com.google.cloud.videointelligence.v1p1beta1.ExplicitContentFrame
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ExplicitContentFrame parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ExplicitContentFrame(input, extensionRegistry);
+        return new ExplicitContentFrame(input, extensionRegistry);
     }
   };
 
@@ -767,7 +738,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1p1beta1.ExplicitContentFrame getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelAnnotation.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelAnnotation.java
index 6a5aafa97dba..ca28b82bdae2 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelAnnotation.java
@@ -35,9 +35,6 @@ private LabelAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private LabelAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.videointelligence.v1p1beta1.Entity.Builder subBuilder = null;
             if (entity_ != null) {
@@ -89,13 +93,6 @@ private LabelAnnotation(
                 input.readMessage(com.google.cloud.videointelligence.v1p1beta1.LabelFrame.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -122,7 +119,6 @@ private LabelAnnotation(
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_LabelAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_LabelAnnotation_fieldAccessorTable
@@ -345,7 +341,6 @@ public com.google.cloud.videointelligence.v1p1beta1.LabelFrameOrBuilder getFrame
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -355,7 +350,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (entity_ != null) {
@@ -373,7 +367,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -524,7 +517,6 @@ public static com.google.cloud.videointelligence.v1p1beta1.LabelAnnotation parse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -532,7 +524,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1p1beta1.LabelAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -560,7 +551,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_LabelAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_LabelAnnotation_fieldAccessorTable
@@ -586,7 +576,6 @@ private void maybeForceBuilderInitialization() {
         getFramesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (entityBuilder_ == null) {
@@ -616,18 +605,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_LabelAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.LabelAnnotation getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1p1beta1.LabelAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.LabelAnnotation build() {
       com.google.cloud.videointelligence.v1p1beta1.LabelAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -636,7 +622,6 @@ public com.google.cloud.videointelligence.v1p1beta1.LabelAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.LabelAnnotation buildPartial() {
       com.google.cloud.videointelligence.v1p1beta1.LabelAnnotation result = new com.google.cloud.videointelligence.v1p1beta1.LabelAnnotation(this);
       int from_bitField0_ = bitField0_;
@@ -678,39 +663,32 @@ public com.google.cloud.videointelligence.v1p1beta1.LabelAnnotation buildPartial
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1p1beta1.LabelAnnotation) {
         return mergeFrom((com.google.cloud.videointelligence.v1p1beta1.LabelAnnotation)other);
@@ -808,12 +786,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1p1beta1.LabelAnnot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1975,13 +1951,11 @@ public com.google.cloud.videointelligence.v1p1beta1.LabelFrame.Builder addFrames
       }
       return framesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2003,12 +1977,11 @@ public static com.google.cloud.videointelligence.v1p1beta1.LabelAnnotation getDe
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LabelAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LabelAnnotation(input, extensionRegistry);
+        return new LabelAnnotation(input, extensionRegistry);
     }
   };
 
@@ -2021,7 +1994,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1p1beta1.LabelAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelDetectionConfig.java
index fa1e2d4c41d6..7911ddf85366 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelDetectionConfig.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelDetectionConfig.java
@@ -35,9 +35,6 @@ private LabelDetectionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private LabelDetectionConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -66,13 +70,6 @@ private LabelDetectionConfig(
             model_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private LabelDetectionConfig(
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_LabelDetectionConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_LabelDetectionConfig_fieldAccessorTable
@@ -122,7 +118,6 @@ public int getLabelDetectionModeValue() {
    * .google.cloud.videointelligence.v1p1beta1.LabelDetectionMode label_detection_mode = 1;
    */
   public com.google.cloud.videointelligence.v1p1beta1.LabelDetectionMode getLabelDetectionMode() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.videointelligence.v1p1beta1.LabelDetectionMode result = com.google.cloud.videointelligence.v1p1beta1.LabelDetectionMode.valueOf(labelDetectionMode_);
     return result == null ? com.google.cloud.videointelligence.v1p1beta1.LabelDetectionMode.UNRECOGNIZED : result;
   }
@@ -189,7 +184,6 @@ public java.lang.String getModel() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -199,7 +193,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (labelDetectionMode_ != com.google.cloud.videointelligence.v1p1beta1.LabelDetectionMode.LABEL_DETECTION_MODE_UNSPECIFIED.getNumber()) {
@@ -214,7 +207,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -345,7 +337,6 @@ public static com.google.cloud.videointelligence.v1p1beta1.LabelDetectionConfig
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -353,7 +344,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1p1beta1.LabelDetectionConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -381,7 +371,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_LabelDetectionConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_LabelDetectionConfig_fieldAccessorTable
@@ -404,7 +393,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       labelDetectionMode_ = 0;
@@ -416,18 +404,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_LabelDetectionConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.LabelDetectionConfig getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1p1beta1.LabelDetectionConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.LabelDetectionConfig build() {
       com.google.cloud.videointelligence.v1p1beta1.LabelDetectionConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -436,7 +421,6 @@ public com.google.cloud.videointelligence.v1p1beta1.LabelDetectionConfig build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.LabelDetectionConfig buildPartial() {
       com.google.cloud.videointelligence.v1p1beta1.LabelDetectionConfig result = new com.google.cloud.videointelligence.v1p1beta1.LabelDetectionConfig(this);
       result.labelDetectionMode_ = labelDetectionMode_;
@@ -446,39 +430,32 @@ public com.google.cloud.videointelligence.v1p1beta1.LabelDetectionConfig buildPa
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1p1beta1.LabelDetectionConfig) {
         return mergeFrom((com.google.cloud.videointelligence.v1p1beta1.LabelDetectionConfig)other);
@@ -505,12 +482,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1p1beta1.LabelDetec
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -566,7 +541,6 @@ public Builder setLabelDetectionModeValue(int value) {
      * .google.cloud.videointelligence.v1p1beta1.LabelDetectionMode label_detection_mode = 1;
      */
     public com.google.cloud.videointelligence.v1p1beta1.LabelDetectionMode getLabelDetectionMode() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.videointelligence.v1p1beta1.LabelDetectionMode result = com.google.cloud.videointelligence.v1p1beta1.LabelDetectionMode.valueOf(labelDetectionMode_);
       return result == null ? com.google.cloud.videointelligence.v1p1beta1.LabelDetectionMode.UNRECOGNIZED : result;
     }
@@ -746,13 +720,11 @@ public Builder setModelBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -774,12 +746,11 @@ public static com.google.cloud.videointelligence.v1p1beta1.LabelDetectionConfig
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LabelDetectionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LabelDetectionConfig(input, extensionRegistry);
+        return new LabelDetectionConfig(input, extensionRegistry);
     }
   };
 
@@ -792,7 +763,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1p1beta1.LabelDetectionConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelFrame.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelFrame.java
index cf46d97d2a49..98601f40c42f 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelFrame.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelFrame.java
@@ -33,9 +33,6 @@ private LabelFrame(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private LabelFrame(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.protobuf.Duration.Builder subBuilder = null;
             if (timeOffset_ != null) {
@@ -65,13 +69,6 @@ private LabelFrame(
             confidence_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -89,7 +86,6 @@ private LabelFrame(
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_LabelFrame_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_LabelFrame_fieldAccessorTable
@@ -147,7 +143,6 @@ public float getConfidence() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (timeOffset_ != null) {
@@ -169,7 +163,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -301,7 +294,6 @@ public static com.google.cloud.videointelligence.v1p1beta1.LabelFrame parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -309,7 +301,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1p1beta1.LabelFrame prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -337,7 +328,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_LabelFrame_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_LabelFrame_fieldAccessorTable
@@ -360,7 +350,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (timeOffsetBuilder_ == null) {
@@ -374,18 +363,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_LabelFrame_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.LabelFrame getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1p1beta1.LabelFrame.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.LabelFrame build() {
       com.google.cloud.videointelligence.v1p1beta1.LabelFrame result = buildPartial();
       if (!result.isInitialized()) {
@@ -394,7 +380,6 @@ public com.google.cloud.videointelligence.v1p1beta1.LabelFrame build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.LabelFrame buildPartial() {
       com.google.cloud.videointelligence.v1p1beta1.LabelFrame result = new com.google.cloud.videointelligence.v1p1beta1.LabelFrame(this);
       if (timeOffsetBuilder_ == null) {
@@ -407,39 +392,32 @@ public com.google.cloud.videointelligence.v1p1beta1.LabelFrame buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1p1beta1.LabelFrame) {
         return mergeFrom((com.google.cloud.videointelligence.v1p1beta1.LabelFrame)other);
@@ -462,12 +440,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1p1beta1.LabelFrame
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -685,13 +661,11 @@ public Builder clearConfidence() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -713,12 +687,11 @@ public static com.google.cloud.videointelligence.v1p1beta1.LabelFrame getDefault
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LabelFrame parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LabelFrame(input, extensionRegistry);
+        return new LabelFrame(input, extensionRegistry);
     }
   };
 
@@ -731,7 +704,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1p1beta1.LabelFrame getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelSegment.java
index 983c516ec359..1971b71500d3 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelSegment.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/LabelSegment.java
@@ -33,9 +33,6 @@ private LabelSegment(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private LabelSegment(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.videointelligence.v1p1beta1.VideoSegment.Builder subBuilder = null;
             if (segment_ != null) {
@@ -65,13 +69,6 @@ private LabelSegment(
             confidence_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -89,7 +86,6 @@ private LabelSegment(
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_LabelSegment_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_LabelSegment_fieldAccessorTable
@@ -144,7 +140,6 @@ public float getConfidence() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -154,7 +149,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (segment_ != null) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -298,7 +291,6 @@ public static com.google.cloud.videointelligence.v1p1beta1.LabelSegment parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -306,7 +298,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1p1beta1.LabelSegment prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -334,7 +325,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_LabelSegment_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_LabelSegment_fieldAccessorTable
@@ -357,7 +347,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (segmentBuilder_ == null) {
@@ -371,18 +360,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_LabelSegment_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.LabelSegment getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1p1beta1.LabelSegment.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.LabelSegment build() {
       com.google.cloud.videointelligence.v1p1beta1.LabelSegment result = buildPartial();
       if (!result.isInitialized()) {
@@ -391,7 +377,6 @@ public com.google.cloud.videointelligence.v1p1beta1.LabelSegment build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.LabelSegment buildPartial() {
       com.google.cloud.videointelligence.v1p1beta1.LabelSegment result = new com.google.cloud.videointelligence.v1p1beta1.LabelSegment(this);
       if (segmentBuilder_ == null) {
@@ -404,39 +389,32 @@ public com.google.cloud.videointelligence.v1p1beta1.LabelSegment buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1p1beta1.LabelSegment) {
         return mergeFrom((com.google.cloud.videointelligence.v1p1beta1.LabelSegment)other);
@@ -459,12 +437,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1p1beta1.LabelSegme
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -673,13 +649,11 @@ public Builder clearConfidence() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -701,12 +675,11 @@ public static com.google.cloud.videointelligence.v1p1beta1.LabelSegment getDefau
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LabelSegment parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LabelSegment(input, extensionRegistry);
+        return new LabelSegment(input, extensionRegistry);
     }
   };
 
@@ -719,7 +692,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1p1beta1.LabelSegment getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ShotChangeDetectionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ShotChangeDetectionConfig.java
index 344a15bdaf9d..892c40e31907 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ShotChangeDetectionConfig.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/ShotChangeDetectionConfig.java
@@ -33,9 +33,6 @@ private ShotChangeDetectionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private ShotChangeDetectionConfig(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            model_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private ShotChangeDetectionConfig(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            model_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private ShotChangeDetectionConfig(
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_ShotChangeDetectionConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_ShotChangeDetectionConfig_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getModel() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getModelBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.videointelligence.v1p1beta1.ShotChangeDetectionCo
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1p1beta1.ShotChangeDetectionConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_ShotChangeDetectionConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_ShotChangeDetectionConfig_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       model_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_ShotChangeDetectionConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.ShotChangeDetectionConfig getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1p1beta1.ShotChangeDetectionConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.ShotChangeDetectionConfig build() {
       com.google.cloud.videointelligence.v1p1beta1.ShotChangeDetectionConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.videointelligence.v1p1beta1.ShotChangeDetectionConfig bu
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.ShotChangeDetectionConfig buildPartial() {
       com.google.cloud.videointelligence.v1p1beta1.ShotChangeDetectionConfig result = new com.google.cloud.videointelligence.v1p1beta1.ShotChangeDetectionConfig(this);
       result.model_ = model_;
@@ -361,39 +346,32 @@ public com.google.cloud.videointelligence.v1p1beta1.ShotChangeDetectionConfig bu
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1p1beta1.ShotChangeDetectionConfig) {
         return mergeFrom((com.google.cloud.videointelligence.v1p1beta1.ShotChangeDetectionConfig)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1p1beta1.ShotChange
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setModelBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.videointelligence.v1p1beta1.ShotChangeDetectionCo
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ShotChangeDetectionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ShotChangeDetectionConfig(input, extensionRegistry);
+        return new ShotChangeDetectionConfig(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1p1beta1.ShotChangeDetectionConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechContext.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechContext.java
index e3f49ffd867f..1d295005931c 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechContext.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechContext.java
@@ -34,9 +34,6 @@ private SpeechContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private SpeechContext(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -57,13 +61,6 @@ private SpeechContext(
             phrases_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private SpeechContext(
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_SpeechContext_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_SpeechContext_fieldAccessorTable
@@ -158,7 +154,6 @@ public java.lang.String getPhrases(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -168,7 +163,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < phrases_.size(); i++) {
@@ -177,7 +171,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -299,7 +292,6 @@ public static com.google.cloud.videointelligence.v1p1beta1.SpeechContext parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -307,7 +299,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1p1beta1.SpeechContext prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -336,7 +327,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_SpeechContext_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_SpeechContext_fieldAccessorTable
@@ -359,7 +349,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       phrases_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -367,18 +356,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_SpeechContext_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.SpeechContext getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1p1beta1.SpeechContext.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.SpeechContext build() {
       com.google.cloud.videointelligence.v1p1beta1.SpeechContext result = buildPartial();
       if (!result.isInitialized()) {
@@ -387,7 +373,6 @@ public com.google.cloud.videointelligence.v1p1beta1.SpeechContext build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.SpeechContext buildPartial() {
       com.google.cloud.videointelligence.v1p1beta1.SpeechContext result = new com.google.cloud.videointelligence.v1p1beta1.SpeechContext(this);
       int from_bitField0_ = bitField0_;
@@ -400,39 +385,32 @@ public com.google.cloud.videointelligence.v1p1beta1.SpeechContext buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1p1beta1.SpeechContext) {
         return mergeFrom((com.google.cloud.videointelligence.v1p1beta1.SpeechContext)other);
@@ -459,12 +437,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1p1beta1.SpeechCont
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -658,13 +634,11 @@ public Builder addPhrasesBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -686,12 +660,11 @@ public static com.google.cloud.videointelligence.v1p1beta1.SpeechContext getDefa
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SpeechContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SpeechContext(input, extensionRegistry);
+        return new SpeechContext(input, extensionRegistry);
     }
   };
 
@@ -704,7 +677,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1p1beta1.SpeechContext getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechRecognitionAlternative.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechRecognitionAlternative.java
index ec6172572444..2da35c224755 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechRecognitionAlternative.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechRecognitionAlternative.java
@@ -35,9 +35,6 @@ private SpeechRecognitionAlternative(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private SpeechRecognitionAlternative(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -69,13 +73,6 @@ private SpeechRecognitionAlternative(
                 input.readMessage(com.google.cloud.videointelligence.v1p1beta1.WordInfo.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private SpeechRecognitionAlternative(
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_SpeechRecognitionAlternative_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_SpeechRecognitionAlternative_fieldAccessorTable
@@ -221,7 +217,6 @@ public com.google.cloud.videointelligence.v1p1beta1.WordInfoOrBuilder getWordsOr
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -231,7 +226,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getTranscriptBytes().isEmpty()) {
@@ -246,7 +240,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -382,7 +375,6 @@ public static com.google.cloud.videointelligence.v1p1beta1.SpeechRecognitionAlte
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -390,7 +382,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1p1beta1.SpeechRecognitionAlternative prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -418,7 +409,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_SpeechRecognitionAlternative_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_SpeechRecognitionAlternative_fieldAccessorTable
@@ -442,7 +432,6 @@ private void maybeForceBuilderInitialization() {
         getWordsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       transcript_ = "";
@@ -458,18 +447,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_SpeechRecognitionAlternative_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.SpeechRecognitionAlternative getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1p1beta1.SpeechRecognitionAlternative.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.SpeechRecognitionAlternative build() {
       com.google.cloud.videointelligence.v1p1beta1.SpeechRecognitionAlternative result = buildPartial();
       if (!result.isInitialized()) {
@@ -478,7 +464,6 @@ public com.google.cloud.videointelligence.v1p1beta1.SpeechRecognitionAlternative
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.SpeechRecognitionAlternative buildPartial() {
       com.google.cloud.videointelligence.v1p1beta1.SpeechRecognitionAlternative result = new com.google.cloud.videointelligence.v1p1beta1.SpeechRecognitionAlternative(this);
       int from_bitField0_ = bitField0_;
@@ -499,39 +484,32 @@ public com.google.cloud.videointelligence.v1p1beta1.SpeechRecognitionAlternative
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1p1beta1.SpeechRecognitionAlternative) {
         return mergeFrom((com.google.cloud.videointelligence.v1p1beta1.SpeechRecognitionAlternative)other);
@@ -581,12 +559,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1p1beta1.SpeechReco
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1059,13 +1035,11 @@ public com.google.cloud.videointelligence.v1p1beta1.WordInfo.Builder addWordsBui
       }
       return wordsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1087,12 +1061,11 @@ public static com.google.cloud.videointelligence.v1p1beta1.SpeechRecognitionAlte
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SpeechRecognitionAlternative parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SpeechRecognitionAlternative(input, extensionRegistry);
+        return new SpeechRecognitionAlternative(input, extensionRegistry);
     }
   };
 
@@ -1105,7 +1078,6 @@ public com.google.protobuf.Parser getParserForType
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1p1beta1.SpeechRecognitionAlternative getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechTranscription.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechTranscription.java
index 8637302f67fe..5d2d570d4c91 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechTranscription.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechTranscription.java
@@ -33,9 +33,6 @@ private SpeechTranscription(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private SpeechTranscription(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               alternatives_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private SpeechTranscription(
                 input.readMessage(com.google.cloud.videointelligence.v1p1beta1.SpeechRecognitionAlternative.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private SpeechTranscription(
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_SpeechTranscription_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_SpeechTranscription_fieldAccessorTable
@@ -162,7 +158,6 @@ public com.google.cloud.videointelligence.v1p1beta1.SpeechRecognitionAlternative
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -172,7 +167,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < alternatives_.size(); i++) {
@@ -181,7 +175,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -299,7 +292,6 @@ public static com.google.cloud.videointelligence.v1p1beta1.SpeechTranscription p
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -307,7 +299,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1p1beta1.SpeechTranscription prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -335,7 +326,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_SpeechTranscription_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_SpeechTranscription_fieldAccessorTable
@@ -359,7 +349,6 @@ private void maybeForceBuilderInitialization() {
         getAlternativesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (alternativesBuilder_ == null) {
@@ -371,18 +360,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_SpeechTranscription_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.SpeechTranscription getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1p1beta1.SpeechTranscription.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.SpeechTranscription build() {
       com.google.cloud.videointelligence.v1p1beta1.SpeechTranscription result = buildPartial();
       if (!result.isInitialized()) {
@@ -391,7 +377,6 @@ public com.google.cloud.videointelligence.v1p1beta1.SpeechTranscription build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.SpeechTranscription buildPartial() {
       com.google.cloud.videointelligence.v1p1beta1.SpeechTranscription result = new com.google.cloud.videointelligence.v1p1beta1.SpeechTranscription(this);
       int from_bitField0_ = bitField0_;
@@ -408,39 +393,32 @@ public com.google.cloud.videointelligence.v1p1beta1.SpeechTranscription buildPar
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1p1beta1.SpeechTranscription) {
         return mergeFrom((com.google.cloud.videointelligence.v1p1beta1.SpeechTranscription)other);
@@ -483,12 +461,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1p1beta1.SpeechTran
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -873,13 +849,11 @@ public com.google.cloud.videointelligence.v1p1beta1.SpeechRecognitionAlternative
       }
       return alternativesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -901,12 +875,11 @@ public static com.google.cloud.videointelligence.v1p1beta1.SpeechTranscription g
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SpeechTranscription parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SpeechTranscription(input, extensionRegistry);
+        return new SpeechTranscription(input, extensionRegistry);
     }
   };
 
@@ -919,7 +892,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1p1beta1.SpeechTranscription getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechTranscriptionConfig.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechTranscriptionConfig.java
index 20744d633d5d..23c89fc2613b 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechTranscriptionConfig.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/SpeechTranscriptionConfig.java
@@ -38,9 +38,6 @@ private SpeechTranscriptionConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private SpeechTranscriptionConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -103,13 +107,6 @@ private SpeechTranscriptionConfig(
             input.popLimit(limit);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -133,7 +130,6 @@ private SpeechTranscriptionConfig(
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_SpeechTranscriptionConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_SpeechTranscriptionConfig_fieldAccessorTable
@@ -337,7 +333,6 @@ public int getAudioTracks(int index) {
   private int audioTracksMemoizedSerializedSize = -1;
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -347,7 +342,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     getSerializedSize();
@@ -376,7 +370,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -547,7 +540,6 @@ public static com.google.cloud.videointelligence.v1p1beta1.SpeechTranscriptionCo
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -555,7 +547,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1p1beta1.SpeechTranscriptionConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -583,7 +574,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_SpeechTranscriptionConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_SpeechTranscriptionConfig_fieldAccessorTable
@@ -607,7 +597,6 @@ private void maybeForceBuilderInitialization() {
         getSpeechContextsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       languageCode_ = "";
@@ -629,18 +618,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_SpeechTranscriptionConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.SpeechTranscriptionConfig getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1p1beta1.SpeechTranscriptionConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.SpeechTranscriptionConfig build() {
       com.google.cloud.videointelligence.v1p1beta1.SpeechTranscriptionConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -649,7 +635,6 @@ public com.google.cloud.videointelligence.v1p1beta1.SpeechTranscriptionConfig bu
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.SpeechTranscriptionConfig buildPartial() {
       com.google.cloud.videointelligence.v1p1beta1.SpeechTranscriptionConfig result = new com.google.cloud.videointelligence.v1p1beta1.SpeechTranscriptionConfig(this);
       int from_bitField0_ = bitField0_;
@@ -677,39 +662,32 @@ public com.google.cloud.videointelligence.v1p1beta1.SpeechTranscriptionConfig bu
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1p1beta1.SpeechTranscriptionConfig) {
         return mergeFrom((com.google.cloud.videointelligence.v1p1beta1.SpeechTranscriptionConfig)other);
@@ -775,12 +753,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1p1beta1.SpeechTran
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1471,13 +1447,11 @@ public Builder clearAudioTracks() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1499,12 +1473,11 @@ public static com.google.cloud.videointelligence.v1p1beta1.SpeechTranscriptionCo
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SpeechTranscriptionConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SpeechTranscriptionConfig(input, extensionRegistry);
+        return new SpeechTranscriptionConfig(input, extensionRegistry);
     }
   };
 
@@ -1517,7 +1490,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1p1beta1.SpeechTranscriptionConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoAnnotationProgress.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoAnnotationProgress.java
index ac39d3a63868..c4d1e8a8fc32 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoAnnotationProgress.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoAnnotationProgress.java
@@ -34,9 +34,6 @@ private VideoAnnotationProgress(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private VideoAnnotationProgress(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -85,13 +89,6 @@ private VideoAnnotationProgress(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -109,7 +106,6 @@ private VideoAnnotationProgress(
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_VideoAnnotationProgress_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_VideoAnnotationProgress_fieldAccessorTable
@@ -242,7 +238,6 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -252,7 +247,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getInputUriBytes().isEmpty()) {
@@ -270,7 +264,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -419,7 +412,6 @@ public static com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationProgre
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -427,7 +419,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationProgress prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -455,7 +446,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_VideoAnnotationProgress_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_VideoAnnotationProgress_fieldAccessorTable
@@ -478,7 +468,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       inputUri_ = "";
@@ -500,18 +489,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_VideoAnnotationProgress_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationProgress getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationProgress.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationProgress build() {
       com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationProgress result = buildPartial();
       if (!result.isInitialized()) {
@@ -520,7 +506,6 @@ public com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationProgress buil
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationProgress buildPartial() {
       com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationProgress result = new com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationProgress(this);
       result.inputUri_ = inputUri_;
@@ -539,39 +524,32 @@ public com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationProgress buil
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationProgress) {
         return mergeFrom((com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationProgress)other);
@@ -601,12 +579,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1p1beta1.VideoAnnot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1065,13 +1041,11 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
       }
       return updateTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1093,12 +1067,11 @@ public static com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationProgre
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public VideoAnnotationProgress parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoAnnotationProgress(input, extensionRegistry);
+        return new VideoAnnotationProgress(input, extensionRegistry);
     }
   };
 
@@ -1111,7 +1084,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationProgress getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoAnnotationResults.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoAnnotationResults.java
index 3019b6964dcc..4e53c5b86f02 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoAnnotationResults.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoAnnotationResults.java
@@ -38,9 +38,6 @@ private VideoAnnotationResults(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private VideoAnnotationResults(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -129,13 +133,6 @@ private VideoAnnotationResults(
                 input.readMessage(com.google.cloud.videointelligence.v1p1beta1.SpeechTranscription.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -168,7 +165,6 @@ private VideoAnnotationResults(
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_VideoAnnotationResults_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_VideoAnnotationResults_fieldAccessorTable
@@ -581,7 +577,6 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -591,7 +586,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getInputUriBytes().isEmpty()) {
@@ -621,7 +615,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -812,7 +805,6 @@ public static com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationResult
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -820,7 +812,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationResults prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -848,7 +839,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_VideoAnnotationResults_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_VideoAnnotationResults_fieldAccessorTable
@@ -876,7 +866,6 @@ private void maybeForceBuilderInitialization() {
         getSpeechTranscriptionsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       inputUri_ = "";
@@ -926,18 +915,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_VideoAnnotationResults_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationResults getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationResults.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationResults build() {
       com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationResults result = buildPartial();
       if (!result.isInitialized()) {
@@ -946,7 +932,6 @@ public com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationResults build
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationResults buildPartial() {
       com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationResults result = new com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationResults(this);
       int from_bitField0_ = bitField0_;
@@ -1012,39 +997,32 @@ public com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationResults build
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationResults) {
         return mergeFrom((com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationResults)other);
@@ -1201,12 +1179,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1p1beta1.VideoAnnot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3248,13 +3224,11 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() {
       }
       return errorBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -3276,12 +3250,11 @@ public static com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationResult
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public VideoAnnotationResults parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoAnnotationResults(input, extensionRegistry);
+        return new VideoAnnotationResults(input, extensionRegistry);
     }
   };
 
@@ -3294,7 +3267,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1p1beta1.VideoAnnotationResults getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoContext.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoContext.java
index c9b04a9e361b..31f608403d62 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoContext.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoContext.java
@@ -33,9 +33,6 @@ private VideoContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private VideoContext(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               segments_ = new java.util.ArrayList();
@@ -108,13 +112,6 @@ private VideoContext(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -135,7 +132,6 @@ private VideoContext(
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_VideoContext_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_VideoContext_fieldAccessorTable
@@ -342,7 +338,6 @@ public com.google.cloud.videointelligence.v1p1beta1.SpeechTranscriptionConfigOrB
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -352,7 +347,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < segments_.size(); i++) {
@@ -373,7 +367,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -543,7 +536,6 @@ public static com.google.cloud.videointelligence.v1p1beta1.VideoContext parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -551,7 +543,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1p1beta1.VideoContext prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -579,7 +570,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_VideoContext_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_VideoContext_fieldAccessorTable
@@ -603,7 +593,6 @@ private void maybeForceBuilderInitialization() {
         getSegmentsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (segmentsBuilder_ == null) {
@@ -639,18 +628,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_VideoContext_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.VideoContext getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoContext.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.VideoContext build() {
       com.google.cloud.videointelligence.v1p1beta1.VideoContext result = buildPartial();
       if (!result.isInitialized()) {
@@ -659,7 +645,6 @@ public com.google.cloud.videointelligence.v1p1beta1.VideoContext build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.VideoContext buildPartial() {
       com.google.cloud.videointelligence.v1p1beta1.VideoContext result = new com.google.cloud.videointelligence.v1p1beta1.VideoContext(this);
       int from_bitField0_ = bitField0_;
@@ -698,39 +683,32 @@ public com.google.cloud.videointelligence.v1p1beta1.VideoContext buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1p1beta1.VideoContext) {
         return mergeFrom((com.google.cloud.videointelligence.v1p1beta1.VideoContext)other);
@@ -785,12 +763,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1p1beta1.VideoConte
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1769,13 +1745,11 @@ public com.google.cloud.videointelligence.v1p1beta1.SpeechTranscriptionConfigOrB
       }
       return speechTranscriptionConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1797,12 +1771,11 @@ public static com.google.cloud.videointelligence.v1p1beta1.VideoContext getDefau
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public VideoContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoContext(input, extensionRegistry);
+        return new VideoContext(input, extensionRegistry);
     }
   };
 
@@ -1815,7 +1788,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1p1beta1.VideoContext getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceProto.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceProto.java
index d1ac0ee061b2..166c30d900e9 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoIntelligenceServiceProto.java
@@ -137,7 +137,7 @@ public static void registerAllExtensions(
       "o\032\027google/rpc/status.proto\"\375\001\n\024AnnotateV" +
       "ideoRequest\022\021\n\tinput_uri\030\001 \001(\t\022\025\n\rinput_" +
       "content\030\006 \001(\014\022C\n\010features\030\002 \003(\01621.google" +
-      ".cloud.videointelligence.v1p1beta1.Featu" +
+      ".cloud.videointelligence.v1p1beta1.Featu",
       "re\022M\n\rvideo_context\030\003 \001(\01326.google.cloud" +
       ".videointelligence.v1p1beta1.VideoContex" +
       "t\022\022\n\noutput_uri\030\004 \001(\t\022\023\n\013location_id\030\005 \001" +
@@ -147,7 +147,7 @@ public static void registerAllExtensions(
       "\002 \001(\0132>.google.cloud.videointelligence.v" +
       "1p1beta1.LabelDetectionConfig\022i\n\034shot_ch" +
       "ange_detection_config\030\003 \001(\0132C.google.clo" +
-      "ud.videointelligence.v1p1beta1.ShotChang" +
+      "ud.videointelligence.v1p1beta1.ShotChang",
       "eDetectionConfig\022s\n!explicit_content_det" +
       "ection_config\030\004 \001(\0132H.google.cloud.video" +
       "intelligence.v1p1beta1.ExplicitContentDe" +
@@ -157,7 +157,7 @@ public static void registerAllExtensions(
       "\234\001\n\024LabelDetectionConfig\022Z\n\024label_detect" +
       "ion_mode\030\001 \001(\0162<.google.cloud.videointel" +
       "ligence.v1p1beta1.LabelDetectionMode\022\031\n\021" +
-      "stationary_camera\030\002 \001(\010\022\r\n\005model\030\003 \001(\t\"*" +
+      "stationary_camera\030\002 \001(\010\022\r\n\005model\030\003 \001(\t\"*",
       "\n\031ShotChangeDetectionConfig\022\r\n\005model\030\001 \001" +
       "(\t\"/\n\036ExplicitContentDetectionConfig\022\r\n\005" +
       "model\030\001 \001(\t\"x\n\014VideoSegment\0224\n\021start_tim" +
@@ -167,7 +167,7 @@ public static void registerAllExtensions(
       "\030\001 \001(\01326.google.cloud.videointelligence." +
       "v1p1beta1.VideoSegment\022\022\n\nconfidence\030\002 \001" +
       "(\002\"P\n\nLabelFrame\022.\n\013time_offset\030\001 \001(\0132\031." +
-      "google.protobuf.Duration\022\022\n\nconfidence\030\002" +
+      "google.protobuf.Duration\022\022\n\nconfidence\030\002",
       " \001(\002\"G\n\006Entity\022\021\n\tentity_id\030\001 \001(\t\022\023\n\013des" +
       "cription\030\002 \001(\t\022\025\n\rlanguage_code\030\003 \001(\t\"\260\002" +
       "\n\017LabelAnnotation\022@\n\006entity\030\001 \001(\01320.goog" +
@@ -177,7 +177,7 @@ public static void registerAllExtensions(
       "\022H\n\010segments\030\003 \003(\01326.google.cloud.videoi" +
       "ntelligence.v1p1beta1.LabelSegment\022D\n\006fr" +
       "ames\030\004 \003(\01324.google.cloud.videointellige" +
-      "nce.v1p1beta1.LabelFrame\"\234\001\n\024ExplicitCon" +
+      "nce.v1p1beta1.LabelFrame\"\234\001\n\024ExplicitCon",
       "tentFrame\022.\n\013time_offset\030\001 \001(\0132\031.google." +
       "protobuf.Duration\022T\n\026pornography_likelih" +
       "ood\030\002 \001(\01624.google.cloud.videointelligen" +
@@ -187,7 +187,7 @@ public static void registerAllExtensions(
       "ContentFrame\"\365\004\n\026VideoAnnotationResults\022" +
       "\021\n\tinput_uri\030\001 \001(\t\022\\\n\031segment_label_anno" +
       "tations\030\002 \003(\01329.google.cloud.videointell" +
-      "igence.v1p1beta1.LabelAnnotation\022Y\n\026shot" +
+      "igence.v1p1beta1.LabelAnnotation\022Y\n\026shot",
       "_label_annotations\030\003 \003(\01329.google.cloud." +
       "videointelligence.v1p1beta1.LabelAnnotat" +
       "ion\022Z\n\027frame_label_annotations\030\004 \003(\01329.g" +
@@ -197,7 +197,7 @@ public static void registerAllExtensions(
       "eta1.VideoSegment\022`\n\023explicit_annotation" +
       "\030\007 \001(\0132C.google.cloud.videointelligence." +
       "v1p1beta1.ExplicitContentAnnotation\022\\\n\025s" +
-      "peech_transcriptions\030\013 \003(\0132=.google.clou" +
+      "peech_transcriptions\030\013 \003(\0132=.google.clou",
       "d.videointelligence.v1p1beta1.SpeechTran" +
       "scription\022!\n\005error\030\t \001(\0132\022.google.rpc.St" +
       "atus\"u\n\025AnnotateVideoResponse\022\\\n\022annotat" +
@@ -207,7 +207,7 @@ public static void registerAllExtensions(
       "_uri\030\001 \001(\t\022\030\n\020progress_percent\030\002 \001(\005\022.\n\n" +
       "start_time\030\003 \001(\0132\032.google.protobuf.Times" +
       "tamp\022/\n\013update_time\030\004 \001(\0132\032.google.proto" +
-      "buf.Timestamp\"w\n\025AnnotateVideoProgress\022^" +
+      "buf.Timestamp\"w\n\025AnnotateVideoProgress\022^",
       "\n\023annotation_progress\030\001 \003(\0132A.google.clo" +
       "ud.videointelligence.v1p1beta1.VideoAnno" +
       "tationProgress\"\364\001\n\031SpeechTranscriptionCo" +
@@ -217,7 +217,7 @@ public static void registerAllExtensions(
       "videointelligence.v1p1beta1.SpeechContex" +
       "t\022$\n\034enable_automatic_punctuation\030\005 \001(\010\022" +
       "\024\n\014audio_tracks\030\006 \003(\005\" \n\rSpeechContext\022\017" +
-      "\n\007phrases\030\001 \003(\t\"s\n\023SpeechTranscription\022\\" +
+      "\n\007phrases\030\001 \003(\t\"s\n\023SpeechTranscription\022\\",
       "\n\014alternatives\030\001 \003(\0132F.google.cloud.vide" +
       "ointelligence.v1p1beta1.SpeechRecognitio" +
       "nAlternative\"\211\001\n\034SpeechRecognitionAltern" +
@@ -227,7 +227,7 @@ public static void registerAllExtensions(
       "Info\022-\n\nstart_time\030\001 \001(\0132\031.google.protob" +
       "uf.Duration\022+\n\010end_time\030\002 \001(\0132\031.google.p" +
       "rotobuf.Duration\022\014\n\004word\030\003 \001(\t*\214\001\n\007Featu" +
-      "re\022\027\n\023FEATURE_UNSPECIFIED\020\000\022\023\n\017LABEL_DET" +
+      "re\022\027\n\023FEATURE_UNSPECIFIED\020\000\022\023\n\017LABEL_DET",
       "ECTION\020\001\022\031\n\025SHOT_CHANGE_DETECTION\020\002\022\036\n\032E" +
       "XPLICIT_CONTENT_DETECTION\020\003\022\030\n\024SPEECH_TR" +
       "ANSCRIPTION\020\006*r\n\022LabelDetectionMode\022$\n L" +
@@ -237,7 +237,7 @@ public static void registerAllExtensions(
       "SPECIFIED\020\000\022\021\n\rVERY_UNLIKELY\020\001\022\014\n\010UNLIKE" +
       "LY\020\002\022\014\n\010POSSIBLE\020\003\022\n\n\006LIKELY\020\004\022\017\n\013VERY_L" +
       "IKELY\020\0052\262\001\n\030VideoIntelligenceService\022\225\001\n" +
-      "\rAnnotateVideo\022>.google.cloud.videointel" +
+      "\rAnnotateVideo\022>.google.cloud.videointel",
       "ligence.v1p1beta1.AnnotateVideoRequest\032\035" +
       ".google.longrunning.Operation\"%\202\323\344\223\002\037\"\032/" +
       "v1p1beta1/videos:annotate:\001*B\200\002\n,com.goo" +
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoSegment.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoSegment.java
index 37b0fdf92a0d..77c39cb73b55 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoSegment.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/VideoSegment.java
@@ -32,9 +32,6 @@ private VideoSegment(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private VideoSegment(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.protobuf.Duration.Builder subBuilder = null;
             if (startTimeOffset_ != null) {
@@ -72,13 +76,6 @@ private VideoSegment(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private VideoSegment(
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_VideoSegment_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_VideoSegment_fieldAccessorTable
@@ -177,7 +173,6 @@ public com.google.protobuf.DurationOrBuilder getEndTimeOffsetOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -187,7 +182,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (startTimeOffset_ != null) {
@@ -199,7 +193,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -333,7 +326,6 @@ public static com.google.cloud.videointelligence.v1p1beta1.VideoSegment parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -341,7 +333,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1p1beta1.VideoSegment prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -369,7 +360,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_VideoSegment_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_VideoSegment_fieldAccessorTable
@@ -392,7 +382,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (startTimeOffsetBuilder_ == null) {
@@ -410,18 +399,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_VideoSegment_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.VideoSegment getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoSegment.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.VideoSegment build() {
       com.google.cloud.videointelligence.v1p1beta1.VideoSegment result = buildPartial();
       if (!result.isInitialized()) {
@@ -430,7 +416,6 @@ public com.google.cloud.videointelligence.v1p1beta1.VideoSegment build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.VideoSegment buildPartial() {
       com.google.cloud.videointelligence.v1p1beta1.VideoSegment result = new com.google.cloud.videointelligence.v1p1beta1.VideoSegment(this);
       if (startTimeOffsetBuilder_ == null) {
@@ -447,39 +432,32 @@ public com.google.cloud.videointelligence.v1p1beta1.VideoSegment buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1p1beta1.VideoSegment) {
         return mergeFrom((com.google.cloud.videointelligence.v1p1beta1.VideoSegment)other);
@@ -502,12 +480,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1p1beta1.VideoSegme
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -849,13 +825,11 @@ public com.google.protobuf.DurationOrBuilder getEndTimeOffsetOrBuilder() {
       }
       return endTimeOffsetBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -877,12 +851,11 @@ public static com.google.cloud.videointelligence.v1p1beta1.VideoSegment getDefau
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public VideoSegment parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VideoSegment(input, extensionRegistry);
+        return new VideoSegment(input, extensionRegistry);
     }
   };
 
@@ -895,7 +868,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1p1beta1.VideoSegment getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/WordInfo.java b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/WordInfo.java
index 06710ea16c17..11d7e6ae4fee 100644
--- a/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/WordInfo.java
+++ b/google-api-grpc/proto-google-cloud-video-intelligence-v1p1beta1/src/main/java/com/google/cloud/videointelligence/v1p1beta1/WordInfo.java
@@ -35,9 +35,6 @@ private WordInfo(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private WordInfo(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.protobuf.Duration.Builder subBuilder = null;
             if (startTime_ != null) {
@@ -81,13 +85,6 @@ private WordInfo(
             word_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -105,7 +102,6 @@ private WordInfo(
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_WordInfo_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_WordInfo_fieldAccessorTable
@@ -240,7 +236,6 @@ public java.lang.String getWord() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -250,7 +245,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (startTime_ != null) {
@@ -265,7 +259,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -406,7 +399,6 @@ public static com.google.cloud.videointelligence.v1p1beta1.WordInfo parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -414,7 +406,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.videointelligence.v1p1beta1.WordInfo prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -444,7 +435,6 @@ public static final class Builder extends
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_WordInfo_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_WordInfo_fieldAccessorTable
@@ -467,7 +457,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (startTimeBuilder_ == null) {
@@ -487,18 +476,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.videointelligence.v1p1beta1.VideoIntelligenceServiceProto.internal_static_google_cloud_videointelligence_v1p1beta1_WordInfo_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.WordInfo getDefaultInstanceForType() {
       return com.google.cloud.videointelligence.v1p1beta1.WordInfo.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.WordInfo build() {
       com.google.cloud.videointelligence.v1p1beta1.WordInfo result = buildPartial();
       if (!result.isInitialized()) {
@@ -507,7 +493,6 @@ public com.google.cloud.videointelligence.v1p1beta1.WordInfo build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.videointelligence.v1p1beta1.WordInfo buildPartial() {
       com.google.cloud.videointelligence.v1p1beta1.WordInfo result = new com.google.cloud.videointelligence.v1p1beta1.WordInfo(this);
       if (startTimeBuilder_ == null) {
@@ -525,39 +510,32 @@ public com.google.cloud.videointelligence.v1p1beta1.WordInfo buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.videointelligence.v1p1beta1.WordInfo) {
         return mergeFrom((com.google.cloud.videointelligence.v1p1beta1.WordInfo)other);
@@ -584,12 +562,10 @@ public Builder mergeFrom(com.google.cloud.videointelligence.v1p1beta1.WordInfo o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1056,13 +1032,11 @@ public Builder setWordBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1084,12 +1058,11 @@ public static com.google.cloud.videointelligence.v1p1beta1.WordInfo getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public WordInfo parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WordInfo(input, extensionRegistry);
+        return new WordInfo(input, extensionRegistry);
     }
   };
 
@@ -1102,7 +1075,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.videointelligence.v1p1beta1.WordInfo getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateFileResponse.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateFileResponse.java
index ffbb0fc8dd10..193d22ebf171 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateFileResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateFileResponse.java
@@ -34,9 +34,6 @@ private AnnotateFileResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private AnnotateFileResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1.InputConfig.Builder subBuilder = null;
             if (inputConfig_ != null) {
@@ -70,13 +74,6 @@ private AnnotateFileResponse(
                 input.readMessage(com.google.cloud.vision.v1.AnnotateImageResponse.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private AnnotateFileResponse(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AnnotateFileResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AnnotateFileResponse_fieldAccessorTable
@@ -195,7 +191,6 @@ public com.google.cloud.vision.v1.AnnotateImageResponseOrBuilder getResponsesOrB
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -205,7 +200,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (inputConfig_ != null) {
@@ -217,7 +211,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.cloud.vision.v1.AnnotateFileResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.AnnotateFileResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -385,7 +376,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AnnotateFileResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AnnotateFileResponse_fieldAccessorTable
@@ -409,7 +399,6 @@ private void maybeForceBuilderInitialization() {
         getResponsesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (inputConfigBuilder_ == null) {
@@ -427,18 +416,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AnnotateFileResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.AnnotateFileResponse getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.AnnotateFileResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.AnnotateFileResponse build() {
       com.google.cloud.vision.v1.AnnotateFileResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -447,7 +433,6 @@ public com.google.cloud.vision.v1.AnnotateFileResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.AnnotateFileResponse buildPartial() {
       com.google.cloud.vision.v1.AnnotateFileResponse result = new com.google.cloud.vision.v1.AnnotateFileResponse(this);
       int from_bitField0_ = bitField0_;
@@ -471,39 +456,32 @@ public com.google.cloud.vision.v1.AnnotateFileResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.AnnotateFileResponse) {
         return mergeFrom((com.google.cloud.vision.v1.AnnotateFileResponse)other);
@@ -549,12 +527,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.AnnotateFileResponse other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1038,13 +1014,11 @@ public com.google.cloud.vision.v1.AnnotateImageResponse.Builder addResponsesBuil
       }
       return responsesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1066,12 +1040,11 @@ public static com.google.cloud.vision.v1.AnnotateFileResponse getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnnotateFileResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateFileResponse(input, extensionRegistry);
+        return new AnnotateFileResponse(input, extensionRegistry);
     }
   };
 
@@ -1084,7 +1057,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.AnnotateFileResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateImageRequest.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateImageRequest.java
index 3f9f7c873d34..ec383d63a23f 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateImageRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateImageRequest.java
@@ -34,9 +34,6 @@ private AnnotateImageRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private AnnotateImageRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1.Image.Builder subBuilder = null;
             if (image_ != null) {
@@ -83,13 +87,6 @@ private AnnotateImageRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -110,7 +107,6 @@ private AnnotateImageRequest(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AnnotateImageRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AnnotateImageRequest_fieldAccessorTable
@@ -241,7 +237,6 @@ public com.google.cloud.vision.v1.ImageContextOrBuilder getImageContextOrBuilder
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -251,7 +246,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (image_ != null) {
@@ -266,7 +260,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -410,7 +403,6 @@ public static com.google.cloud.vision.v1.AnnotateImageRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -418,7 +410,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.AnnotateImageRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -447,7 +438,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AnnotateImageRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AnnotateImageRequest_fieldAccessorTable
@@ -471,7 +461,6 @@ private void maybeForceBuilderInitialization() {
         getFeaturesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (imageBuilder_ == null) {
@@ -495,18 +484,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AnnotateImageRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.AnnotateImageRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.AnnotateImageRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.AnnotateImageRequest build() {
       com.google.cloud.vision.v1.AnnotateImageRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -515,7 +501,6 @@ public com.google.cloud.vision.v1.AnnotateImageRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.AnnotateImageRequest buildPartial() {
       com.google.cloud.vision.v1.AnnotateImageRequest result = new com.google.cloud.vision.v1.AnnotateImageRequest(this);
       int from_bitField0_ = bitField0_;
@@ -544,39 +529,32 @@ public com.google.cloud.vision.v1.AnnotateImageRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.AnnotateImageRequest) {
         return mergeFrom((com.google.cloud.vision.v1.AnnotateImageRequest)other);
@@ -625,12 +603,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.AnnotateImageRequest other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1267,13 +1243,11 @@ public com.google.cloud.vision.v1.ImageContextOrBuilder getImageContextOrBuilder
       }
       return imageContextBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1295,12 +1269,11 @@ public static com.google.cloud.vision.v1.AnnotateImageRequest getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnnotateImageRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateImageRequest(input, extensionRegistry);
+        return new AnnotateImageRequest(input, extensionRegistry);
     }
   };
 
@@ -1313,7 +1286,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.AnnotateImageRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateImageResponse.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateImageResponse.java
index 0f092bd9e73b..2a43ce555d5c 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateImageResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AnnotateImageResponse.java
@@ -38,9 +38,6 @@ private AnnotateImageResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private AnnotateImageResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               faceAnnotations_ = new java.util.ArrayList();
@@ -197,13 +201,6 @@ private AnnotateImageResponse(
                 input.readMessage(com.google.cloud.vision.v1.LocalizedObjectAnnotation.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -239,7 +236,6 @@ private AnnotateImageResponse(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AnnotateImageResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AnnotateImageResponse_fieldAccessorTable
@@ -833,7 +829,6 @@ public com.google.cloud.vision.v1.ImageAnnotationContextOrBuilder getContextOrBu
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -843,7 +838,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < faceAnnotations_.size(); i++) {
@@ -888,7 +882,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1147,7 +1140,6 @@ public static com.google.cloud.vision.v1.AnnotateImageResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1155,7 +1147,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.AnnotateImageResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1183,7 +1174,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AnnotateImageResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AnnotateImageResponse_fieldAccessorTable
@@ -1212,7 +1202,6 @@ private void maybeForceBuilderInitialization() {
         getTextAnnotationsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (faceAnnotationsBuilder_ == null) {
@@ -1296,18 +1285,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AnnotateImageResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.AnnotateImageResponse getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.AnnotateImageResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.AnnotateImageResponse build() {
       com.google.cloud.vision.v1.AnnotateImageResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -1316,7 +1302,6 @@ public com.google.cloud.vision.v1.AnnotateImageResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.AnnotateImageResponse buildPartial() {
       com.google.cloud.vision.v1.AnnotateImageResponse result = new com.google.cloud.vision.v1.AnnotateImageResponse(this);
       int from_bitField0_ = bitField0_;
@@ -1415,39 +1400,32 @@ public com.google.cloud.vision.v1.AnnotateImageResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.AnnotateImageResponse) {
         return mergeFrom((com.google.cloud.vision.v1.AnnotateImageResponse)other);
@@ -1641,12 +1619,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.AnnotateImageResponse other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4680,13 +4656,11 @@ public com.google.cloud.vision.v1.ImageAnnotationContextOrBuilder getContextOrBu
       }
       return contextBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -4708,12 +4682,11 @@ public static com.google.cloud.vision.v1.AnnotateImageResponse getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnnotateImageResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateImageResponse(input, extensionRegistry);
+        return new AnnotateImageResponse(input, extensionRegistry);
     }
   };
 
@@ -4726,7 +4699,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.AnnotateImageResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileRequest.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileRequest.java
index 3d970c423ad0..8fa41a1819c0 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileRequest.java
@@ -33,9 +33,6 @@ private AsyncAnnotateFileRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private AsyncAnnotateFileRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1.InputConfig.Builder subBuilder = null;
             if (inputConfig_ != null) {
@@ -95,13 +99,6 @@ private AsyncAnnotateFileRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -122,7 +119,6 @@ private AsyncAnnotateFileRequest(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncAnnotateFileRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncAnnotateFileRequest_fieldAccessorTable
@@ -286,7 +282,6 @@ public com.google.cloud.vision.v1.OutputConfigOrBuilder getOutputConfigOrBuilder
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -296,7 +291,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (inputConfig_ != null) {
@@ -314,7 +308,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -471,7 +464,6 @@ public static com.google.cloud.vision.v1.AsyncAnnotateFileRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -479,7 +471,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.AsyncAnnotateFileRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -507,7 +498,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncAnnotateFileRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncAnnotateFileRequest_fieldAccessorTable
@@ -531,7 +521,6 @@ private void maybeForceBuilderInitialization() {
         getFeaturesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (inputConfigBuilder_ == null) {
@@ -561,18 +550,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncAnnotateFileRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.AsyncAnnotateFileRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.AsyncAnnotateFileRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.AsyncAnnotateFileRequest build() {
       com.google.cloud.vision.v1.AsyncAnnotateFileRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -581,7 +567,6 @@ public com.google.cloud.vision.v1.AsyncAnnotateFileRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.AsyncAnnotateFileRequest buildPartial() {
       com.google.cloud.vision.v1.AsyncAnnotateFileRequest result = new com.google.cloud.vision.v1.AsyncAnnotateFileRequest(this);
       int from_bitField0_ = bitField0_;
@@ -615,39 +600,32 @@ public com.google.cloud.vision.v1.AsyncAnnotateFileRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.AsyncAnnotateFileRequest) {
         return mergeFrom((com.google.cloud.vision.v1.AsyncAnnotateFileRequest)other);
@@ -699,12 +677,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.AsyncAnnotateFileRequest oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1494,13 +1470,11 @@ public com.google.cloud.vision.v1.OutputConfigOrBuilder getOutputConfigOrBuilder
       }
       return outputConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1522,12 +1496,11 @@ public static com.google.cloud.vision.v1.AsyncAnnotateFileRequest getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AsyncAnnotateFileRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AsyncAnnotateFileRequest(input, extensionRegistry);
+        return new AsyncAnnotateFileRequest(input, extensionRegistry);
     }
   };
 
@@ -1540,7 +1513,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.AsyncAnnotateFileRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileResponse.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileResponse.java
index 29141c5c9426..2fc2b07e48f3 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncAnnotateFileResponse.java
@@ -32,9 +32,6 @@ private AsyncAnnotateFileResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private AsyncAnnotateFileResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1.OutputConfig.Builder subBuilder = null;
             if (outputConfig_ != null) {
@@ -59,13 +63,6 @@ private AsyncAnnotateFileResponse(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private AsyncAnnotateFileResponse(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncAnnotateFileResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncAnnotateFileResponse_fieldAccessorTable
@@ -125,7 +121,6 @@ public com.google.cloud.vision.v1.OutputConfigOrBuilder getOutputConfigOrBuilder
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -135,7 +130,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (outputConfig_ != null) {
@@ -144,7 +138,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static com.google.cloud.vision.v1.AsyncAnnotateFileResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.AsyncAnnotateFileResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncAnnotateFileResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncAnnotateFileResponse_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (outputConfigBuilder_ == null) {
@@ -336,18 +325,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncAnnotateFileResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.AsyncAnnotateFileResponse getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.AsyncAnnotateFileResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.AsyncAnnotateFileResponse build() {
       com.google.cloud.vision.v1.AsyncAnnotateFileResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -356,7 +342,6 @@ public com.google.cloud.vision.v1.AsyncAnnotateFileResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.AsyncAnnotateFileResponse buildPartial() {
       com.google.cloud.vision.v1.AsyncAnnotateFileResponse result = new com.google.cloud.vision.v1.AsyncAnnotateFileResponse(this);
       if (outputConfigBuilder_ == null) {
@@ -368,39 +353,32 @@ public com.google.cloud.vision.v1.AsyncAnnotateFileResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.AsyncAnnotateFileResponse) {
         return mergeFrom((com.google.cloud.vision.v1.AsyncAnnotateFileResponse)other);
@@ -420,12 +398,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.AsyncAnnotateFileResponse ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -596,13 +572,11 @@ public com.google.cloud.vision.v1.OutputConfigOrBuilder getOutputConfigOrBuilder
       }
       return outputConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -624,12 +598,11 @@ public static com.google.cloud.vision.v1.AsyncAnnotateFileResponse getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AsyncAnnotateFileResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AsyncAnnotateFileResponse(input, extensionRegistry);
+        return new AsyncAnnotateFileResponse(input, extensionRegistry);
     }
   };
 
@@ -642,7 +615,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.AsyncAnnotateFileResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesRequest.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesRequest.java
index 7d29fdbc2159..d4b0da2bec37 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesRequest.java
@@ -34,9 +34,6 @@ private AsyncBatchAnnotateFilesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private AsyncBatchAnnotateFilesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               requests_ = new java.util.ArrayList();
@@ -57,13 +61,6 @@ private AsyncBatchAnnotateFilesRequest(
                 input.readMessage(com.google.cloud.vision.v1.AsyncAnnotateFileRequest.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private AsyncBatchAnnotateFilesRequest(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncBatchAnnotateFilesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncBatchAnnotateFilesRequest_fieldAccessorTable
@@ -148,7 +144,6 @@ public com.google.cloud.vision.v1.AsyncAnnotateFileRequestOrBuilder getRequestsO
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -158,7 +153,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < requests_.size(); i++) {
@@ -167,7 +161,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -285,7 +278,6 @@ public static com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -293,7 +285,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -322,7 +313,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncBatchAnnotateFilesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncBatchAnnotateFilesRequest_fieldAccessorTable
@@ -346,7 +336,6 @@ private void maybeForceBuilderInitialization() {
         getRequestsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (requestsBuilder_ == null) {
@@ -358,18 +347,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncBatchAnnotateFilesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest build() {
       com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -378,7 +364,6 @@ public com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest buildPartial() {
       com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest result = new com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest(this);
       int from_bitField0_ = bitField0_;
@@ -395,39 +380,32 @@ public com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest) {
         return mergeFrom((com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest)other);
@@ -470,12 +448,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.AsyncBatchAnnotateFilesReque
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -806,13 +782,11 @@ public com.google.cloud.vision.v1.AsyncAnnotateFileRequest.Builder addRequestsBu
       }
       return requestsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -834,12 +808,11 @@ public static com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest getDefau
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AsyncBatchAnnotateFilesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AsyncBatchAnnotateFilesRequest(input, extensionRegistry);
+        return new AsyncBatchAnnotateFilesRequest(input, extensionRegistry);
     }
   };
 
@@ -852,7 +825,6 @@ public com.google.protobuf.Parser getParserForTy
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesResponse.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesResponse.java
index 91bb8e9320a1..496793d6fc0e 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/AsyncBatchAnnotateFilesResponse.java
@@ -33,9 +33,6 @@ private AsyncBatchAnnotateFilesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private AsyncBatchAnnotateFilesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               responses_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private AsyncBatchAnnotateFilesResponse(
                 input.readMessage(com.google.cloud.vision.v1.AsyncAnnotateFileResponse.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private AsyncBatchAnnotateFilesResponse(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncBatchAnnotateFilesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncBatchAnnotateFilesResponse_fieldAccessorTable
@@ -152,7 +148,6 @@ public com.google.cloud.vision.v1.AsyncAnnotateFileResponseOrBuilder getResponse
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -162,7 +157,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < responses_.size(); i++) {
@@ -171,7 +165,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -289,7 +282,6 @@ public static com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -297,7 +289,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -325,7 +316,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncBatchAnnotateFilesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncBatchAnnotateFilesResponse_fieldAccessorTable
@@ -349,7 +339,6 @@ private void maybeForceBuilderInitialization() {
         getResponsesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (responsesBuilder_ == null) {
@@ -361,18 +350,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_AsyncBatchAnnotateFilesResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse build() {
       com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -381,7 +367,6 @@ public com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse buildPartial() {
       com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse result = new com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -398,39 +383,32 @@ public com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse) {
         return mergeFrom((com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse)other);
@@ -473,12 +451,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.AsyncBatchAnnotateFilesRespo
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -827,13 +803,11 @@ public com.google.cloud.vision.v1.AsyncAnnotateFileResponse.Builder addResponses
       }
       return responsesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -855,12 +829,11 @@ public static com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse getDefa
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AsyncBatchAnnotateFilesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AsyncBatchAnnotateFilesResponse(input, extensionRegistry);
+        return new AsyncBatchAnnotateFilesResponse(input, extensionRegistry);
     }
   };
 
@@ -873,7 +846,6 @@ public com.google.protobuf.Parser getParserForT
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.AsyncBatchAnnotateFilesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BatchAnnotateImagesRequest.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BatchAnnotateImagesRequest.java
index 5a683238df56..871c8c8da84e 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BatchAnnotateImagesRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BatchAnnotateImagesRequest.java
@@ -33,9 +33,6 @@ private BatchAnnotateImagesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private BatchAnnotateImagesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               requests_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private BatchAnnotateImagesRequest(
                 input.readMessage(com.google.cloud.vision.v1.AnnotateImageRequest.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private BatchAnnotateImagesRequest(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_BatchAnnotateImagesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_BatchAnnotateImagesRequest_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.cloud.vision.v1.AnnotateImageRequestOrBuilder getRequestsOrBui
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < requests_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.vision.v1.BatchAnnotateImagesRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.BatchAnnotateImagesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_BatchAnnotateImagesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_BatchAnnotateImagesRequest_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getRequestsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (requestsBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_BatchAnnotateImagesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.BatchAnnotateImagesRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.BatchAnnotateImagesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.BatchAnnotateImagesRequest build() {
       com.google.cloud.vision.v1.BatchAnnotateImagesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.cloud.vision.v1.BatchAnnotateImagesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.BatchAnnotateImagesRequest buildPartial() {
       com.google.cloud.vision.v1.BatchAnnotateImagesRequest result = new com.google.cloud.vision.v1.BatchAnnotateImagesRequest(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.cloud.vision.v1.BatchAnnotateImagesRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.BatchAnnotateImagesRequest) {
         return mergeFrom((com.google.cloud.vision.v1.BatchAnnotateImagesRequest)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.BatchAnnotateImagesRequest o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.cloud.vision.v1.AnnotateImageRequest.Builder addRequestsBuilde
       }
       return requestsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.cloud.vision.v1.BatchAnnotateImagesRequest getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BatchAnnotateImagesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchAnnotateImagesRequest(input, extensionRegistry);
+        return new BatchAnnotateImagesRequest(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.BatchAnnotateImagesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BatchAnnotateImagesResponse.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BatchAnnotateImagesResponse.java
index 1275eb22b8ec..172e57c7102c 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BatchAnnotateImagesResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BatchAnnotateImagesResponse.java
@@ -33,9 +33,6 @@ private BatchAnnotateImagesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private BatchAnnotateImagesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               responses_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private BatchAnnotateImagesResponse(
                 input.readMessage(com.google.cloud.vision.v1.AnnotateImageResponse.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private BatchAnnotateImagesResponse(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_BatchAnnotateImagesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_BatchAnnotateImagesResponse_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.cloud.vision.v1.AnnotateImageResponseOrBuilder getResponsesOrB
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < responses_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.vision.v1.BatchAnnotateImagesResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.BatchAnnotateImagesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_BatchAnnotateImagesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_BatchAnnotateImagesResponse_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getResponsesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (responsesBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_BatchAnnotateImagesResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.BatchAnnotateImagesResponse getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.BatchAnnotateImagesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.BatchAnnotateImagesResponse build() {
       com.google.cloud.vision.v1.BatchAnnotateImagesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.cloud.vision.v1.BatchAnnotateImagesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.BatchAnnotateImagesResponse buildPartial() {
       com.google.cloud.vision.v1.BatchAnnotateImagesResponse result = new com.google.cloud.vision.v1.BatchAnnotateImagesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.cloud.vision.v1.BatchAnnotateImagesResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.BatchAnnotateImagesResponse) {
         return mergeFrom((com.google.cloud.vision.v1.BatchAnnotateImagesResponse)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.BatchAnnotateImagesResponse
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.cloud.vision.v1.AnnotateImageResponse.Builder addResponsesBuil
       }
       return responsesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.cloud.vision.v1.BatchAnnotateImagesResponse getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BatchAnnotateImagesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchAnnotateImagesResponse(input, extensionRegistry);
+        return new BatchAnnotateImagesResponse(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType(
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.BatchAnnotateImagesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Block.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Block.java
index 721cdaece601..f3d1719fd11d 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Block.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Block.java
@@ -35,9 +35,6 @@ private Block(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private Block(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1.TextAnnotation.TextProperty.Builder subBuilder = null;
             if (property_ != null) {
@@ -95,13 +99,6 @@ private Block(
             confidence_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -122,7 +119,6 @@ private Block(
     return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_Block_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_Block_fieldAccessorTable
@@ -500,7 +496,6 @@ public int getBlockTypeValue() {
    * .google.cloud.vision.v1.Block.BlockType block_type = 4;
    */
   public com.google.cloud.vision.v1.Block.BlockType getBlockType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1.Block.BlockType result = com.google.cloud.vision.v1.Block.BlockType.valueOf(blockType_);
     return result == null ? com.google.cloud.vision.v1.Block.BlockType.UNRECOGNIZED : result;
   }
@@ -519,7 +514,6 @@ public float getConfidence() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -529,7 +523,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (property_ != null) {
@@ -550,7 +543,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -712,7 +704,6 @@ public static com.google.cloud.vision.v1.Block parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -720,7 +711,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.Block prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -748,7 +738,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_Block_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_Block_fieldAccessorTable
@@ -772,7 +761,6 @@ private void maybeForceBuilderInitialization() {
         getParagraphsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (propertyBuilder_ == null) {
@@ -800,18 +788,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_Block_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.Block getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.Block.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.Block build() {
       com.google.cloud.vision.v1.Block result = buildPartial();
       if (!result.isInitialized()) {
@@ -820,7 +805,6 @@ public com.google.cloud.vision.v1.Block build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.Block buildPartial() {
       com.google.cloud.vision.v1.Block result = new com.google.cloud.vision.v1.Block(this);
       int from_bitField0_ = bitField0_;
@@ -851,39 +835,32 @@ public com.google.cloud.vision.v1.Block buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.Block) {
         return mergeFrom((com.google.cloud.vision.v1.Block)other);
@@ -938,12 +915,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.Block other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1738,7 +1713,6 @@ public Builder setBlockTypeValue(int value) {
      * .google.cloud.vision.v1.Block.BlockType block_type = 4;
      */
     public com.google.cloud.vision.v1.Block.BlockType getBlockType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1.Block.BlockType result = com.google.cloud.vision.v1.Block.BlockType.valueOf(blockType_);
       return result == null ? com.google.cloud.vision.v1.Block.BlockType.UNRECOGNIZED : result;
     }
@@ -1809,13 +1783,11 @@ public Builder clearConfidence() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1837,12 +1809,11 @@ public static com.google.cloud.vision.v1.Block getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Block parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Block(input, extensionRegistry);
+        return new Block(input, extensionRegistry);
     }
   };
 
@@ -1855,7 +1826,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.Block getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BoundingPoly.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BoundingPoly.java
index a608c204b03f..a7f639e698fe 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BoundingPoly.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/BoundingPoly.java
@@ -34,9 +34,6 @@ private BoundingPoly(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private BoundingPoly(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               vertices_ = new java.util.ArrayList();
@@ -66,13 +70,6 @@ private BoundingPoly(
                 input.readMessage(com.google.cloud.vision.v1.NormalizedVertex.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private BoundingPoly(
     return com.google.cloud.vision.v1.GeometryProto.internal_static_google_cloud_vision_v1_BoundingPoly_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.GeometryProto.internal_static_google_cloud_vision_v1_BoundingPoly_fieldAccessorTable
@@ -215,7 +211,6 @@ public com.google.cloud.vision.v1.NormalizedVertexOrBuilder getNormalizedVertice
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -225,7 +220,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < vertices_.size(); i++) {
@@ -237,7 +231,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -365,7 +358,6 @@ public static com.google.cloud.vision.v1.BoundingPoly parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -373,7 +365,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.BoundingPoly prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -401,7 +392,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.GeometryProto.internal_static_google_cloud_vision_v1_BoundingPoly_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.GeometryProto.internal_static_google_cloud_vision_v1_BoundingPoly_fieldAccessorTable
@@ -426,7 +416,6 @@ private void maybeForceBuilderInitialization() {
         getNormalizedVerticesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (verticesBuilder_ == null) {
@@ -444,18 +433,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.GeometryProto.internal_static_google_cloud_vision_v1_BoundingPoly_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.BoundingPoly getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.BoundingPoly.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.BoundingPoly build() {
       com.google.cloud.vision.v1.BoundingPoly result = buildPartial();
       if (!result.isInitialized()) {
@@ -464,7 +450,6 @@ public com.google.cloud.vision.v1.BoundingPoly build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.BoundingPoly buildPartial() {
       com.google.cloud.vision.v1.BoundingPoly result = new com.google.cloud.vision.v1.BoundingPoly(this);
       int from_bitField0_ = bitField0_;
@@ -490,39 +475,32 @@ public com.google.cloud.vision.v1.BoundingPoly buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.BoundingPoly) {
         return mergeFrom((com.google.cloud.vision.v1.BoundingPoly)other);
@@ -591,12 +569,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.BoundingPoly other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1239,13 +1215,11 @@ public com.google.cloud.vision.v1.NormalizedVertex.Builder addNormalizedVertices
       }
       return normalizedVerticesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1267,12 +1241,11 @@ public static com.google.cloud.vision.v1.BoundingPoly getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BoundingPoly parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BoundingPoly(input, extensionRegistry);
+        return new BoundingPoly(input, extensionRegistry);
     }
   };
 
@@ -1285,7 +1258,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.BoundingPoly getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ColorInfo.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ColorInfo.java
index 27e26c77c3ea..2997d72534be 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ColorInfo.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ColorInfo.java
@@ -35,9 +35,6 @@ private ColorInfo(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ColorInfo(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.type.Color.Builder subBuilder = null;
             if (color_ != null) {
@@ -72,13 +76,6 @@ private ColorInfo(
             pixelFraction_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private ColorInfo(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_ColorInfo_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_ColorInfo_fieldAccessorTable
@@ -165,7 +161,6 @@ public float getPixelFraction() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -175,7 +170,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (color_ != null) {
@@ -190,7 +184,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -333,7 +326,6 @@ public static com.google.cloud.vision.v1.ColorInfo parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -341,7 +333,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.ColorInfo prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -370,7 +361,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_ColorInfo_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_ColorInfo_fieldAccessorTable
@@ -393,7 +383,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (colorBuilder_ == null) {
@@ -409,18 +398,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_ColorInfo_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.ColorInfo getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.ColorInfo.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.ColorInfo build() {
       com.google.cloud.vision.v1.ColorInfo result = buildPartial();
       if (!result.isInitialized()) {
@@ -429,7 +415,6 @@ public com.google.cloud.vision.v1.ColorInfo build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.ColorInfo buildPartial() {
       com.google.cloud.vision.v1.ColorInfo result = new com.google.cloud.vision.v1.ColorInfo(this);
       if (colorBuilder_ == null) {
@@ -443,39 +428,32 @@ public com.google.cloud.vision.v1.ColorInfo buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.ColorInfo) {
         return mergeFrom((com.google.cloud.vision.v1.ColorInfo)other);
@@ -501,12 +479,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.ColorInfo other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -756,13 +732,11 @@ public Builder clearPixelFraction() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -784,12 +758,11 @@ public static com.google.cloud.vision.v1.ColorInfo getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ColorInfo parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ColorInfo(input, extensionRegistry);
+        return new ColorInfo(input, extensionRegistry);
     }
   };
 
@@ -802,7 +775,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.ColorInfo getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/CropHint.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/CropHint.java
index 58d967ab5462..6d27f44192c1 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/CropHint.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/CropHint.java
@@ -34,9 +34,6 @@ private CropHint(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private CropHint(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1.BoundingPoly.Builder subBuilder = null;
             if (boundingPoly_ != null) {
@@ -71,13 +75,6 @@ private CropHint(
             importanceFraction_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -95,7 +92,6 @@ private CropHint(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_CropHint_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_CropHint_fieldAccessorTable
@@ -167,7 +163,6 @@ public float getImportanceFraction() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -177,7 +172,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (boundingPoly_ != null) {
@@ -192,7 +186,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -335,7 +328,6 @@ public static com.google.cloud.vision.v1.CropHint parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -343,7 +335,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.CropHint prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -371,7 +362,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_CropHint_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_CropHint_fieldAccessorTable
@@ -394,7 +384,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (boundingPolyBuilder_ == null) {
@@ -410,18 +399,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_CropHint_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.CropHint getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.CropHint.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.CropHint build() {
       com.google.cloud.vision.v1.CropHint result = buildPartial();
       if (!result.isInitialized()) {
@@ -430,7 +416,6 @@ public com.google.cloud.vision.v1.CropHint build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.CropHint buildPartial() {
       com.google.cloud.vision.v1.CropHint result = new com.google.cloud.vision.v1.CropHint(this);
       if (boundingPolyBuilder_ == null) {
@@ -444,39 +429,32 @@ public com.google.cloud.vision.v1.CropHint buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.CropHint) {
         return mergeFrom((com.google.cloud.vision.v1.CropHint)other);
@@ -502,12 +480,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.CropHint other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -766,13 +742,11 @@ public Builder clearImportanceFraction() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -794,12 +768,11 @@ public static com.google.cloud.vision.v1.CropHint getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CropHint parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CropHint(input, extensionRegistry);
+        return new CropHint(input, extensionRegistry);
     }
   };
 
@@ -812,7 +785,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.CropHint getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/CropHintsAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/CropHintsAnnotation.java
index a35db485d9c6..fb443ec7f357 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/CropHintsAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/CropHintsAnnotation.java
@@ -33,9 +33,6 @@ private CropHintsAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private CropHintsAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               cropHints_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private CropHintsAnnotation(
                 input.readMessage(com.google.cloud.vision.v1.CropHint.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private CropHintsAnnotation(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_CropHintsAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_CropHintsAnnotation_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.cloud.vision.v1.CropHintOrBuilder getCropHintsOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < cropHints_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.vision.v1.CropHintsAnnotation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.CropHintsAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_CropHintsAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_CropHintsAnnotation_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getCropHintsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (cropHintsBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_CropHintsAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.CropHintsAnnotation getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.CropHintsAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.CropHintsAnnotation build() {
       com.google.cloud.vision.v1.CropHintsAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.cloud.vision.v1.CropHintsAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.CropHintsAnnotation buildPartial() {
       com.google.cloud.vision.v1.CropHintsAnnotation result = new com.google.cloud.vision.v1.CropHintsAnnotation(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.cloud.vision.v1.CropHintsAnnotation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.CropHintsAnnotation) {
         return mergeFrom((com.google.cloud.vision.v1.CropHintsAnnotation)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.CropHintsAnnotation other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.cloud.vision.v1.CropHint.Builder addCropHintsBuilder(
       }
       return cropHintsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.cloud.vision.v1.CropHintsAnnotation getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CropHintsAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CropHintsAnnotation(input, extensionRegistry);
+        return new CropHintsAnnotation(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.CropHintsAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/CropHintsParams.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/CropHintsParams.java
index 2227f4b68002..44c2569fb62e 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/CropHintsParams.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/CropHintsParams.java
@@ -33,9 +33,6 @@ private CropHintsParams(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private CropHintsParams(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 13: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               aspectRatios_ = new java.util.ArrayList();
@@ -68,13 +72,6 @@ private CropHintsParams(
             input.popLimit(limit);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -95,7 +92,6 @@ private CropHintsParams(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_CropHintsParams_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_CropHintsParams_fieldAccessorTable
@@ -154,7 +150,6 @@ public float getAspectRatios(int index) {
   private int aspectRatiosMemoizedSerializedSize = -1;
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -164,7 +159,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     getSerializedSize();
@@ -178,7 +172,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -303,7 +296,6 @@ public static com.google.cloud.vision.v1.CropHintsParams parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -311,7 +303,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.CropHintsParams prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -339,7 +330,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_CropHintsParams_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_CropHintsParams_fieldAccessorTable
@@ -362,7 +352,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       aspectRatios_ = java.util.Collections.emptyList();
@@ -370,18 +359,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_CropHintsParams_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.CropHintsParams getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.CropHintsParams.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.CropHintsParams build() {
       com.google.cloud.vision.v1.CropHintsParams result = buildPartial();
       if (!result.isInitialized()) {
@@ -390,7 +376,6 @@ public com.google.cloud.vision.v1.CropHintsParams build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.CropHintsParams buildPartial() {
       com.google.cloud.vision.v1.CropHintsParams result = new com.google.cloud.vision.v1.CropHintsParams(this);
       int from_bitField0_ = bitField0_;
@@ -403,39 +388,32 @@ public com.google.cloud.vision.v1.CropHintsParams buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.CropHintsParams) {
         return mergeFrom((com.google.cloud.vision.v1.CropHintsParams)other);
@@ -462,12 +440,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.CropHintsParams other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -615,13 +591,11 @@ public Builder clearAspectRatios() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -643,12 +617,11 @@ public static com.google.cloud.vision.v1.CropHintsParams getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CropHintsParams parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CropHintsParams(input, extensionRegistry);
+        return new CropHintsParams(input, extensionRegistry);
     }
   };
 
@@ -661,7 +634,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.CropHintsParams getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/DominantColorsAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/DominantColorsAnnotation.java
index 7a562febbed9..c5e970506b7f 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/DominantColorsAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/DominantColorsAnnotation.java
@@ -33,9 +33,6 @@ private DominantColorsAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private DominantColorsAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               colors_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private DominantColorsAnnotation(
                 input.readMessage(com.google.cloud.vision.v1.ColorInfo.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private DominantColorsAnnotation(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_DominantColorsAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_DominantColorsAnnotation_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.cloud.vision.v1.ColorInfoOrBuilder getColorsOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < colors_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.vision.v1.DominantColorsAnnotation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.DominantColorsAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_DominantColorsAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_DominantColorsAnnotation_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getColorsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (colorsBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_DominantColorsAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.DominantColorsAnnotation getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.DominantColorsAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.DominantColorsAnnotation build() {
       com.google.cloud.vision.v1.DominantColorsAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.cloud.vision.v1.DominantColorsAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.DominantColorsAnnotation buildPartial() {
       com.google.cloud.vision.v1.DominantColorsAnnotation result = new com.google.cloud.vision.v1.DominantColorsAnnotation(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.cloud.vision.v1.DominantColorsAnnotation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.DominantColorsAnnotation) {
         return mergeFrom((com.google.cloud.vision.v1.DominantColorsAnnotation)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.DominantColorsAnnotation oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.cloud.vision.v1.ColorInfo.Builder addColorsBuilder(
       }
       return colorsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.cloud.vision.v1.DominantColorsAnnotation getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DominantColorsAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DominantColorsAnnotation(input, extensionRegistry);
+        return new DominantColorsAnnotation(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.DominantColorsAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/EntityAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/EntityAnnotation.java
index 818dc72a602f..3a1dc2b903ab 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/EntityAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/EntityAnnotation.java
@@ -40,9 +40,6 @@ private EntityAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -54,6 +51,13 @@ private EntityAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -118,13 +122,6 @@ private EntityAnnotation(
                 input.readMessage(com.google.cloud.vision.v1.Property.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -148,7 +145,6 @@ private EntityAnnotation(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_EntityAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_EntityAnnotation_fieldAccessorTable
@@ -508,7 +504,6 @@ public com.google.cloud.vision.v1.PropertyOrBuilder getPropertiesOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -518,7 +513,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getMidBytes().isEmpty()) {
@@ -551,7 +545,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -746,7 +739,6 @@ public static com.google.cloud.vision.v1.EntityAnnotation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -754,7 +746,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.EntityAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -782,7 +773,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_EntityAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_EntityAnnotation_fieldAccessorTable
@@ -807,7 +797,6 @@ private void maybeForceBuilderInitialization() {
         getPropertiesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       mid_ = "";
@@ -843,18 +832,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_EntityAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.EntityAnnotation getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.EntityAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.EntityAnnotation build() {
       com.google.cloud.vision.v1.EntityAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -863,7 +849,6 @@ public com.google.cloud.vision.v1.EntityAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.EntityAnnotation buildPartial() {
       com.google.cloud.vision.v1.EntityAnnotation result = new com.google.cloud.vision.v1.EntityAnnotation(this);
       int from_bitField0_ = bitField0_;
@@ -902,39 +887,32 @@ public com.google.cloud.vision.v1.EntityAnnotation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.EntityAnnotation) {
         return mergeFrom((com.google.cloud.vision.v1.EntityAnnotation)other);
@@ -1027,12 +1005,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.EntityAnnotation other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2347,13 +2323,11 @@ public com.google.cloud.vision.v1.Property.Builder addPropertiesBuilder(
       }
       return propertiesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2375,12 +2349,11 @@ public static com.google.cloud.vision.v1.EntityAnnotation getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public EntityAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new EntityAnnotation(input, extensionRegistry);
+        return new EntityAnnotation(input, extensionRegistry);
     }
   };
 
@@ -2393,7 +2366,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.EntityAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/FaceAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/FaceAnnotation.java
index a6abb0b751ab..b19e995070c1 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/FaceAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/FaceAnnotation.java
@@ -45,9 +45,6 @@ private FaceAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -59,6 +56,13 @@ private FaceAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1.BoundingPoly.Builder subBuilder = null;
             if (boundingPoly_ != null) {
@@ -161,13 +165,6 @@ private FaceAnnotation(
             headwearLikelihood_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -188,7 +185,6 @@ private FaceAnnotation(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_FaceAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_FaceAnnotation_fieldAccessorTable
@@ -272,9 +268,6 @@ private Landmark(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -286,6 +279,13 @@ private Landmark(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 24: {
               int rawValue = input.readEnum();
 
@@ -305,13 +305,6 @@ private Landmark(
 
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -329,7 +322,6 @@ private Landmark(
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_FaceAnnotation_Landmark_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_FaceAnnotation_Landmark_fieldAccessorTable
@@ -1039,7 +1031,6 @@ public int getTypeValue() {
      * .google.cloud.vision.v1.FaceAnnotation.Landmark.Type type = 3;
      */
     public com.google.cloud.vision.v1.FaceAnnotation.Landmark.Type getType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1.FaceAnnotation.Landmark.Type result = com.google.cloud.vision.v1.FaceAnnotation.Landmark.Type.valueOf(type_);
       return result == null ? com.google.cloud.vision.v1.FaceAnnotation.Landmark.Type.UNRECOGNIZED : result;
     }
@@ -1078,7 +1069,6 @@ public com.google.cloud.vision.v1.PositionOrBuilder getPositionOrBuilder() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1088,7 +1078,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (type_ != com.google.cloud.vision.v1.FaceAnnotation.Landmark.Type.UNKNOWN_LANDMARK.getNumber()) {
@@ -1100,7 +1089,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -1228,7 +1216,6 @@ public static com.google.cloud.vision.v1.FaceAnnotation.Landmark parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -1236,7 +1223,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1.FaceAnnotation.Landmark prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -1264,7 +1250,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_FaceAnnotation_Landmark_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_FaceAnnotation_Landmark_fieldAccessorTable
@@ -1287,7 +1272,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         type_ = 0;
@@ -1301,18 +1285,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_FaceAnnotation_Landmark_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1.FaceAnnotation.Landmark getDefaultInstanceForType() {
         return com.google.cloud.vision.v1.FaceAnnotation.Landmark.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1.FaceAnnotation.Landmark build() {
         com.google.cloud.vision.v1.FaceAnnotation.Landmark result = buildPartial();
         if (!result.isInitialized()) {
@@ -1321,7 +1302,6 @@ public com.google.cloud.vision.v1.FaceAnnotation.Landmark build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1.FaceAnnotation.Landmark buildPartial() {
         com.google.cloud.vision.v1.FaceAnnotation.Landmark result = new com.google.cloud.vision.v1.FaceAnnotation.Landmark(this);
         result.type_ = type_;
@@ -1334,39 +1314,32 @@ public com.google.cloud.vision.v1.FaceAnnotation.Landmark buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1.FaceAnnotation.Landmark) {
           return mergeFrom((com.google.cloud.vision.v1.FaceAnnotation.Landmark)other);
@@ -1389,12 +1362,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.FaceAnnotation.Landmark othe
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1444,7 +1415,6 @@ public Builder setTypeValue(int value) {
        * .google.cloud.vision.v1.FaceAnnotation.Landmark.Type type = 3;
        */
       public com.google.cloud.vision.v1.FaceAnnotation.Landmark.Type getType() {
-        @SuppressWarnings("deprecation")
         com.google.cloud.vision.v1.FaceAnnotation.Landmark.Type result = com.google.cloud.vision.v1.FaceAnnotation.Landmark.Type.valueOf(type_);
         return result == null ? com.google.cloud.vision.v1.FaceAnnotation.Landmark.Type.UNRECOGNIZED : result;
       }
@@ -1630,13 +1600,11 @@ public com.google.cloud.vision.v1.PositionOrBuilder getPositionOrBuilder() {
         }
         return positionBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1658,12 +1626,11 @@ public static com.google.cloud.vision.v1.FaceAnnotation.Landmark getDefaultInsta
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Landmark parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Landmark(input, extensionRegistry);
+          return new Landmark(input, extensionRegistry);
       }
     };
 
@@ -1676,7 +1643,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.FaceAnnotation.Landmark getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1928,7 +1894,6 @@ public int getJoyLikelihoodValue() {
    * .google.cloud.vision.v1.Likelihood joy_likelihood = 9;
    */
   public com.google.cloud.vision.v1.Likelihood getJoyLikelihood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1.Likelihood result = com.google.cloud.vision.v1.Likelihood.valueOf(joyLikelihood_);
     return result == null ? com.google.cloud.vision.v1.Likelihood.UNRECOGNIZED : result;
   }
@@ -1953,7 +1918,6 @@ public int getSorrowLikelihoodValue() {
    * .google.cloud.vision.v1.Likelihood sorrow_likelihood = 10;
    */
   public com.google.cloud.vision.v1.Likelihood getSorrowLikelihood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1.Likelihood result = com.google.cloud.vision.v1.Likelihood.valueOf(sorrowLikelihood_);
     return result == null ? com.google.cloud.vision.v1.Likelihood.UNRECOGNIZED : result;
   }
@@ -1978,7 +1942,6 @@ public int getAngerLikelihoodValue() {
    * .google.cloud.vision.v1.Likelihood anger_likelihood = 11;
    */
   public com.google.cloud.vision.v1.Likelihood getAngerLikelihood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1.Likelihood result = com.google.cloud.vision.v1.Likelihood.valueOf(angerLikelihood_);
     return result == null ? com.google.cloud.vision.v1.Likelihood.UNRECOGNIZED : result;
   }
@@ -2003,7 +1966,6 @@ public int getSurpriseLikelihoodValue() {
    * .google.cloud.vision.v1.Likelihood surprise_likelihood = 12;
    */
   public com.google.cloud.vision.v1.Likelihood getSurpriseLikelihood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1.Likelihood result = com.google.cloud.vision.v1.Likelihood.valueOf(surpriseLikelihood_);
     return result == null ? com.google.cloud.vision.v1.Likelihood.UNRECOGNIZED : result;
   }
@@ -2028,7 +1990,6 @@ public int getUnderExposedLikelihoodValue() {
    * .google.cloud.vision.v1.Likelihood under_exposed_likelihood = 13;
    */
   public com.google.cloud.vision.v1.Likelihood getUnderExposedLikelihood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1.Likelihood result = com.google.cloud.vision.v1.Likelihood.valueOf(underExposedLikelihood_);
     return result == null ? com.google.cloud.vision.v1.Likelihood.UNRECOGNIZED : result;
   }
@@ -2053,7 +2014,6 @@ public int getBlurredLikelihoodValue() {
    * .google.cloud.vision.v1.Likelihood blurred_likelihood = 14;
    */
   public com.google.cloud.vision.v1.Likelihood getBlurredLikelihood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1.Likelihood result = com.google.cloud.vision.v1.Likelihood.valueOf(blurredLikelihood_);
     return result == null ? com.google.cloud.vision.v1.Likelihood.UNRECOGNIZED : result;
   }
@@ -2078,13 +2038,11 @@ public int getHeadwearLikelihoodValue() {
    * .google.cloud.vision.v1.Likelihood headwear_likelihood = 15;
    */
   public com.google.cloud.vision.v1.Likelihood getHeadwearLikelihood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1.Likelihood result = com.google.cloud.vision.v1.Likelihood.valueOf(headwearLikelihood_);
     return result == null ? com.google.cloud.vision.v1.Likelihood.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -2094,7 +2052,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (boundingPoly_ != null) {
@@ -2145,7 +2102,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -2393,7 +2349,6 @@ public static com.google.cloud.vision.v1.FaceAnnotation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -2401,7 +2356,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.FaceAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -2429,7 +2383,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_FaceAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_FaceAnnotation_fieldAccessorTable
@@ -2453,7 +2406,6 @@ private void maybeForceBuilderInitialization() {
         getLandmarksFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (boundingPolyBuilder_ == null) {
@@ -2501,18 +2453,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_FaceAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.FaceAnnotation getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.FaceAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.FaceAnnotation build() {
       com.google.cloud.vision.v1.FaceAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -2521,7 +2470,6 @@ public com.google.cloud.vision.v1.FaceAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.FaceAnnotation buildPartial() {
       com.google.cloud.vision.v1.FaceAnnotation result = new com.google.cloud.vision.v1.FaceAnnotation(this);
       int from_bitField0_ = bitField0_;
@@ -2562,39 +2510,32 @@ public com.google.cloud.vision.v1.FaceAnnotation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.FaceAnnotation) {
         return mergeFrom((com.google.cloud.vision.v1.FaceAnnotation)other);
@@ -2679,12 +2620,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.FaceAnnotation other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3657,7 +3596,6 @@ public Builder setJoyLikelihoodValue(int value) {
      * .google.cloud.vision.v1.Likelihood joy_likelihood = 9;
      */
     public com.google.cloud.vision.v1.Likelihood getJoyLikelihood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1.Likelihood result = com.google.cloud.vision.v1.Likelihood.valueOf(joyLikelihood_);
       return result == null ? com.google.cloud.vision.v1.Likelihood.UNRECOGNIZED : result;
     }
@@ -3722,7 +3660,6 @@ public Builder setSorrowLikelihoodValue(int value) {
      * .google.cloud.vision.v1.Likelihood sorrow_likelihood = 10;
      */
     public com.google.cloud.vision.v1.Likelihood getSorrowLikelihood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1.Likelihood result = com.google.cloud.vision.v1.Likelihood.valueOf(sorrowLikelihood_);
       return result == null ? com.google.cloud.vision.v1.Likelihood.UNRECOGNIZED : result;
     }
@@ -3787,7 +3724,6 @@ public Builder setAngerLikelihoodValue(int value) {
      * .google.cloud.vision.v1.Likelihood anger_likelihood = 11;
      */
     public com.google.cloud.vision.v1.Likelihood getAngerLikelihood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1.Likelihood result = com.google.cloud.vision.v1.Likelihood.valueOf(angerLikelihood_);
       return result == null ? com.google.cloud.vision.v1.Likelihood.UNRECOGNIZED : result;
     }
@@ -3852,7 +3788,6 @@ public Builder setSurpriseLikelihoodValue(int value) {
      * .google.cloud.vision.v1.Likelihood surprise_likelihood = 12;
      */
     public com.google.cloud.vision.v1.Likelihood getSurpriseLikelihood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1.Likelihood result = com.google.cloud.vision.v1.Likelihood.valueOf(surpriseLikelihood_);
       return result == null ? com.google.cloud.vision.v1.Likelihood.UNRECOGNIZED : result;
     }
@@ -3917,7 +3852,6 @@ public Builder setUnderExposedLikelihoodValue(int value) {
      * .google.cloud.vision.v1.Likelihood under_exposed_likelihood = 13;
      */
     public com.google.cloud.vision.v1.Likelihood getUnderExposedLikelihood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1.Likelihood result = com.google.cloud.vision.v1.Likelihood.valueOf(underExposedLikelihood_);
       return result == null ? com.google.cloud.vision.v1.Likelihood.UNRECOGNIZED : result;
     }
@@ -3982,7 +3916,6 @@ public Builder setBlurredLikelihoodValue(int value) {
      * .google.cloud.vision.v1.Likelihood blurred_likelihood = 14;
      */
     public com.google.cloud.vision.v1.Likelihood getBlurredLikelihood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1.Likelihood result = com.google.cloud.vision.v1.Likelihood.valueOf(blurredLikelihood_);
       return result == null ? com.google.cloud.vision.v1.Likelihood.UNRECOGNIZED : result;
     }
@@ -4047,7 +3980,6 @@ public Builder setHeadwearLikelihoodValue(int value) {
      * .google.cloud.vision.v1.Likelihood headwear_likelihood = 15;
      */
     public com.google.cloud.vision.v1.Likelihood getHeadwearLikelihood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1.Likelihood result = com.google.cloud.vision.v1.Likelihood.valueOf(headwearLikelihood_);
       return result == null ? com.google.cloud.vision.v1.Likelihood.UNRECOGNIZED : result;
     }
@@ -4080,13 +4012,11 @@ public Builder clearHeadwearLikelihood() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -4108,12 +4038,11 @@ public static com.google.cloud.vision.v1.FaceAnnotation getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public FaceAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FaceAnnotation(input, extensionRegistry);
+        return new FaceAnnotation(input, extensionRegistry);
     }
   };
 
@@ -4126,7 +4055,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.FaceAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Feature.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Feature.java
index 89e0578825fe..afd217d00d12 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Feature.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Feature.java
@@ -37,9 +37,6 @@ private Feature(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private Feature(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -68,13 +72,6 @@ private Feature(
             model_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -92,7 +89,6 @@ private Feature(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_Feature_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_Feature_fieldAccessorTable
@@ -418,7 +414,6 @@ public int getTypeValue() {
    * .google.cloud.vision.v1.Feature.Type type = 1;
    */
   public com.google.cloud.vision.v1.Feature.Type getType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1.Feature.Type result = com.google.cloud.vision.v1.Feature.Type.valueOf(type_);
     return result == null ? com.google.cloud.vision.v1.Feature.Type.UNRECOGNIZED : result;
   }
@@ -484,7 +479,6 @@ public java.lang.String getModel() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -494,7 +488,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (type_ != com.google.cloud.vision.v1.Feature.Type.TYPE_UNSPECIFIED.getNumber()) {
@@ -509,7 +502,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -639,7 +631,6 @@ public static com.google.cloud.vision.v1.Feature parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -647,7 +638,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.Feature prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -677,7 +667,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_Feature_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_Feature_fieldAccessorTable
@@ -700,7 +689,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       type_ = 0;
@@ -712,18 +700,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_Feature_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.Feature getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.Feature.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.Feature build() {
       com.google.cloud.vision.v1.Feature result = buildPartial();
       if (!result.isInitialized()) {
@@ -732,7 +717,6 @@ public com.google.cloud.vision.v1.Feature build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.Feature buildPartial() {
       com.google.cloud.vision.v1.Feature result = new com.google.cloud.vision.v1.Feature(this);
       result.type_ = type_;
@@ -742,39 +726,32 @@ public com.google.cloud.vision.v1.Feature buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.Feature) {
         return mergeFrom((com.google.cloud.vision.v1.Feature)other);
@@ -801,12 +778,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.Feature other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -856,7 +831,6 @@ public Builder setTypeValue(int value) {
      * .google.cloud.vision.v1.Feature.Type type = 1;
      */
     public com.google.cloud.vision.v1.Feature.Type getType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1.Feature.Type result = com.google.cloud.vision.v1.Feature.Type.valueOf(type_);
       return result == null ? com.google.cloud.vision.v1.Feature.Type.UNRECOGNIZED : result;
     }
@@ -1029,13 +1003,11 @@ public Builder setModelBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1057,12 +1029,11 @@ public static com.google.cloud.vision.v1.Feature getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Feature parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Feature(input, extensionRegistry);
+        return new Feature(input, extensionRegistry);
     }
   };
 
@@ -1075,7 +1046,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.Feature getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsDestination.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsDestination.java
index c240d95bcfdc..92edcdad4409 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsDestination.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsDestination.java
@@ -33,9 +33,6 @@ private GcsDestination(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GcsDestination(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            uri_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GcsDestination(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            uri_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GcsDestination(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_GcsDestination_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_GcsDestination_fieldAccessorTable
@@ -150,7 +146,6 @@ public java.lang.String getUri() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -160,7 +155,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getUriBytes().isEmpty()) {
@@ -169,7 +163,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.vision.v1.GcsDestination parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.GcsDestination prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_GcsDestination_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_GcsDestination_fieldAccessorTable
@@ -343,7 +333,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       uri_ = "";
@@ -351,18 +340,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_GcsDestination_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.GcsDestination getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.GcsDestination.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.GcsDestination build() {
       com.google.cloud.vision.v1.GcsDestination result = buildPartial();
       if (!result.isInitialized()) {
@@ -371,7 +357,6 @@ public com.google.cloud.vision.v1.GcsDestination build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.GcsDestination buildPartial() {
       com.google.cloud.vision.v1.GcsDestination result = new com.google.cloud.vision.v1.GcsDestination(this);
       result.uri_ = uri_;
@@ -379,39 +364,32 @@ public com.google.cloud.vision.v1.GcsDestination buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.GcsDestination) {
         return mergeFrom((com.google.cloud.vision.v1.GcsDestination)other);
@@ -432,12 +410,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.GcsDestination other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -599,13 +575,11 @@ public Builder setUriBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -627,12 +601,11 @@ public static com.google.cloud.vision.v1.GcsDestination getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GcsDestination parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GcsDestination(input, extensionRegistry);
+        return new GcsDestination(input, extensionRegistry);
     }
   };
 
@@ -645,7 +618,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.GcsDestination getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsSource.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsSource.java
index bd6d682f4fe9..594e497fd726 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsSource.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GcsSource.java
@@ -33,9 +33,6 @@ private GcsSource(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GcsSource(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            uri_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GcsSource(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            uri_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GcsSource(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_GcsSource_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_GcsSource_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getUri() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getUriBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.cloud.vision.v1.GcsSource parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.GcsSource prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_GcsSource_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_GcsSource_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       uri_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_GcsSource_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.GcsSource getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.GcsSource.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.GcsSource build() {
       com.google.cloud.vision.v1.GcsSource result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.cloud.vision.v1.GcsSource build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.GcsSource buildPartial() {
       com.google.cloud.vision.v1.GcsSource result = new com.google.cloud.vision.v1.GcsSource(this);
       result.uri_ = uri_;
@@ -359,39 +344,32 @@ public com.google.cloud.vision.v1.GcsSource buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.GcsSource) {
         return mergeFrom((com.google.cloud.vision.v1.GcsSource)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.GcsSource other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setUriBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.cloud.vision.v1.GcsSource getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GcsSource parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GcsSource(input, extensionRegistry);
+        return new GcsSource(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.GcsSource getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GeometryProto.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GeometryProto.java
index d6140a2dec70..6a58402d0c99 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GeometryProto.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/GeometryProto.java
@@ -52,7 +52,7 @@ public static void registerAllExtensions(
       "le.cloud.vision.v1.NormalizedVertex\"+\n\010P" +
       "osition\022\t\n\001x\030\001 \001(\002\022\t\n\001y\030\002 \001(\002\022\t\n\001z\030\003 \001(\002" +
       "Bu\n\032com.google.cloud.vision.v1B\rGeometry" +
-      "ProtoP\001Z
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Image parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Image(input, extensionRegistry);
+        return new Image(input, extensionRegistry);
     }
   };
 
@@ -751,7 +724,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.Image getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageAnnotationContext.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageAnnotationContext.java
index c35f3004dba0..631466d3a0f0 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageAnnotationContext.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageAnnotationContext.java
@@ -35,9 +35,6 @@ private ImageAnnotationContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ImageAnnotationContext(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private ImageAnnotationContext(
             pageNumber_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private ImageAnnotationContext(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_ImageAnnotationContext_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_ImageAnnotationContext_fieldAccessorTable
@@ -149,7 +145,6 @@ public int getPageNumber() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -159,7 +154,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getUriBytes().isEmpty()) {
@@ -171,7 +165,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -294,7 +287,6 @@ public static com.google.cloud.vision.v1.ImageAnnotationContext parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -302,7 +294,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.ImageAnnotationContext prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -331,7 +322,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_ImageAnnotationContext_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_ImageAnnotationContext_fieldAccessorTable
@@ -354,7 +344,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       uri_ = "";
@@ -364,18 +353,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_ImageAnnotationContext_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.ImageAnnotationContext getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.ImageAnnotationContext.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.ImageAnnotationContext build() {
       com.google.cloud.vision.v1.ImageAnnotationContext result = buildPartial();
       if (!result.isInitialized()) {
@@ -384,7 +370,6 @@ public com.google.cloud.vision.v1.ImageAnnotationContext build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.ImageAnnotationContext buildPartial() {
       com.google.cloud.vision.v1.ImageAnnotationContext result = new com.google.cloud.vision.v1.ImageAnnotationContext(this);
       result.uri_ = uri_;
@@ -393,39 +378,32 @@ public com.google.cloud.vision.v1.ImageAnnotationContext buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.ImageAnnotationContext) {
         return mergeFrom((com.google.cloud.vision.v1.ImageAnnotationContext)other);
@@ -449,12 +427,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.ImageAnnotationContext other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -602,13 +578,11 @@ public Builder clearPageNumber() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -630,12 +604,11 @@ public static com.google.cloud.vision.v1.ImageAnnotationContext getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ImageAnnotationContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImageAnnotationContext(input, extensionRegistry);
+        return new ImageAnnotationContext(input, extensionRegistry);
     }
   };
 
@@ -648,7 +621,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.ImageAnnotationContext getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorProto.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorProto.java
index d8905e5d75c2..38d9a2c1d135 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorProto.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageAnnotatorProto.java
@@ -202,7 +202,7 @@ public static void registerAllExtensions(
       "ngrunning/operations.proto\032\037google/proto" +
       "buf/timestamp.proto\032\027google/rpc/status.p" +
       "roto\032\027google/type/color.proto\032\030google/ty" +
-      "pe/latlng.proto\"\363\002\n\007Feature\0222\n\004type\030\001 \001(" +
+      "pe/latlng.proto\"\363\002\n\007Feature\0222\n\004type\030\001 \001(",
       "\0162$.google.cloud.vision.v1.Feature.Type\022" +
       "\023\n\013max_results\030\002 \001(\005\022\r\n\005model\030\003 \001(\t\"\217\002\n\004" +
       "Type\022\024\n\020TYPE_UNSPECIFIED\020\000\022\022\n\016FACE_DETEC" +
@@ -212,7 +212,7 @@ public static void registerAllExtensions(
       "\022\031\n\025SAFE_SEARCH_DETECTION\020\006\022\024\n\020IMAGE_PRO" +
       "PERTIES\020\007\022\016\n\nCROP_HINTS\020\t\022\021\n\rWEB_DETECTI" +
       "ON\020\n\022\027\n\023OBJECT_LOCALIZATION\020\023\"7\n\013ImageSo" +
-      "urce\022\025\n\rgcs_image_uri\030\001 \001(\t\022\021\n\timage_uri" +
+      "urce\022\025\n\rgcs_image_uri\030\001 \001(\t\022\021\n\timage_uri",
       "\030\002 \001(\t\"M\n\005Image\022\017\n\007content\030\001 \001(\014\0223\n\006sour" +
       "ce\030\002 \001(\0132#.google.cloud.vision.v1.ImageS" +
       "ource\"\307\r\n\016FaceAnnotation\022;\n\rbounding_pol" +
@@ -222,7 +222,7 @@ public static void registerAllExtensions(
       "ks\030\003 \003(\0132/.google.cloud.vision.v1.FaceAn" +
       "notation.Landmark\022\022\n\nroll_angle\030\004 \001(\002\022\021\n" +
       "\tpan_angle\030\005 \001(\002\022\022\n\ntilt_angle\030\006 \001(\002\022\034\n\024" +
-      "detection_confidence\030\007 \001(\002\022\036\n\026landmarkin" +
+      "detection_confidence\030\007 \001(\002\022\036\n\026landmarkin",
       "g_confidence\030\010 \001(\002\022:\n\016joy_likelihood\030\t \001" +
       "(\0162\".google.cloud.vision.v1.Likelihood\022=" +
       "\n\021sorrow_likelihood\030\n \001(\0162\".google.cloud" +
@@ -232,7 +232,7 @@ public static void registerAllExtensions(
       "e.cloud.vision.v1.Likelihood\022D\n\030under_ex" +
       "posed_likelihood\030\r \001(\0162\".google.cloud.vi" +
       "sion.v1.Likelihood\022>\n\022blurred_likelihood" +
-      "\030\016 \001(\0162\".google.cloud.vision.v1.Likeliho" +
+      "\030\016 \001(\0162\".google.cloud.vision.v1.Likeliho",
       "od\022?\n\023headwear_likelihood\030\017 \001(\0162\".google" +
       ".cloud.vision.v1.Likelihood\032\271\007\n\010Landmark" +
       "\022B\n\004type\030\003 \001(\01624.google.cloud.vision.v1." +
@@ -242,7 +242,7 @@ public static void registerAllExtensions(
       "EYE\020\001\022\r\n\tRIGHT_EYE\020\002\022\030\n\024LEFT_OF_LEFT_EYE" +
       "BROW\020\003\022\031\n\025RIGHT_OF_LEFT_EYEBROW\020\004\022\031\n\025LEF" +
       "T_OF_RIGHT_EYEBROW\020\005\022\032\n\026RIGHT_OF_RIGHT_E" +
-      "YEBROW\020\006\022\031\n\025MIDPOINT_BETWEEN_EYES\020\007\022\014\n\010N" +
+      "YEBROW\020\006\022\031\n\025MIDPOINT_BETWEEN_EYES\020\007\022\014\n\010N",
       "OSE_TIP\020\010\022\r\n\tUPPER_LIP\020\t\022\r\n\tLOWER_LIP\020\n\022" +
       "\016\n\nMOUTH_LEFT\020\013\022\017\n\013MOUTH_RIGHT\020\014\022\020\n\014MOUT" +
       "H_CENTER\020\r\022\025\n\021NOSE_BOTTOM_RIGHT\020\016\022\024\n\020NOS" +
@@ -252,7 +252,7 @@ public static void registerAllExtensions(
       "Y\020\023\022\030\n\024LEFT_EYE_LEFT_CORNER\020\024\022\032\n\026RIGHT_E" +
       "YE_TOP_BOUNDARY\020\025\022\032\n\026RIGHT_EYE_RIGHT_COR" +
       "NER\020\026\022\035\n\031RIGHT_EYE_BOTTOM_BOUNDARY\020\027\022\031\n\025" +
-      "RIGHT_EYE_LEFT_CORNER\020\030\022\037\n\033LEFT_EYEBROW_" +
+      "RIGHT_EYE_LEFT_CORNER\020\030\022\037\n\033LEFT_EYEBROW_",
       "UPPER_MIDPOINT\020\031\022 \n\034RIGHT_EYEBROW_UPPER_" +
       "MIDPOINT\020\032\022\024\n\020LEFT_EAR_TRAGION\020\033\022\025\n\021RIGH" +
       "T_EAR_TRAGION\020\034\022\022\n\016LEFT_EYE_PUPIL\020\035\022\023\n\017R" +
@@ -262,7 +262,7 @@ public static void registerAllExtensions(
       "$\n\007lat_lng\030\001 \001(\0132\023.google.type.LatLng\"=\n" +
       "\010Property\022\014\n\004name\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\022\024" +
       "\n\014uint64_value\030\003 \001(\004\"\247\002\n\020EntityAnnotatio" +
-      "n\022\013\n\003mid\030\001 \001(\t\022\016\n\006locale\030\002 \001(\t\022\023\n\013descri" +
+      "n\022\013\n\003mid\030\001 \001(\t\022\016\n\006locale\030\002 \001(\t\022\023\n\013descri",
       "ption\030\003 \001(\t\022\r\n\005score\030\004 \001(\002\022\022\n\nconfidence" +
       "\030\005 \001(\002\022\022\n\ntopicality\030\006 \001(\002\022;\n\rbounding_p" +
       "oly\030\007 \001(\0132$.google.cloud.vision.v1.Bound" +
@@ -272,7 +272,7 @@ public static void registerAllExtensions(
       "\001\n\031LocalizedObjectAnnotation\022\013\n\003mid\030\001 \001(" +
       "\t\022\025\n\rlanguage_code\030\002 \001(\t\022\014\n\004name\030\003 \001(\t\022\r" +
       "\n\005score\030\004 \001(\002\022;\n\rbounding_poly\030\005 \001(\0132$.g" +
-      "oogle.cloud.vision.v1.BoundingPoly\"\231\002\n\024S" +
+      "oogle.cloud.vision.v1.BoundingPoly\"\231\002\n\024S",
       "afeSearchAnnotation\0221\n\005adult\030\001 \001(\0162\".goo" +
       "gle.cloud.vision.v1.Likelihood\0221\n\005spoof\030" +
       "\002 \001(\0162\".google.cloud.vision.v1.Likelihoo" +
@@ -282,7 +282,7 @@ public static void registerAllExtensions(
       "(\0162\".google.cloud.vision.v1.Likelihood\"a" +
       "\n\013LatLongRect\022(\n\013min_lat_lng\030\001 \001(\0132\023.goo" +
       "gle.type.LatLng\022(\n\013max_lat_lng\030\002 \001(\0132\023.g" +
-      "oogle.type.LatLng\"U\n\tColorInfo\022!\n\005color\030" +
+      "oogle.type.LatLng\"U\n\tColorInfo\022!\n\005color\030",
       "\001 \001(\0132\022.google.type.Color\022\r\n\005score\030\002 \001(\002" +
       "\022\026\n\016pixel_fraction\030\003 \001(\002\"M\n\030DominantColo" +
       "rsAnnotation\0221\n\006colors\030\001 \003(\0132!.google.cl" +
@@ -292,7 +292,7 @@ public static void registerAllExtensions(
       "\010CropHint\022;\n\rbounding_poly\030\001 \001(\0132$.googl" +
       "e.cloud.vision.v1.BoundingPoly\022\022\n\nconfid" +
       "ence\030\002 \001(\002\022\033\n\023importance_fraction\030\003 \001(\002\"" +
-      "K\n\023CropHintsAnnotation\0224\n\ncrop_hints\030\001 \003" +
+      "K\n\023CropHintsAnnotation\0224\n\ncrop_hints\030\001 \003",
       "(\0132 .google.cloud.vision.v1.CropHint\"(\n\017" +
       "CropHintsParams\022\025\n\raspect_ratios\030\001 \003(\002\"1" +
       "\n\022WebDetectionParams\022\033\n\023include_geo_resu" +
@@ -302,7 +302,7 @@ public static void registerAllExtensions(
       "ints_params\030\004 \001(\0132\'.google.cloud.vision." +
       "v1.CropHintsParams\022H\n\024web_detection_para" +
       "ms\030\006 \001(\0132*.google.cloud.vision.v1.WebDet" +
-      "ectionParams\"\264\001\n\024AnnotateImageRequest\022,\n" +
+      "ectionParams\"\264\001\n\024AnnotateImageRequest\022,\n",
       "\005image\030\001 \001(\0132\035.google.cloud.vision.v1.Im" +
       "age\0221\n\010features\030\002 \003(\0132\037.google.cloud.vis" +
       "ion.v1.Feature\022;\n\rimage_context\030\003 \001(\0132$." +
@@ -312,7 +312,7 @@ public static void registerAllExtensions(
       "e\022@\n\020face_annotations\030\001 \003(\0132&.google.clo" +
       "ud.vision.v1.FaceAnnotation\022F\n\024landmark_" +
       "annotations\030\002 \003(\0132(.google.cloud.vision." +
-      "v1.EntityAnnotation\022B\n\020logo_annotations\030" +
+      "v1.EntityAnnotation\022B\n\020logo_annotations\030",
       "\003 \003(\0132(.google.cloud.vision.v1.EntityAnn" +
       "otation\022C\n\021label_annotations\030\004 \003(\0132(.goo" +
       "gle.cloud.vision.v1.EntityAnnotation\022W\n\034" +
@@ -322,7 +322,7 @@ public static void registerAllExtensions(
       ".cloud.vision.v1.EntityAnnotation\022D\n\024ful" +
       "l_text_annotation\030\014 \001(\0132&.google.cloud.v" +
       "ision.v1.TextAnnotation\022L\n\026safe_search_a" +
-      "nnotation\030\006 \001(\0132,.google.cloud.vision.v1" +
+      "nnotation\030\006 \001(\0132,.google.cloud.vision.v1",
       ".SafeSearchAnnotation\022L\n\033image_propertie" +
       "s_annotation\030\010 \001(\0132\'.google.cloud.vision" +
       ".v1.ImageProperties\022J\n\025crop_hints_annota" +
@@ -332,7 +332,7 @@ public static void registerAllExtensions(
       "error\030\t \001(\0132\022.google.rpc.Status\022?\n\007conte" +
       "xt\030\025 \001(\0132..google.cloud.vision.v1.ImageA" +
       "nnotationContext\"\223\001\n\024AnnotateFileRespons" +
-      "e\0229\n\014input_config\030\001 \001(\0132#.google.cloud.v" +
+      "e\0229\n\014input_config\030\001 \001(\0132#.google.cloud.v",
       "ision.v1.InputConfig\022@\n\tresponses\030\002 \003(\0132" +
       "-.google.cloud.vision.v1.AnnotateImageRe" +
       "sponse\"\\\n\032BatchAnnotateImagesRequest\022>\n\010" +
@@ -342,7 +342,7 @@ public static void registerAllExtensions(
       "cloud.vision.v1.AnnotateImageResponse\"\202\002" +
       "\n\030AsyncAnnotateFileRequest\0229\n\014input_conf" +
       "ig\030\001 \001(\0132#.google.cloud.vision.v1.InputC" +
-      "onfig\0221\n\010features\030\002 \003(\0132\037.google.cloud.v" +
+      "onfig\0221\n\010features\030\002 \003(\0132\037.google.cloud.v",
       "ision.v1.Feature\022;\n\rimage_context\030\003 \001(\0132" +
       "$.google.cloud.vision.v1.ImageContext\022;\n" +
       "\routput_config\030\004 \001(\0132$.google.cloud.visi" +
@@ -352,7 +352,7 @@ public static void registerAllExtensions(
       "chAnnotateFilesRequest\022B\n\010requests\030\001 \003(\013" +
       "20.google.cloud.vision.v1.AsyncAnnotateF" +
       "ileRequest\"g\n\037AsyncBatchAnnotateFilesRes" +
-      "ponse\022D\n\tresponses\030\001 \003(\01321.google.cloud." +
+      "ponse\022D\n\tresponses\030\001 \003(\01321.google.cloud.",
       "vision.v1.AsyncAnnotateFileResponse\"W\n\013I" +
       "nputConfig\0225\n\ngcs_source\030\001 \001(\0132!.google." +
       "cloud.vision.v1.GcsSource\022\021\n\tmime_type\030\002" +
@@ -362,7 +362,7 @@ public static void registerAllExtensions(
       "\n\003uri\030\001 \001(\t\"\035\n\016GcsDestination\022\013\n\003uri\030\001 \001" +
       "(\t\"\210\002\n\021OperationMetadata\022>\n\005state\030\001 \001(\0162" +
       "/.google.cloud.vision.v1.OperationMetada" +
-      "ta.State\022/\n\013create_time\030\005 \001(\0132\032.google.p" +
+      "ta.State\022/\n\013create_time\030\005 \001(\0132\032.google.p",
       "rotobuf.Timestamp\022/\n\013update_time\030\006 \001(\0132\032" +
       ".google.protobuf.Timestamp\"Q\n\005State\022\025\n\021S" +
       "TATE_UNSPECIFIED\020\000\022\013\n\007CREATED\020\001\022\013\n\007RUNNI" +
@@ -372,7 +372,7 @@ public static void registerAllExtensions(
       "ERY_LIKELY\020\0052\315\002\n\016ImageAnnotator\022\236\001\n\023Batc" +
       "hAnnotateImages\0222.google.cloud.vision.v1" +
       ".BatchAnnotateImagesRequest\0323.google.clo" +
-      "ud.vision.v1.BatchAnnotateImagesResponse" +
+      "ud.vision.v1.BatchAnnotateImagesResponse",
       "\"\036\202\323\344\223\002\030\"\023/v1/images:annotate:\001*\022\231\001\n\027Asy" +
       "ncBatchAnnotateFiles\0226.google.cloud.visi" +
       "on.v1.AsyncBatchAnnotateFilesRequest\032\035.g" +
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageContext.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageContext.java
index 7d57c800b5c8..faf8bd926a55 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageContext.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageContext.java
@@ -33,9 +33,6 @@ private ImageContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ImageContext(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1.LatLongRect.Builder subBuilder = null;
             if (latLongRect_ != null) {
@@ -95,13 +99,6 @@ private ImageContext(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -122,7 +119,6 @@ private ImageContext(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_ImageContext_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_ImageContext_fieldAccessorTable
@@ -304,7 +300,6 @@ public com.google.cloud.vision.v1.WebDetectionParamsOrBuilder getWebDetectionPar
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -314,7 +309,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (latLongRect_ != null) {
@@ -332,7 +326,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -493,7 +486,6 @@ public static com.google.cloud.vision.v1.ImageContext parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -501,7 +493,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.ImageContext prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -529,7 +520,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_ImageContext_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_ImageContext_fieldAccessorTable
@@ -552,7 +542,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (latLongRectBuilder_ == null) {
@@ -578,18 +567,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_ImageContext_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.ImageContext getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.ImageContext.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.ImageContext build() {
       com.google.cloud.vision.v1.ImageContext result = buildPartial();
       if (!result.isInitialized()) {
@@ -598,7 +584,6 @@ public com.google.cloud.vision.v1.ImageContext build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.ImageContext buildPartial() {
       com.google.cloud.vision.v1.ImageContext result = new com.google.cloud.vision.v1.ImageContext(this);
       int from_bitField0_ = bitField0_;
@@ -628,39 +613,32 @@ public com.google.cloud.vision.v1.ImageContext buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.ImageContext) {
         return mergeFrom((com.google.cloud.vision.v1.ImageContext)other);
@@ -696,12 +674,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.ImageContext other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1372,13 +1348,11 @@ public com.google.cloud.vision.v1.WebDetectionParamsOrBuilder getWebDetectionPar
       }
       return webDetectionParamsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1400,12 +1374,11 @@ public static com.google.cloud.vision.v1.ImageContext getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ImageContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImageContext(input, extensionRegistry);
+        return new ImageContext(input, extensionRegistry);
     }
   };
 
@@ -1418,7 +1391,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.ImageContext getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageProperties.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageProperties.java
index 9084eeba3c43..b0314476e578 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageProperties.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageProperties.java
@@ -32,9 +32,6 @@ private ImageProperties(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private ImageProperties(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1.DominantColorsAnnotation.Builder subBuilder = null;
             if (dominantColors_ != null) {
@@ -59,13 +63,6 @@ private ImageProperties(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private ImageProperties(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_ImageProperties_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_ImageProperties_fieldAccessorTable
@@ -125,7 +121,6 @@ public com.google.cloud.vision.v1.DominantColorsAnnotationOrBuilder getDominantC
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -135,7 +130,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (dominantColors_ != null) {
@@ -144,7 +138,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static com.google.cloud.vision.v1.ImageProperties parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.ImageProperties prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_ImageProperties_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_ImageProperties_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (dominantColorsBuilder_ == null) {
@@ -336,18 +325,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_ImageProperties_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.ImageProperties getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.ImageProperties.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.ImageProperties build() {
       com.google.cloud.vision.v1.ImageProperties result = buildPartial();
       if (!result.isInitialized()) {
@@ -356,7 +342,6 @@ public com.google.cloud.vision.v1.ImageProperties build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.ImageProperties buildPartial() {
       com.google.cloud.vision.v1.ImageProperties result = new com.google.cloud.vision.v1.ImageProperties(this);
       if (dominantColorsBuilder_ == null) {
@@ -368,39 +353,32 @@ public com.google.cloud.vision.v1.ImageProperties buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.ImageProperties) {
         return mergeFrom((com.google.cloud.vision.v1.ImageProperties)other);
@@ -420,12 +398,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.ImageProperties other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -596,13 +572,11 @@ public com.google.cloud.vision.v1.DominantColorsAnnotationOrBuilder getDominantC
       }
       return dominantColorsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -624,12 +598,11 @@ public static com.google.cloud.vision.v1.ImageProperties getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ImageProperties parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImageProperties(input, extensionRegistry);
+        return new ImageProperties(input, extensionRegistry);
     }
   };
 
@@ -642,7 +615,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.ImageProperties getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageSource.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageSource.java
index 27d7689927c3..8f1703010e5f 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageSource.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/ImageSource.java
@@ -34,9 +34,6 @@ private ImageSource(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ImageSource(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private ImageSource(
             imageUri_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private ImageSource(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_ImageSource_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_ImageSource_fieldAccessorTable
@@ -211,7 +207,6 @@ public java.lang.String getImageUri() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -221,7 +216,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getGcsImageUriBytes().isEmpty()) {
@@ -233,7 +227,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -355,7 +348,6 @@ public static com.google.cloud.vision.v1.ImageSource parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -363,7 +355,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.ImageSource prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -391,7 +382,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_ImageSource_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_ImageSource_fieldAccessorTable
@@ -414,7 +404,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       gcsImageUri_ = "";
@@ -424,18 +413,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_ImageSource_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.ImageSource getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.ImageSource.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.ImageSource build() {
       com.google.cloud.vision.v1.ImageSource result = buildPartial();
       if (!result.isInitialized()) {
@@ -444,7 +430,6 @@ public com.google.cloud.vision.v1.ImageSource build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.ImageSource buildPartial() {
       com.google.cloud.vision.v1.ImageSource result = new com.google.cloud.vision.v1.ImageSource(this);
       result.gcsImageUri_ = gcsImageUri_;
@@ -453,39 +438,32 @@ public com.google.cloud.vision.v1.ImageSource buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.ImageSource) {
         return mergeFrom((com.google.cloud.vision.v1.ImageSource)other);
@@ -510,12 +488,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.ImageSource other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -796,13 +772,11 @@ public Builder setImageUriBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -824,12 +798,11 @@ public static com.google.cloud.vision.v1.ImageSource getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ImageSource parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImageSource(input, extensionRegistry);
+        return new ImageSource(input, extensionRegistry);
     }
   };
 
@@ -842,7 +815,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.ImageSource getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/InputConfig.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/InputConfig.java
index 9b2d0737e1f6..c25c172bea26 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/InputConfig.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/InputConfig.java
@@ -33,9 +33,6 @@ private InputConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private InputConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1.GcsSource.Builder subBuilder = null;
             if (gcsSource_ != null) {
@@ -66,13 +70,6 @@ private InputConfig(
             mimeType_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private InputConfig(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_InputConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_InputConfig_fieldAccessorTable
@@ -176,7 +172,6 @@ public java.lang.String getMimeType() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -186,7 +181,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (gcsSource_ != null) {
@@ -198,7 +192,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -326,7 +319,6 @@ public static com.google.cloud.vision.v1.InputConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -334,7 +326,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.InputConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -362,7 +353,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_InputConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_InputConfig_fieldAccessorTable
@@ -385,7 +375,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (gcsSourceBuilder_ == null) {
@@ -399,18 +388,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_InputConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.InputConfig getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.InputConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.InputConfig build() {
       com.google.cloud.vision.v1.InputConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -419,7 +405,6 @@ public com.google.cloud.vision.v1.InputConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.InputConfig buildPartial() {
       com.google.cloud.vision.v1.InputConfig result = new com.google.cloud.vision.v1.InputConfig(this);
       if (gcsSourceBuilder_ == null) {
@@ -432,39 +417,32 @@ public com.google.cloud.vision.v1.InputConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.InputConfig) {
         return mergeFrom((com.google.cloud.vision.v1.InputConfig)other);
@@ -488,12 +466,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.InputConfig other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -758,13 +734,11 @@ public Builder setMimeTypeBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -786,12 +760,11 @@ public static com.google.cloud.vision.v1.InputConfig getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public InputConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InputConfig(input, extensionRegistry);
+        return new InputConfig(input, extensionRegistry);
     }
   };
 
@@ -804,7 +777,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.InputConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/LatLongRect.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/LatLongRect.java
index 24a86b883fa6..678d530815dc 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/LatLongRect.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/LatLongRect.java
@@ -32,9 +32,6 @@ private LatLongRect(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private LatLongRect(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.type.LatLng.Builder subBuilder = null;
             if (minLatLng_ != null) {
@@ -72,13 +76,6 @@ private LatLongRect(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private LatLongRect(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_LatLongRect_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_LatLongRect_fieldAccessorTable
@@ -171,7 +167,6 @@ public com.google.type.LatLngOrBuilder getMaxLatLngOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -181,7 +176,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (minLatLng_ != null) {
@@ -193,7 +187,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -327,7 +320,6 @@ public static com.google.cloud.vision.v1.LatLongRect parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -335,7 +327,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.LatLongRect prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -363,7 +354,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_LatLongRect_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_LatLongRect_fieldAccessorTable
@@ -386,7 +376,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (minLatLngBuilder_ == null) {
@@ -404,18 +393,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_LatLongRect_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.LatLongRect getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.LatLongRect.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.LatLongRect build() {
       com.google.cloud.vision.v1.LatLongRect result = buildPartial();
       if (!result.isInitialized()) {
@@ -424,7 +410,6 @@ public com.google.cloud.vision.v1.LatLongRect build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.LatLongRect buildPartial() {
       com.google.cloud.vision.v1.LatLongRect result = new com.google.cloud.vision.v1.LatLongRect(this);
       if (minLatLngBuilder_ == null) {
@@ -441,39 +426,32 @@ public com.google.cloud.vision.v1.LatLongRect buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.LatLongRect) {
         return mergeFrom((com.google.cloud.vision.v1.LatLongRect)other);
@@ -496,12 +474,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.LatLongRect other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -825,13 +801,11 @@ public com.google.type.LatLngOrBuilder getMaxLatLngOrBuilder() {
       }
       return maxLatLngBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -853,12 +827,11 @@ public static com.google.cloud.vision.v1.LatLongRect getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LatLongRect parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LatLongRect(input, extensionRegistry);
+        return new LatLongRect(input, extensionRegistry);
     }
   };
 
@@ -871,7 +844,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.LatLongRect getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/LocalizedObjectAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/LocalizedObjectAnnotation.java
index 77aae919d844..8393886e505a 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/LocalizedObjectAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/LocalizedObjectAnnotation.java
@@ -36,9 +36,6 @@ private LocalizedObjectAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private LocalizedObjectAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -86,13 +90,6 @@ private LocalizedObjectAnnotation(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -110,7 +107,6 @@ private LocalizedObjectAnnotation(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_LocalizedObjectAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_LocalizedObjectAnnotation_fieldAccessorTable
@@ -295,7 +291,6 @@ public com.google.cloud.vision.v1.BoundingPolyOrBuilder getBoundingPolyOrBuilder
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -305,7 +300,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getMidBytes().isEmpty()) {
@@ -326,7 +320,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -479,7 +472,6 @@ public static com.google.cloud.vision.v1.LocalizedObjectAnnotation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -487,7 +479,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.LocalizedObjectAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -515,7 +506,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_LocalizedObjectAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_LocalizedObjectAnnotation_fieldAccessorTable
@@ -538,7 +528,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       mid_ = "";
@@ -558,18 +547,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_LocalizedObjectAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.LocalizedObjectAnnotation getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.LocalizedObjectAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.LocalizedObjectAnnotation build() {
       com.google.cloud.vision.v1.LocalizedObjectAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -578,7 +564,6 @@ public com.google.cloud.vision.v1.LocalizedObjectAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.LocalizedObjectAnnotation buildPartial() {
       com.google.cloud.vision.v1.LocalizedObjectAnnotation result = new com.google.cloud.vision.v1.LocalizedObjectAnnotation(this);
       result.mid_ = mid_;
@@ -594,39 +579,32 @@ public com.google.cloud.vision.v1.LocalizedObjectAnnotation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.LocalizedObjectAnnotation) {
         return mergeFrom((com.google.cloud.vision.v1.LocalizedObjectAnnotation)other);
@@ -661,12 +639,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.LocalizedObjectAnnotation ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1152,13 +1128,11 @@ public com.google.cloud.vision.v1.BoundingPolyOrBuilder getBoundingPolyOrBuilder
       }
       return boundingPolyBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1180,12 +1154,11 @@ public static com.google.cloud.vision.v1.LocalizedObjectAnnotation getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LocalizedObjectAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LocalizedObjectAnnotation(input, extensionRegistry);
+        return new LocalizedObjectAnnotation(input, extensionRegistry);
     }
   };
 
@@ -1198,7 +1171,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.LocalizedObjectAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/LocationInfo.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/LocationInfo.java
index 71a2a1177f7c..03fb7230b2a9 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/LocationInfo.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/LocationInfo.java
@@ -32,9 +32,6 @@ private LocationInfo(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private LocationInfo(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.type.LatLng.Builder subBuilder = null;
             if (latLng_ != null) {
@@ -59,13 +63,6 @@ private LocationInfo(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private LocationInfo(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_LocationInfo_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_LocationInfo_fieldAccessorTable
@@ -125,7 +121,6 @@ public com.google.type.LatLngOrBuilder getLatLngOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -135,7 +130,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (latLng_ != null) {
@@ -144,7 +138,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static com.google.cloud.vision.v1.LocationInfo parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.LocationInfo prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_LocationInfo_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_LocationInfo_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (latLngBuilder_ == null) {
@@ -336,18 +325,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_LocationInfo_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.LocationInfo getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.LocationInfo.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.LocationInfo build() {
       com.google.cloud.vision.v1.LocationInfo result = buildPartial();
       if (!result.isInitialized()) {
@@ -356,7 +342,6 @@ public com.google.cloud.vision.v1.LocationInfo build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.LocationInfo buildPartial() {
       com.google.cloud.vision.v1.LocationInfo result = new com.google.cloud.vision.v1.LocationInfo(this);
       if (latLngBuilder_ == null) {
@@ -368,39 +353,32 @@ public com.google.cloud.vision.v1.LocationInfo buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.LocationInfo) {
         return mergeFrom((com.google.cloud.vision.v1.LocationInfo)other);
@@ -420,12 +398,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.LocationInfo other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -596,13 +572,11 @@ public com.google.type.LatLngOrBuilder getLatLngOrBuilder() {
       }
       return latLngBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -624,12 +598,11 @@ public static com.google.cloud.vision.v1.LocationInfo getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LocationInfo parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LocationInfo(input, extensionRegistry);
+        return new LocationInfo(input, extensionRegistry);
     }
   };
 
@@ -642,7 +615,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.LocationInfo getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/NormalizedVertex.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/NormalizedVertex.java
index 5c0c23e6c1a5..7df739a736b4 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/NormalizedVertex.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/NormalizedVertex.java
@@ -36,9 +36,6 @@ private NormalizedVertex(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private NormalizedVertex(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 13: {
 
             x_ = input.readFloat();
@@ -60,13 +64,6 @@ private NormalizedVertex(
             y_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private NormalizedVertex(
     return com.google.cloud.vision.v1.GeometryProto.internal_static_google_cloud_vision_v1_NormalizedVertex_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.GeometryProto.internal_static_google_cloud_vision_v1_NormalizedVertex_fieldAccessorTable
@@ -119,7 +115,6 @@ public float getY() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -129,7 +124,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (x_ != 0F) {
@@ -141,7 +135,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -271,7 +264,6 @@ public static com.google.cloud.vision.v1.NormalizedVertex parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -279,7 +271,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.NormalizedVertex prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -309,7 +300,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.GeometryProto.internal_static_google_cloud_vision_v1_NormalizedVertex_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.GeometryProto.internal_static_google_cloud_vision_v1_NormalizedVertex_fieldAccessorTable
@@ -332,7 +322,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       x_ = 0F;
@@ -342,18 +331,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.GeometryProto.internal_static_google_cloud_vision_v1_NormalizedVertex_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.NormalizedVertex getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.NormalizedVertex.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.NormalizedVertex build() {
       com.google.cloud.vision.v1.NormalizedVertex result = buildPartial();
       if (!result.isInitialized()) {
@@ -362,7 +348,6 @@ public com.google.cloud.vision.v1.NormalizedVertex build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.NormalizedVertex buildPartial() {
       com.google.cloud.vision.v1.NormalizedVertex result = new com.google.cloud.vision.v1.NormalizedVertex(this);
       result.x_ = x_;
@@ -371,39 +356,32 @@ public com.google.cloud.vision.v1.NormalizedVertex buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.NormalizedVertex) {
         return mergeFrom((com.google.cloud.vision.v1.NormalizedVertex)other);
@@ -426,12 +404,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.NormalizedVertex other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -525,13 +501,11 @@ public Builder clearY() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -553,12 +527,11 @@ public static com.google.cloud.vision.v1.NormalizedVertex getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public NormalizedVertex parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new NormalizedVertex(input, extensionRegistry);
+        return new NormalizedVertex(input, extensionRegistry);
     }
   };
 
@@ -571,7 +544,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.NormalizedVertex getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/OperationMetadata.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/OperationMetadata.java
index 01a12ed5c83b..737ffb52d711 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/OperationMetadata.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/OperationMetadata.java
@@ -33,9 +33,6 @@ private OperationMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private OperationMetadata(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -79,13 +83,6 @@ private OperationMetadata(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private OperationMetadata(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_OperationMetadata_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_OperationMetadata_fieldAccessorTable
@@ -300,7 +296,6 @@ public int getStateValue() {
    * .google.cloud.vision.v1.OperationMetadata.State state = 1;
    */
   public com.google.cloud.vision.v1.OperationMetadata.State getState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1.OperationMetadata.State result = com.google.cloud.vision.v1.OperationMetadata.State.valueOf(state_);
     return result == null ? com.google.cloud.vision.v1.OperationMetadata.State.UNRECOGNIZED : result;
   }
@@ -372,7 +367,6 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -382,7 +376,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (state_ != com.google.cloud.vision.v1.OperationMetadata.State.STATE_UNSPECIFIED.getNumber()) {
@@ -397,7 +390,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -538,7 +530,6 @@ public static com.google.cloud.vision.v1.OperationMetadata parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -546,7 +537,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.OperationMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -574,7 +564,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_OperationMetadata_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_OperationMetadata_fieldAccessorTable
@@ -597,7 +586,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       state_ = 0;
@@ -617,18 +605,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_OperationMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.OperationMetadata getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.OperationMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.OperationMetadata build() {
       com.google.cloud.vision.v1.OperationMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -637,7 +622,6 @@ public com.google.cloud.vision.v1.OperationMetadata build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.OperationMetadata buildPartial() {
       com.google.cloud.vision.v1.OperationMetadata result = new com.google.cloud.vision.v1.OperationMetadata(this);
       result.state_ = state_;
@@ -655,39 +639,32 @@ public com.google.cloud.vision.v1.OperationMetadata buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.OperationMetadata) {
         return mergeFrom((com.google.cloud.vision.v1.OperationMetadata)other);
@@ -713,12 +690,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.OperationMetadata other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -768,7 +743,6 @@ public Builder setStateValue(int value) {
      * .google.cloud.vision.v1.OperationMetadata.State state = 1;
      */
     public com.google.cloud.vision.v1.OperationMetadata.State getState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1.OperationMetadata.State result = com.google.cloud.vision.v1.OperationMetadata.State.valueOf(state_);
       return result == null ? com.google.cloud.vision.v1.OperationMetadata.State.UNRECOGNIZED : result;
     }
@@ -1107,13 +1081,11 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
       }
       return updateTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1135,12 +1107,11 @@ public static com.google.cloud.vision.v1.OperationMetadata getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public OperationMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new OperationMetadata(input, extensionRegistry);
+        return new OperationMetadata(input, extensionRegistry);
     }
   };
 
@@ -1153,7 +1124,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.OperationMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/OutputConfig.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/OutputConfig.java
index 250112749e1e..16664881e9a8 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/OutputConfig.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/OutputConfig.java
@@ -33,9 +33,6 @@ private OutputConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private OutputConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1.GcsDestination.Builder subBuilder = null;
             if (gcsDestination_ != null) {
@@ -65,13 +69,6 @@ private OutputConfig(
             batchSize_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -89,7 +86,6 @@ private OutputConfig(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_OutputConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_OutputConfig_fieldAccessorTable
@@ -152,7 +148,6 @@ public int getBatchSize() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -162,7 +157,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (gcsDestination_ != null) {
@@ -174,7 +168,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -303,7 +296,6 @@ public static com.google.cloud.vision.v1.OutputConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -311,7 +303,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.OutputConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -339,7 +330,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_OutputConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_OutputConfig_fieldAccessorTable
@@ -362,7 +352,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (gcsDestinationBuilder_ == null) {
@@ -376,18 +365,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_OutputConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.OutputConfig getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.OutputConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.OutputConfig build() {
       com.google.cloud.vision.v1.OutputConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -396,7 +382,6 @@ public com.google.cloud.vision.v1.OutputConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.OutputConfig buildPartial() {
       com.google.cloud.vision.v1.OutputConfig result = new com.google.cloud.vision.v1.OutputConfig(this);
       if (gcsDestinationBuilder_ == null) {
@@ -409,39 +394,32 @@ public com.google.cloud.vision.v1.OutputConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.OutputConfig) {
         return mergeFrom((com.google.cloud.vision.v1.OutputConfig)other);
@@ -464,12 +442,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.OutputConfig other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -702,13 +678,11 @@ public Builder clearBatchSize() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -730,12 +704,11 @@ public static com.google.cloud.vision.v1.OutputConfig getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public OutputConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new OutputConfig(input, extensionRegistry);
+        return new OutputConfig(input, extensionRegistry);
     }
   };
 
@@ -748,7 +721,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.OutputConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Page.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Page.java
index 0aaa7ffc3c07..6e33b33bdac2 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Page.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Page.java
@@ -36,9 +36,6 @@ private Page(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private Page(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1.TextAnnotation.TextProperty.Builder subBuilder = null;
             if (property_ != null) {
@@ -87,13 +91,6 @@ private Page(
             confidence_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -114,7 +111,6 @@ private Page(
     return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_Page_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_Page_fieldAccessorTable
@@ -253,7 +249,6 @@ public float getConfidence() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -263,7 +258,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (property_ != null) {
@@ -284,7 +278,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -442,7 +435,6 @@ public static com.google.cloud.vision.v1.Page parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -450,7 +442,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.Page prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -478,7 +469,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_Page_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_Page_fieldAccessorTable
@@ -502,7 +492,6 @@ private void maybeForceBuilderInitialization() {
         getBlocksFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (propertyBuilder_ == null) {
@@ -526,18 +515,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_Page_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.Page getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.Page.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.Page build() {
       com.google.cloud.vision.v1.Page result = buildPartial();
       if (!result.isInitialized()) {
@@ -546,7 +532,6 @@ public com.google.cloud.vision.v1.Page build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.Page buildPartial() {
       com.google.cloud.vision.v1.Page result = new com.google.cloud.vision.v1.Page(this);
       int from_bitField0_ = bitField0_;
@@ -573,39 +558,32 @@ public com.google.cloud.vision.v1.Page buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.Page) {
         return mergeFrom((com.google.cloud.vision.v1.Page)other);
@@ -660,12 +638,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.Page other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1269,13 +1245,11 @@ public Builder clearConfidence() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1297,12 +1271,11 @@ public static com.google.cloud.vision.v1.Page getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Page parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Page(input, extensionRegistry);
+        return new Page(input, extensionRegistry);
     }
   };
 
@@ -1315,7 +1288,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.Page getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Paragraph.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Paragraph.java
index 33ca3feaf331..99d5181a7f54 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Paragraph.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Paragraph.java
@@ -34,9 +34,6 @@ private Paragraph(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private Paragraph(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1.TextAnnotation.TextProperty.Builder subBuilder = null;
             if (property_ != null) {
@@ -88,13 +92,6 @@ private Paragraph(
             confidence_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -115,7 +112,6 @@ private Paragraph(
     return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_Paragraph_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_Paragraph_fieldAccessorTable
@@ -301,7 +297,6 @@ public float getConfidence() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -311,7 +306,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (property_ != null) {
@@ -329,7 +323,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -484,7 +477,6 @@ public static com.google.cloud.vision.v1.Paragraph parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -492,7 +484,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.Paragraph prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -520,7 +511,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_Paragraph_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_Paragraph_fieldAccessorTable
@@ -544,7 +534,6 @@ private void maybeForceBuilderInitialization() {
         getWordsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (propertyBuilder_ == null) {
@@ -570,18 +559,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_Paragraph_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.Paragraph getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.Paragraph.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.Paragraph build() {
       com.google.cloud.vision.v1.Paragraph result = buildPartial();
       if (!result.isInitialized()) {
@@ -590,7 +576,6 @@ public com.google.cloud.vision.v1.Paragraph build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.Paragraph buildPartial() {
       com.google.cloud.vision.v1.Paragraph result = new com.google.cloud.vision.v1.Paragraph(this);
       int from_bitField0_ = bitField0_;
@@ -620,39 +605,32 @@ public com.google.cloud.vision.v1.Paragraph buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.Paragraph) {
         return mergeFrom((com.google.cloud.vision.v1.Paragraph)other);
@@ -704,12 +682,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.Paragraph other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1510,13 +1486,11 @@ public Builder clearConfidence() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1538,12 +1512,11 @@ public static com.google.cloud.vision.v1.Paragraph getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Paragraph parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Paragraph(input, extensionRegistry);
+        return new Paragraph(input, extensionRegistry);
     }
   };
 
@@ -1556,7 +1529,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.Paragraph getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Position.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Position.java
index 81191f05e81c..7c1a6f9161c2 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Position.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Position.java
@@ -37,9 +37,6 @@ private Position(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private Position(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 13: {
 
             x_ = input.readFloat();
@@ -66,13 +70,6 @@ private Position(
             z_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private Position(
     return com.google.cloud.vision.v1.GeometryProto.internal_static_google_cloud_vision_v1_Position_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.GeometryProto.internal_static_google_cloud_vision_v1_Position_fieldAccessorTable
@@ -138,7 +134,6 @@ public float getZ() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -148,7 +143,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (x_ != 0F) {
@@ -163,7 +157,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -304,7 +297,6 @@ public static com.google.cloud.vision.v1.Position parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -312,7 +304,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.Position prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -342,7 +333,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.GeometryProto.internal_static_google_cloud_vision_v1_Position_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.GeometryProto.internal_static_google_cloud_vision_v1_Position_fieldAccessorTable
@@ -365,7 +355,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       x_ = 0F;
@@ -377,18 +366,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.GeometryProto.internal_static_google_cloud_vision_v1_Position_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.Position getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.Position.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.Position build() {
       com.google.cloud.vision.v1.Position result = buildPartial();
       if (!result.isInitialized()) {
@@ -397,7 +383,6 @@ public com.google.cloud.vision.v1.Position build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.Position buildPartial() {
       com.google.cloud.vision.v1.Position result = new com.google.cloud.vision.v1.Position(this);
       result.x_ = x_;
@@ -407,39 +392,32 @@ public com.google.cloud.vision.v1.Position buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.Position) {
         return mergeFrom((com.google.cloud.vision.v1.Position)other);
@@ -465,12 +443,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.Position other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -602,13 +578,11 @@ public Builder clearZ() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -630,12 +604,11 @@ public static com.google.cloud.vision.v1.Position getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Position parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Position(input, extensionRegistry);
+        return new Position(input, extensionRegistry);
     }
   };
 
@@ -648,7 +621,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.Position getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Property.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Property.java
index 2529ef84f465..0ceba2c23eb2 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Property.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Property.java
@@ -35,9 +35,6 @@ private Property(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private Property(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private Property(
             uint64Value_ = input.readUInt64();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private Property(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_Property_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_Property_fieldAccessorTable
@@ -196,7 +192,6 @@ public long getUint64Value() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -206,7 +201,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -221,7 +215,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -352,7 +345,6 @@ public static com.google.cloud.vision.v1.Property parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -360,7 +352,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.Property prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -388,7 +379,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_Property_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_Property_fieldAccessorTable
@@ -411,7 +401,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -423,18 +412,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_Property_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.Property getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.Property.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.Property build() {
       com.google.cloud.vision.v1.Property result = buildPartial();
       if (!result.isInitialized()) {
@@ -443,7 +429,6 @@ public com.google.cloud.vision.v1.Property build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.Property buildPartial() {
       com.google.cloud.vision.v1.Property result = new com.google.cloud.vision.v1.Property(this);
       result.name_ = name_;
@@ -453,39 +438,32 @@ public com.google.cloud.vision.v1.Property buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.Property) {
         return mergeFrom((com.google.cloud.vision.v1.Property)other);
@@ -513,12 +491,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.Property other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -752,13 +728,11 @@ public Builder clearUint64Value() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -780,12 +754,11 @@ public static com.google.cloud.vision.v1.Property getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Property parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Property(input, extensionRegistry);
+        return new Property(input, extensionRegistry);
     }
   };
 
@@ -798,7 +771,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.Property getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/SafeSearchAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/SafeSearchAnnotation.java
index f20e3998fc8b..8f4083a6ebcc 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/SafeSearchAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/SafeSearchAnnotation.java
@@ -39,9 +39,6 @@ private SafeSearchAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private SafeSearchAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -83,13 +87,6 @@ private SafeSearchAnnotation(
             racy_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -107,7 +104,6 @@ private SafeSearchAnnotation(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_SafeSearchAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_SafeSearchAnnotation_fieldAccessorTable
@@ -139,7 +135,6 @@ public int getAdultValue() {
    * .google.cloud.vision.v1.Likelihood adult = 1;
    */
   public com.google.cloud.vision.v1.Likelihood getAdult() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1.Likelihood result = com.google.cloud.vision.v1.Likelihood.valueOf(adult_);
     return result == null ? com.google.cloud.vision.v1.Likelihood.UNRECOGNIZED : result;
   }
@@ -168,7 +163,6 @@ public int getSpoofValue() {
    * .google.cloud.vision.v1.Likelihood spoof = 2;
    */
   public com.google.cloud.vision.v1.Likelihood getSpoof() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1.Likelihood result = com.google.cloud.vision.v1.Likelihood.valueOf(spoof_);
     return result == null ? com.google.cloud.vision.v1.Likelihood.UNRECOGNIZED : result;
   }
@@ -193,7 +187,6 @@ public int getMedicalValue() {
    * .google.cloud.vision.v1.Likelihood medical = 3;
    */
   public com.google.cloud.vision.v1.Likelihood getMedical() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1.Likelihood result = com.google.cloud.vision.v1.Likelihood.valueOf(medical_);
     return result == null ? com.google.cloud.vision.v1.Likelihood.UNRECOGNIZED : result;
   }
@@ -218,7 +211,6 @@ public int getViolenceValue() {
    * .google.cloud.vision.v1.Likelihood violence = 4;
    */
   public com.google.cloud.vision.v1.Likelihood getViolence() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1.Likelihood result = com.google.cloud.vision.v1.Likelihood.valueOf(violence_);
     return result == null ? com.google.cloud.vision.v1.Likelihood.UNRECOGNIZED : result;
   }
@@ -249,13 +241,11 @@ public int getRacyValue() {
    * .google.cloud.vision.v1.Likelihood racy = 9;
    */
   public com.google.cloud.vision.v1.Likelihood getRacy() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1.Likelihood result = com.google.cloud.vision.v1.Likelihood.valueOf(racy_);
     return result == null ? com.google.cloud.vision.v1.Likelihood.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -265,7 +255,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (adult_ != com.google.cloud.vision.v1.Likelihood.UNKNOWN.getNumber()) {
@@ -286,7 +275,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -429,7 +417,6 @@ public static com.google.cloud.vision.v1.SafeSearchAnnotation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -437,7 +424,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.SafeSearchAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -467,7 +453,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_SafeSearchAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_SafeSearchAnnotation_fieldAccessorTable
@@ -490,7 +475,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       adult_ = 0;
@@ -506,18 +490,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_SafeSearchAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.SafeSearchAnnotation getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.SafeSearchAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.SafeSearchAnnotation build() {
       com.google.cloud.vision.v1.SafeSearchAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -526,7 +507,6 @@ public com.google.cloud.vision.v1.SafeSearchAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.SafeSearchAnnotation buildPartial() {
       com.google.cloud.vision.v1.SafeSearchAnnotation result = new com.google.cloud.vision.v1.SafeSearchAnnotation(this);
       result.adult_ = adult_;
@@ -538,39 +518,32 @@ public com.google.cloud.vision.v1.SafeSearchAnnotation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.SafeSearchAnnotation) {
         return mergeFrom((com.google.cloud.vision.v1.SafeSearchAnnotation)other);
@@ -602,12 +575,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.SafeSearchAnnotation other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -663,7 +634,6 @@ public Builder setAdultValue(int value) {
      * .google.cloud.vision.v1.Likelihood adult = 1;
      */
     public com.google.cloud.vision.v1.Likelihood getAdult() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1.Likelihood result = com.google.cloud.vision.v1.Likelihood.valueOf(adult_);
       return result == null ? com.google.cloud.vision.v1.Likelihood.UNRECOGNIZED : result;
     }
@@ -738,7 +708,6 @@ public Builder setSpoofValue(int value) {
      * .google.cloud.vision.v1.Likelihood spoof = 2;
      */
     public com.google.cloud.vision.v1.Likelihood getSpoof() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1.Likelihood result = com.google.cloud.vision.v1.Likelihood.valueOf(spoof_);
       return result == null ? com.google.cloud.vision.v1.Likelihood.UNRECOGNIZED : result;
     }
@@ -807,7 +776,6 @@ public Builder setMedicalValue(int value) {
      * .google.cloud.vision.v1.Likelihood medical = 3;
      */
     public com.google.cloud.vision.v1.Likelihood getMedical() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1.Likelihood result = com.google.cloud.vision.v1.Likelihood.valueOf(medical_);
       return result == null ? com.google.cloud.vision.v1.Likelihood.UNRECOGNIZED : result;
     }
@@ -872,7 +840,6 @@ public Builder setViolenceValue(int value) {
      * .google.cloud.vision.v1.Likelihood violence = 4;
      */
     public com.google.cloud.vision.v1.Likelihood getViolence() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1.Likelihood result = com.google.cloud.vision.v1.Likelihood.valueOf(violence_);
       return result == null ? com.google.cloud.vision.v1.Likelihood.UNRECOGNIZED : result;
     }
@@ -946,7 +913,6 @@ public Builder setRacyValue(int value) {
      * .google.cloud.vision.v1.Likelihood racy = 9;
      */
     public com.google.cloud.vision.v1.Likelihood getRacy() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1.Likelihood result = com.google.cloud.vision.v1.Likelihood.valueOf(racy_);
       return result == null ? com.google.cloud.vision.v1.Likelihood.UNRECOGNIZED : result;
     }
@@ -985,13 +951,11 @@ public Builder clearRacy() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1013,12 +977,11 @@ public static com.google.cloud.vision.v1.SafeSearchAnnotation getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SafeSearchAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SafeSearchAnnotation(input, extensionRegistry);
+        return new SafeSearchAnnotation(input, extensionRegistry);
     }
   };
 
@@ -1031,7 +994,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.SafeSearchAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Symbol.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Symbol.java
index 27c4790e56b3..a23d102a9584 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Symbol.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Symbol.java
@@ -34,9 +34,6 @@ private Symbol(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private Symbol(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1.TextAnnotation.TextProperty.Builder subBuilder = null;
             if (property_ != null) {
@@ -85,13 +89,6 @@ private Symbol(
             confidence_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -109,7 +106,6 @@ private Symbol(
     return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_Symbol_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_Symbol_fieldAccessorTable
@@ -281,7 +277,6 @@ public float getConfidence() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -291,7 +286,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (property_ != null) {
@@ -309,7 +303,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -461,7 +454,6 @@ public static com.google.cloud.vision.v1.Symbol parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -469,7 +461,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.Symbol prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -497,7 +488,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_Symbol_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_Symbol_fieldAccessorTable
@@ -520,7 +510,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (propertyBuilder_ == null) {
@@ -542,18 +531,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_Symbol_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.Symbol getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.Symbol.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.Symbol build() {
       com.google.cloud.vision.v1.Symbol result = buildPartial();
       if (!result.isInitialized()) {
@@ -562,7 +548,6 @@ public com.google.cloud.vision.v1.Symbol build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.Symbol buildPartial() {
       com.google.cloud.vision.v1.Symbol result = new com.google.cloud.vision.v1.Symbol(this);
       if (propertyBuilder_ == null) {
@@ -581,39 +566,32 @@ public com.google.cloud.vision.v1.Symbol buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.Symbol) {
         return mergeFrom((com.google.cloud.vision.v1.Symbol)other);
@@ -643,12 +621,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.Symbol other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1225,13 +1201,11 @@ public Builder clearConfidence() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1253,12 +1227,11 @@ public static com.google.cloud.vision.v1.Symbol getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Symbol parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Symbol(input, extensionRegistry);
+        return new Symbol(input, extensionRegistry);
     }
   };
 
@@ -1271,7 +1244,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.Symbol getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/TextAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/TextAnnotation.java
index f491f47497c7..db2c7b42acec 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/TextAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/TextAnnotation.java
@@ -40,9 +40,6 @@ private TextAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -54,6 +51,13 @@ private TextAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               pages_ = new java.util.ArrayList();
@@ -69,13 +73,6 @@ private TextAnnotation(
             text_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private TextAnnotation(
     return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_TextAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_TextAnnotation_fieldAccessorTable
@@ -170,9 +166,6 @@ private DetectedLanguage(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -184,6 +177,13 @@ private DetectedLanguage(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -195,13 +195,6 @@ private DetectedLanguage(
               confidence_ = input.readFloat();
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -219,7 +212,6 @@ private DetectedLanguage(
       return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_TextAnnotation_DetectedLanguage_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_TextAnnotation_DetectedLanguage_fieldAccessorTable
@@ -287,7 +279,6 @@ public float getConfidence() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -297,7 +288,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getLanguageCodeBytes().isEmpty()) {
@@ -309,7 +299,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -435,7 +424,6 @@ public static com.google.cloud.vision.v1.TextAnnotation.DetectedLanguage parseFr
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -443,7 +431,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1.TextAnnotation.DetectedLanguage prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -471,7 +458,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_TextAnnotation_DetectedLanguage_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_TextAnnotation_DetectedLanguage_fieldAccessorTable
@@ -494,7 +480,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         languageCode_ = "";
@@ -504,18 +489,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_TextAnnotation_DetectedLanguage_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1.TextAnnotation.DetectedLanguage getDefaultInstanceForType() {
         return com.google.cloud.vision.v1.TextAnnotation.DetectedLanguage.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1.TextAnnotation.DetectedLanguage build() {
         com.google.cloud.vision.v1.TextAnnotation.DetectedLanguage result = buildPartial();
         if (!result.isInitialized()) {
@@ -524,7 +506,6 @@ public com.google.cloud.vision.v1.TextAnnotation.DetectedLanguage build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1.TextAnnotation.DetectedLanguage buildPartial() {
         com.google.cloud.vision.v1.TextAnnotation.DetectedLanguage result = new com.google.cloud.vision.v1.TextAnnotation.DetectedLanguage(this);
         result.languageCode_ = languageCode_;
@@ -533,39 +514,32 @@ public com.google.cloud.vision.v1.TextAnnotation.DetectedLanguage buildPartial()
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1.TextAnnotation.DetectedLanguage) {
           return mergeFrom((com.google.cloud.vision.v1.TextAnnotation.DetectedLanguage)other);
@@ -589,12 +563,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.TextAnnotation.DetectedLangu
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -749,13 +721,11 @@ public Builder clearConfidence() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -777,12 +747,11 @@ public static com.google.cloud.vision.v1.TextAnnotation.DetectedLanguage getDefa
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public DetectedLanguage parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new DetectedLanguage(input, extensionRegistry);
+          return new DetectedLanguage(input, extensionRegistry);
       }
     };
 
@@ -795,7 +764,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.TextAnnotation.DetectedLanguage getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -863,9 +831,6 @@ private DetectedBreak(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -877,6 +842,13 @@ private DetectedBreak(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 8: {
               int rawValue = input.readEnum();
 
@@ -888,13 +860,6 @@ private DetectedBreak(
               isPrefix_ = input.readBool();
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -912,7 +877,6 @@ private DetectedBreak(
       return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_TextAnnotation_DetectedBreak_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_TextAnnotation_DetectedBreak_fieldAccessorTable
@@ -1128,7 +1092,6 @@ public int getTypeValue() {
      * .google.cloud.vision.v1.TextAnnotation.DetectedBreak.BreakType type = 1;
      */
     public com.google.cloud.vision.v1.TextAnnotation.DetectedBreak.BreakType getType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1.TextAnnotation.DetectedBreak.BreakType result = com.google.cloud.vision.v1.TextAnnotation.DetectedBreak.BreakType.valueOf(type_);
       return result == null ? com.google.cloud.vision.v1.TextAnnotation.DetectedBreak.BreakType.UNRECOGNIZED : result;
     }
@@ -1147,7 +1110,6 @@ public boolean getIsPrefix() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1157,7 +1119,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (type_ != com.google.cloud.vision.v1.TextAnnotation.DetectedBreak.BreakType.UNKNOWN.getNumber()) {
@@ -1169,7 +1130,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -1293,7 +1253,6 @@ public static com.google.cloud.vision.v1.TextAnnotation.DetectedBreak parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -1301,7 +1260,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1.TextAnnotation.DetectedBreak prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -1329,7 +1287,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_TextAnnotation_DetectedBreak_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_TextAnnotation_DetectedBreak_fieldAccessorTable
@@ -1352,7 +1309,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         type_ = 0;
@@ -1362,18 +1318,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_TextAnnotation_DetectedBreak_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1.TextAnnotation.DetectedBreak getDefaultInstanceForType() {
         return com.google.cloud.vision.v1.TextAnnotation.DetectedBreak.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1.TextAnnotation.DetectedBreak build() {
         com.google.cloud.vision.v1.TextAnnotation.DetectedBreak result = buildPartial();
         if (!result.isInitialized()) {
@@ -1382,7 +1335,6 @@ public com.google.cloud.vision.v1.TextAnnotation.DetectedBreak build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1.TextAnnotation.DetectedBreak buildPartial() {
         com.google.cloud.vision.v1.TextAnnotation.DetectedBreak result = new com.google.cloud.vision.v1.TextAnnotation.DetectedBreak(this);
         result.type_ = type_;
@@ -1391,39 +1343,32 @@ public com.google.cloud.vision.v1.TextAnnotation.DetectedBreak buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1.TextAnnotation.DetectedBreak) {
           return mergeFrom((com.google.cloud.vision.v1.TextAnnotation.DetectedBreak)other);
@@ -1446,12 +1391,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.TextAnnotation.DetectedBreak
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1501,7 +1444,6 @@ public Builder setTypeValue(int value) {
        * .google.cloud.vision.v1.TextAnnotation.DetectedBreak.BreakType type = 1;
        */
       public com.google.cloud.vision.v1.TextAnnotation.DetectedBreak.BreakType getType() {
-        @SuppressWarnings("deprecation")
         com.google.cloud.vision.v1.TextAnnotation.DetectedBreak.BreakType result = com.google.cloud.vision.v1.TextAnnotation.DetectedBreak.BreakType.valueOf(type_);
         return result == null ? com.google.cloud.vision.v1.TextAnnotation.DetectedBreak.BreakType.UNRECOGNIZED : result;
       }
@@ -1572,13 +1514,11 @@ public Builder clearIsPrefix() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1600,12 +1540,11 @@ public static com.google.cloud.vision.v1.TextAnnotation.DetectedBreak getDefault
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public DetectedBreak parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new DetectedBreak(input, extensionRegistry);
+          return new DetectedBreak(input, extensionRegistry);
       }
     };
 
@@ -1618,7 +1557,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.TextAnnotation.DetectedBreak getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1728,9 +1666,6 @@ private TextProperty(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1742,6 +1677,13 @@ private TextProperty(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
                 detectedLanguages_ = new java.util.ArrayList();
@@ -1764,13 +1706,6 @@ private TextProperty(
 
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1791,7 +1726,6 @@ private TextProperty(
       return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_TextAnnotation_TextProperty_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_TextAnnotation_TextProperty_fieldAccessorTable
@@ -1889,7 +1823,6 @@ public com.google.cloud.vision.v1.TextAnnotation.DetectedBreakOrBuilder getDetec
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1899,7 +1832,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < detectedLanguages_.size(); i++) {
@@ -1911,7 +1843,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -2042,7 +1973,6 @@ public static com.google.cloud.vision.v1.TextAnnotation.TextProperty parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -2050,7 +1980,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1.TextAnnotation.TextProperty prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -2078,7 +2007,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_TextAnnotation_TextProperty_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_TextAnnotation_TextProperty_fieldAccessorTable
@@ -2102,7 +2030,6 @@ private void maybeForceBuilderInitialization() {
           getDetectedLanguagesFieldBuilder();
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         if (detectedLanguagesBuilder_ == null) {
@@ -2120,18 +2047,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_TextAnnotation_TextProperty_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1.TextAnnotation.TextProperty getDefaultInstanceForType() {
         return com.google.cloud.vision.v1.TextAnnotation.TextProperty.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1.TextAnnotation.TextProperty build() {
         com.google.cloud.vision.v1.TextAnnotation.TextProperty result = buildPartial();
         if (!result.isInitialized()) {
@@ -2140,7 +2064,6 @@ public com.google.cloud.vision.v1.TextAnnotation.TextProperty build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1.TextAnnotation.TextProperty buildPartial() {
         com.google.cloud.vision.v1.TextAnnotation.TextProperty result = new com.google.cloud.vision.v1.TextAnnotation.TextProperty(this);
         int from_bitField0_ = bitField0_;
@@ -2164,39 +2087,32 @@ public com.google.cloud.vision.v1.TextAnnotation.TextProperty buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1.TextAnnotation.TextProperty) {
           return mergeFrom((com.google.cloud.vision.v1.TextAnnotation.TextProperty)other);
@@ -2242,12 +2158,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.TextAnnotation.TextProperty
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2731,13 +2645,11 @@ public com.google.cloud.vision.v1.TextAnnotation.DetectedBreakOrBuilder getDetec
         }
         return detectedBreakBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -2759,12 +2671,11 @@ public static com.google.cloud.vision.v1.TextAnnotation.TextProperty getDefaultI
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public TextProperty parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new TextProperty(input, extensionRegistry);
+          return new TextProperty(input, extensionRegistry);
       }
     };
 
@@ -2777,7 +2688,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.TextAnnotation.TextProperty getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -2883,7 +2793,6 @@ public java.lang.String getText() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -2893,7 +2802,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < pages_.size(); i++) {
@@ -2905,7 +2813,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -3030,7 +2937,6 @@ public static com.google.cloud.vision.v1.TextAnnotation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -3038,7 +2944,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.TextAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -3072,7 +2977,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_TextAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_TextAnnotation_fieldAccessorTable
@@ -3096,7 +3000,6 @@ private void maybeForceBuilderInitialization() {
         getPagesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (pagesBuilder_ == null) {
@@ -3110,18 +3013,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_TextAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.TextAnnotation getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.TextAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.TextAnnotation build() {
       com.google.cloud.vision.v1.TextAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -3130,7 +3030,6 @@ public com.google.cloud.vision.v1.TextAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.TextAnnotation buildPartial() {
       com.google.cloud.vision.v1.TextAnnotation result = new com.google.cloud.vision.v1.TextAnnotation(this);
       int from_bitField0_ = bitField0_;
@@ -3150,39 +3049,32 @@ public com.google.cloud.vision.v1.TextAnnotation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.TextAnnotation) {
         return mergeFrom((com.google.cloud.vision.v1.TextAnnotation)other);
@@ -3229,12 +3121,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.TextAnnotation other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3654,13 +3544,11 @@ public Builder setTextBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -3682,12 +3570,11 @@ public static com.google.cloud.vision.v1.TextAnnotation getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TextAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TextAnnotation(input, extensionRegistry);
+        return new TextAnnotation(input, extensionRegistry);
     }
   };
 
@@ -3700,7 +3587,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.TextAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/TextAnnotationProto.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/TextAnnotationProto.java
index 6db2dc5a2c06..4896ccbb2cd8 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/TextAnnotationProto.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/TextAnnotationProto.java
@@ -77,7 +77,7 @@ public static void registerAllExtensions(
       "\rlanguage_code\030\001 \001(\t\022\022\n\nconfidence\030\002 \001(\002" +
       "\032\325\001\n\rDetectedBreak\022L\n\004type\030\001 \001(\0162>.googl" +
       "e.cloud.vision.v1.TextAnnotation.Detecte" +
-      "dBreak.BreakType\022\021\n\tis_prefix\030\002 \001(\010\"c\n\tB" +
+      "dBreak.BreakType\022\021\n\tis_prefix\030\002 \001(\010\"c\n\tB",
       "reakType\022\013\n\007UNKNOWN\020\000\022\t\n\005SPACE\020\001\022\016\n\nSURE" +
       "_SPACE\020\002\022\022\n\016EOL_SURE_SPACE\020\003\022\n\n\006HYPHEN\020\004" +
       "\022\016\n\nLINE_BREAK\020\005\032\261\001\n\014TextProperty\022S\n\022det" +
@@ -87,7 +87,7 @@ public static void registerAllExtensions(
       "sion.v1.TextAnnotation.DetectedBreak\"\257\001\n" +
       "\004Page\022E\n\010property\030\001 \001(\01323.google.cloud.v" +
       "ision.v1.TextAnnotation.TextProperty\022\r\n\005" +
-      "width\030\002 \001(\005\022\016\n\006height\030\003 \001(\005\022-\n\006blocks\030\004 " +
+      "width\030\002 \001(\005\022\016\n\006height\030\003 \001(\005\022-\n\006blocks\030\004 ",
       "\003(\0132\035.google.cloud.vision.v1.Block\022\022\n\nco" +
       "nfidence\030\005 \001(\002\"\346\002\n\005Block\022E\n\010property\030\001 \001" +
       "(\01323.google.cloud.vision.v1.TextAnnotati" +
@@ -97,7 +97,7 @@ public static void registerAllExtensions(
       ".Paragraph\022;\n\nblock_type\030\004 \001(\0162\'.google." +
       "cloud.vision.v1.Block.BlockType\022\022\n\nconfi" +
       "dence\030\005 \001(\002\"R\n\tBlockType\022\013\n\007UNKNOWN\020\000\022\010\n" +
-      "\004TEXT\020\001\022\t\n\005TABLE\020\002\022\013\n\007PICTURE\020\003\022\t\n\005RULER" +
+      "\004TEXT\020\001\022\t\n\005TABLE\020\002\022\013\n\007PICTURE\020\003\022\t\n\005RULER",
       "\020\004\022\013\n\007BARCODE\020\005\"\317\001\n\tParagraph\022E\n\010propert" +
       "y\030\001 \001(\01323.google.cloud.vision.v1.TextAnn" +
       "otation.TextProperty\022:\n\014bounding_box\030\002 \001" +
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "operty\030\001 \001(\01323.google.cloud.vision.v1.Te" +
       "xtAnnotation.TextProperty\022:\n\014bounding_bo" +
       "x\030\002 \001(\0132$.google.cloud.vision.v1.Boundin" +
-      "gPoly\022/\n\007symbols\030\003 \003(\0132\036.google.cloud.vi" +
+      "gPoly\022/\n\007symbols\030\003 \003(\0132\036.google.cloud.vi",
       "sion.v1.Symbol\022\022\n\nconfidence\030\004 \001(\002\"\255\001\n\006S" +
       "ymbol\022E\n\010property\030\001 \001(\01323.google.cloud.v" +
       "ision.v1.TextAnnotation.TextProperty\022:\n\014" +
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Vertex.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Vertex.java
index 443b22e745fe..d021cee489cb 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Vertex.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Vertex.java
@@ -35,9 +35,6 @@ private Vertex(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private Vertex(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
 
             x_ = input.readInt32();
@@ -59,13 +63,6 @@ private Vertex(
             y_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private Vertex(
     return com.google.cloud.vision.v1.GeometryProto.internal_static_google_cloud_vision_v1_Vertex_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.GeometryProto.internal_static_google_cloud_vision_v1_Vertex_fieldAccessorTable
@@ -118,7 +114,6 @@ public int getY() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -128,7 +123,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (x_ != 0) {
@@ -140,7 +134,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.cloud.vision.v1.Vertex parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.Vertex prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.GeometryProto.internal_static_google_cloud_vision_v1_Vertex_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.GeometryProto.internal_static_google_cloud_vision_v1_Vertex_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       x_ = 0;
@@ -334,18 +323,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.GeometryProto.internal_static_google_cloud_vision_v1_Vertex_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.Vertex getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.Vertex.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.Vertex build() {
       com.google.cloud.vision.v1.Vertex result = buildPartial();
       if (!result.isInitialized()) {
@@ -354,7 +340,6 @@ public com.google.cloud.vision.v1.Vertex build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.Vertex buildPartial() {
       com.google.cloud.vision.v1.Vertex result = new com.google.cloud.vision.v1.Vertex(this);
       result.x_ = x_;
@@ -363,39 +348,32 @@ public com.google.cloud.vision.v1.Vertex buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.Vertex) {
         return mergeFrom((com.google.cloud.vision.v1.Vertex)other);
@@ -418,12 +396,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.Vertex other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -517,13 +493,11 @@ public Builder clearY() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -545,12 +519,11 @@ public static com.google.cloud.vision.v1.Vertex getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Vertex parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Vertex(input, extensionRegistry);
+        return new Vertex(input, extensionRegistry);
     }
   };
 
@@ -563,7 +536,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.Vertex getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/WebDetection.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/WebDetection.java
index 81fa78395241..3f52389c3206 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/WebDetection.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/WebDetection.java
@@ -38,9 +38,6 @@ private WebDetection(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private WebDetection(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               webEntities_ = new java.util.ArrayList();
@@ -106,13 +110,6 @@ private WebDetection(
                 input.readMessage(com.google.cloud.vision.v1.WebDetection.WebLabel.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -148,7 +145,6 @@ private WebDetection(
     return com.google.cloud.vision.v1.WebDetectionProto.internal_static_google_cloud_vision_v1_WebDetection_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.WebDetectionProto.internal_static_google_cloud_vision_v1_WebDetection_fieldAccessorTable
@@ -238,9 +234,6 @@ private WebEntity(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -252,6 +245,13 @@ private WebEntity(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -269,13 +269,6 @@ private WebEntity(
               description_ = s;
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -293,7 +286,6 @@ private WebEntity(
       return com.google.cloud.vision.v1.WebDetectionProto.internal_static_google_cloud_vision_v1_WebDetection_WebEntity_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.WebDetectionProto.internal_static_google_cloud_vision_v1_WebDetection_WebEntity_fieldAccessorTable
@@ -400,7 +392,6 @@ public java.lang.String getDescription() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -410,7 +401,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getEntityIdBytes().isEmpty()) {
@@ -425,7 +415,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -558,7 +547,6 @@ public static com.google.cloud.vision.v1.WebDetection.WebEntity parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -566,7 +554,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1.WebDetection.WebEntity prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -594,7 +581,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1.WebDetectionProto.internal_static_google_cloud_vision_v1_WebDetection_WebEntity_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1.WebDetectionProto.internal_static_google_cloud_vision_v1_WebDetection_WebEntity_fieldAccessorTable
@@ -617,7 +603,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         entityId_ = "";
@@ -629,18 +614,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1.WebDetectionProto.internal_static_google_cloud_vision_v1_WebDetection_WebEntity_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1.WebDetection.WebEntity getDefaultInstanceForType() {
         return com.google.cloud.vision.v1.WebDetection.WebEntity.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1.WebDetection.WebEntity build() {
         com.google.cloud.vision.v1.WebDetection.WebEntity result = buildPartial();
         if (!result.isInitialized()) {
@@ -649,7 +631,6 @@ public com.google.cloud.vision.v1.WebDetection.WebEntity build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1.WebDetection.WebEntity buildPartial() {
         com.google.cloud.vision.v1.WebDetection.WebEntity result = new com.google.cloud.vision.v1.WebDetection.WebEntity(this);
         result.entityId_ = entityId_;
@@ -659,39 +640,32 @@ public com.google.cloud.vision.v1.WebDetection.WebEntity buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1.WebDetection.WebEntity) {
           return mergeFrom((com.google.cloud.vision.v1.WebDetection.WebEntity)other);
@@ -719,12 +693,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.WebDetection.WebEntity other
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -961,13 +933,11 @@ public Builder setDescriptionBytes(
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -989,12 +959,11 @@ public static com.google.cloud.vision.v1.WebDetection.WebEntity getDefaultInstan
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public WebEntity parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new WebEntity(input, extensionRegistry);
+          return new WebEntity(input, extensionRegistry);
       }
     };
 
@@ -1007,7 +976,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.WebDetection.WebEntity getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1076,9 +1044,6 @@ private WebImage(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1090,6 +1055,13 @@ private WebImage(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -1101,13 +1073,6 @@ private WebImage(
               score_ = input.readFloat();
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1125,7 +1090,6 @@ private WebImage(
       return com.google.cloud.vision.v1.WebDetectionProto.internal_static_google_cloud_vision_v1_WebDetection_WebImage_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.WebDetectionProto.internal_static_google_cloud_vision_v1_WebDetection_WebImage_fieldAccessorTable
@@ -1189,7 +1153,6 @@ public float getScore() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1199,7 +1162,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getUrlBytes().isEmpty()) {
@@ -1211,7 +1173,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -1337,7 +1298,6 @@ public static com.google.cloud.vision.v1.WebDetection.WebImage parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -1345,7 +1305,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1.WebDetection.WebImage prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -1373,7 +1332,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1.WebDetectionProto.internal_static_google_cloud_vision_v1_WebDetection_WebImage_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1.WebDetectionProto.internal_static_google_cloud_vision_v1_WebDetection_WebImage_fieldAccessorTable
@@ -1396,7 +1354,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         url_ = "";
@@ -1406,18 +1363,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1.WebDetectionProto.internal_static_google_cloud_vision_v1_WebDetection_WebImage_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1.WebDetection.WebImage getDefaultInstanceForType() {
         return com.google.cloud.vision.v1.WebDetection.WebImage.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1.WebDetection.WebImage build() {
         com.google.cloud.vision.v1.WebDetection.WebImage result = buildPartial();
         if (!result.isInitialized()) {
@@ -1426,7 +1380,6 @@ public com.google.cloud.vision.v1.WebDetection.WebImage build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1.WebDetection.WebImage buildPartial() {
         com.google.cloud.vision.v1.WebDetection.WebImage result = new com.google.cloud.vision.v1.WebDetection.WebImage(this);
         result.url_ = url_;
@@ -1435,39 +1388,32 @@ public com.google.cloud.vision.v1.WebDetection.WebImage buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1.WebDetection.WebImage) {
           return mergeFrom((com.google.cloud.vision.v1.WebDetection.WebImage)other);
@@ -1491,12 +1437,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.WebDetection.WebImage other)
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1641,13 +1585,11 @@ public Builder clearScore() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1669,12 +1611,11 @@ public static com.google.cloud.vision.v1.WebDetection.WebImage getDefaultInstanc
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public WebImage parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new WebImage(input, extensionRegistry);
+          return new WebImage(input, extensionRegistry);
       }
     };
 
@@ -1687,7 +1628,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.WebDetection.WebImage getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1885,9 +1825,6 @@ private WebPage(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1899,6 +1836,13 @@ private WebPage(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -1934,13 +1878,6 @@ private WebPage(
                   input.readMessage(com.google.cloud.vision.v1.WebDetection.WebImage.parser(), extensionRegistry));
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1964,7 +1901,6 @@ private WebPage(
       return com.google.cloud.vision.v1.WebDetectionProto.internal_static_google_cloud_vision_v1_WebDetection_WebPage_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.WebDetectionProto.internal_static_google_cloud_vision_v1_WebDetection_WebPage_fieldAccessorTable
@@ -2201,7 +2137,6 @@ public com.google.cloud.vision.v1.WebDetection.WebImageOrBuilder getPartialMatch
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -2211,7 +2146,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getUrlBytes().isEmpty()) {
@@ -2232,7 +2166,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -2385,7 +2318,6 @@ public static com.google.cloud.vision.v1.WebDetection.WebPage parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -2393,7 +2325,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1.WebDetection.WebPage prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -2421,7 +2352,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1.WebDetectionProto.internal_static_google_cloud_vision_v1_WebDetection_WebPage_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1.WebDetectionProto.internal_static_google_cloud_vision_v1_WebDetection_WebPage_fieldAccessorTable
@@ -2446,7 +2376,6 @@ private void maybeForceBuilderInitialization() {
           getPartialMatchingImagesFieldBuilder();
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         url_ = "";
@@ -2470,18 +2399,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1.WebDetectionProto.internal_static_google_cloud_vision_v1_WebDetection_WebPage_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1.WebDetection.WebPage getDefaultInstanceForType() {
         return com.google.cloud.vision.v1.WebDetection.WebPage.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1.WebDetection.WebPage build() {
         com.google.cloud.vision.v1.WebDetection.WebPage result = buildPartial();
         if (!result.isInitialized()) {
@@ -2490,7 +2416,6 @@ public com.google.cloud.vision.v1.WebDetection.WebPage build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1.WebDetection.WebPage buildPartial() {
         com.google.cloud.vision.v1.WebDetection.WebPage result = new com.google.cloud.vision.v1.WebDetection.WebPage(this);
         int from_bitField0_ = bitField0_;
@@ -2521,39 +2446,32 @@ public com.google.cloud.vision.v1.WebDetection.WebPage buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1.WebDetection.WebPage) {
           return mergeFrom((com.google.cloud.vision.v1.WebDetection.WebPage)other);
@@ -2633,12 +2551,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.WebDetection.WebPage other)
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3569,13 +3485,11 @@ public com.google.cloud.vision.v1.WebDetection.WebImage.Builder addPartialMatchi
         }
         return partialMatchingImagesBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -3597,12 +3511,11 @@ public static com.google.cloud.vision.v1.WebDetection.WebPage getDefaultInstance
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public WebPage parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new WebPage(input, extensionRegistry);
+          return new WebPage(input, extensionRegistry);
       }
     };
 
@@ -3615,7 +3528,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.WebDetection.WebPage getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -3697,9 +3609,6 @@ private WebLabel(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3711,6 +3620,13 @@ private WebLabel(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -3723,13 +3639,6 @@ private WebLabel(
               languageCode_ = s;
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -3747,7 +3656,6 @@ private WebLabel(
       return com.google.cloud.vision.v1.WebDetectionProto.internal_static_google_cloud_vision_v1_WebDetection_WebLabel_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.WebDetectionProto.internal_static_google_cloud_vision_v1_WebDetection_WebLabel_fieldAccessorTable
@@ -3844,7 +3752,6 @@ public java.lang.String getLanguageCode() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -3854,7 +3761,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getLabelBytes().isEmpty()) {
@@ -3866,7 +3772,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -3988,7 +3893,6 @@ public static com.google.cloud.vision.v1.WebDetection.WebLabel parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -3996,7 +3900,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1.WebDetection.WebLabel prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -4024,7 +3927,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1.WebDetectionProto.internal_static_google_cloud_vision_v1_WebDetection_WebLabel_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1.WebDetectionProto.internal_static_google_cloud_vision_v1_WebDetection_WebLabel_fieldAccessorTable
@@ -4047,7 +3949,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         label_ = "";
@@ -4057,18 +3958,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1.WebDetectionProto.internal_static_google_cloud_vision_v1_WebDetection_WebLabel_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1.WebDetection.WebLabel getDefaultInstanceForType() {
         return com.google.cloud.vision.v1.WebDetection.WebLabel.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1.WebDetection.WebLabel build() {
         com.google.cloud.vision.v1.WebDetection.WebLabel result = buildPartial();
         if (!result.isInitialized()) {
@@ -4077,7 +3975,6 @@ public com.google.cloud.vision.v1.WebDetection.WebLabel build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1.WebDetection.WebLabel buildPartial() {
         com.google.cloud.vision.v1.WebDetection.WebLabel result = new com.google.cloud.vision.v1.WebDetection.WebLabel(this);
         result.label_ = label_;
@@ -4086,39 +3983,32 @@ public com.google.cloud.vision.v1.WebDetection.WebLabel buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1.WebDetection.WebLabel) {
           return mergeFrom((com.google.cloud.vision.v1.WebDetection.WebLabel)other);
@@ -4143,12 +4033,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.WebDetection.WebLabel other)
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4354,13 +4242,11 @@ public Builder setLanguageCodeBytes(
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -4382,12 +4268,11 @@ public static com.google.cloud.vision.v1.WebDetection.WebLabel getDefaultInstanc
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public WebLabel parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new WebLabel(input, extensionRegistry);
+          return new WebLabel(input, extensionRegistry);
       }
     };
 
@@ -4400,7 +4285,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.WebDetection.WebLabel getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -4753,7 +4637,6 @@ public com.google.cloud.vision.v1.WebDetection.WebLabelOrBuilder getBestGuessLab
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -4763,7 +4646,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < webEntities_.size(); i++) {
@@ -4787,7 +4669,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -4955,7 +4836,6 @@ public static com.google.cloud.vision.v1.WebDetection parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -4963,7 +4843,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.WebDetection prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -4991,7 +4870,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.WebDetectionProto.internal_static_google_cloud_vision_v1_WebDetection_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.WebDetectionProto.internal_static_google_cloud_vision_v1_WebDetection_fieldAccessorTable
@@ -5020,7 +4898,6 @@ private void maybeForceBuilderInitialization() {
         getBestGuessLabelsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (webEntitiesBuilder_ == null) {
@@ -5062,18 +4939,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.WebDetectionProto.internal_static_google_cloud_vision_v1_WebDetection_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.WebDetection getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.WebDetection.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.WebDetection build() {
       com.google.cloud.vision.v1.WebDetection result = buildPartial();
       if (!result.isInitialized()) {
@@ -5082,7 +4956,6 @@ public com.google.cloud.vision.v1.WebDetection build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.WebDetection buildPartial() {
       com.google.cloud.vision.v1.WebDetection result = new com.google.cloud.vision.v1.WebDetection(this);
       int from_bitField0_ = bitField0_;
@@ -5144,39 +5017,32 @@ public com.google.cloud.vision.v1.WebDetection buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.WebDetection) {
         return mergeFrom((com.google.cloud.vision.v1.WebDetection)other);
@@ -5349,12 +5215,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.WebDetection other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -7299,13 +7163,11 @@ public com.google.cloud.vision.v1.WebDetection.WebLabel.Builder addBestGuessLabe
       }
       return bestGuessLabelsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -7327,12 +7189,11 @@ public static com.google.cloud.vision.v1.WebDetection getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public WebDetection parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WebDetection(input, extensionRegistry);
+        return new WebDetection(input, extensionRegistry);
     }
   };
 
@@ -7345,7 +7206,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.WebDetection getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/WebDetectionParams.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/WebDetectionParams.java
index f44e8691de52..1974745f6507 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/WebDetectionParams.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/WebDetectionParams.java
@@ -33,9 +33,6 @@ private WebDetectionParams(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,11 +44,6 @@ private WebDetectionParams(
           case 0:
             done = true;
             break;
-          case 16: {
-
-            includeGeoResults_ = input.readBool();
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -59,6 +51,11 @@ private WebDetectionParams(
             }
             break;
           }
+          case 16: {
+
+            includeGeoResults_ = input.readBool();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -76,7 +73,6 @@ private WebDetectionParams(
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_WebDetectionParams_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_WebDetectionParams_fieldAccessorTable
@@ -98,7 +94,6 @@ public boolean getIncludeGeoResults() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -108,7 +103,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (includeGeoResults_ != false) {
@@ -117,7 +111,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -234,7 +227,6 @@ public static com.google.cloud.vision.v1.WebDetectionParams parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -242,7 +234,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.WebDetectionParams prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -270,7 +261,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_WebDetectionParams_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_WebDetectionParams_fieldAccessorTable
@@ -293,7 +283,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       includeGeoResults_ = false;
@@ -301,18 +290,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1_WebDetectionParams_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.WebDetectionParams getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.WebDetectionParams.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.WebDetectionParams build() {
       com.google.cloud.vision.v1.WebDetectionParams result = buildPartial();
       if (!result.isInitialized()) {
@@ -321,7 +307,6 @@ public com.google.cloud.vision.v1.WebDetectionParams build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.WebDetectionParams buildPartial() {
       com.google.cloud.vision.v1.WebDetectionParams result = new com.google.cloud.vision.v1.WebDetectionParams(this);
       result.includeGeoResults_ = includeGeoResults_;
@@ -329,39 +314,32 @@ public com.google.cloud.vision.v1.WebDetectionParams buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.WebDetectionParams) {
         return mergeFrom((com.google.cloud.vision.v1.WebDetectionParams)other);
@@ -381,12 +359,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.WebDetectionParams other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -442,13 +418,11 @@ public Builder clearIncludeGeoResults() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -470,12 +444,11 @@ public static com.google.cloud.vision.v1.WebDetectionParams getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public WebDetectionParams parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WebDetectionParams(input, extensionRegistry);
+        return new WebDetectionParams(input, extensionRegistry);
     }
   };
 
@@ -488,7 +461,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.WebDetectionParams getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/WebDetectionProto.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/WebDetectionProto.java
index b133edede78a..ffa63760b2ae 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/WebDetectionProto.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/WebDetectionProto.java
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       ".WebDetection.WebImage\022N\n\027partial_matchi" +
       "ng_images\030\003 \003(\0132-.google.cloud.vision.v1" +
       ".WebDetection.WebImage\022P\n\032pages_with_mat" +
-      "ching_images\030\004 \003(\0132,.google.cloud.vision" +
+      "ching_images\030\004 \003(\0132,.google.cloud.vision",
       ".v1.WebDetection.WebPage\022N\n\027visually_sim" +
       "ilar_images\030\006 \003(\0132-.google.cloud.vision." +
       "v1.WebDetection.WebImage\022H\n\021best_guess_l" +
@@ -67,7 +67,7 @@ public static void registerAllExtensions(
       "\030\003 \001(\t\032&\n\010WebImage\022\013\n\003url\030\001 \001(\t\022\r\n\005score" +
       "\030\002 \001(\002\032\326\001\n\007WebPage\022\013\n\003url\030\001 \001(\t\022\r\n\005score" +
       "\030\002 \001(\002\022\022\n\npage_title\030\003 \001(\t\022K\n\024full_match" +
-      "ing_images\030\004 \003(\0132-.google.cloud.vision.v" +
+      "ing_images\030\004 \003(\0132-.google.cloud.vision.v",
       "1.WebDetection.WebImage\022N\n\027partial_match" +
       "ing_images\030\005 \003(\0132-.google.cloud.vision.v" +
       "1.WebDetection.WebImage\0320\n\010WebLabel\022\r\n\005l" +
diff --git a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Word.java b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Word.java
index 21e0d717abf4..b2eb5c24b0e3 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Word.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1/src/main/java/com/google/cloud/vision/v1/Word.java
@@ -34,9 +34,6 @@ private Word(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private Word(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1.TextAnnotation.TextProperty.Builder subBuilder = null;
             if (property_ != null) {
@@ -88,13 +92,6 @@ private Word(
             confidence_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -115,7 +112,6 @@ private Word(
     return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_Word_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_Word_fieldAccessorTable
@@ -306,7 +302,6 @@ public float getConfidence() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -316,7 +311,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (property_ != null) {
@@ -334,7 +328,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -489,7 +482,6 @@ public static com.google.cloud.vision.v1.Word parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -497,7 +489,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1.Word prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -525,7 +516,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_Word_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_Word_fieldAccessorTable
@@ -549,7 +539,6 @@ private void maybeForceBuilderInitialization() {
         getSymbolsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (propertyBuilder_ == null) {
@@ -575,18 +564,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1.TextAnnotationProto.internal_static_google_cloud_vision_v1_Word_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.Word getDefaultInstanceForType() {
       return com.google.cloud.vision.v1.Word.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.Word build() {
       com.google.cloud.vision.v1.Word result = buildPartial();
       if (!result.isInitialized()) {
@@ -595,7 +581,6 @@ public com.google.cloud.vision.v1.Word build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1.Word buildPartial() {
       com.google.cloud.vision.v1.Word result = new com.google.cloud.vision.v1.Word(this);
       int from_bitField0_ = bitField0_;
@@ -625,39 +610,32 @@ public com.google.cloud.vision.v1.Word buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1.Word) {
         return mergeFrom((com.google.cloud.vision.v1.Word)other);
@@ -709,12 +687,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1.Word other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1533,13 +1509,11 @@ public Builder clearConfidence() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1561,12 +1535,11 @@ public static com.google.cloud.vision.v1.Word getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Word parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Word(input, extensionRegistry);
+        return new Word(input, extensionRegistry);
     }
   };
 
@@ -1579,7 +1552,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1.Word getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/AnnotateImageRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/AnnotateImageRequest.java
index 5b39f867059d..7178f2354c8a 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/AnnotateImageRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/AnnotateImageRequest.java
@@ -34,9 +34,6 @@ private AnnotateImageRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private AnnotateImageRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p1beta1.Image.Builder subBuilder = null;
             if (image_ != null) {
@@ -83,13 +87,6 @@ private AnnotateImageRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -110,7 +107,6 @@ private AnnotateImageRequest(
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_AnnotateImageRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_AnnotateImageRequest_fieldAccessorTable
@@ -241,7 +237,6 @@ public com.google.cloud.vision.v1p1beta1.ImageContextOrBuilder getImageContextOr
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -251,7 +246,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (image_ != null) {
@@ -266,7 +260,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -410,7 +403,6 @@ public static com.google.cloud.vision.v1p1beta1.AnnotateImageRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -418,7 +410,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.AnnotateImageRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -447,7 +438,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_AnnotateImageRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_AnnotateImageRequest_fieldAccessorTable
@@ -471,7 +461,6 @@ private void maybeForceBuilderInitialization() {
         getFeaturesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (imageBuilder_ == null) {
@@ -495,18 +484,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_AnnotateImageRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.AnnotateImageRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p1beta1.AnnotateImageRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.AnnotateImageRequest build() {
       com.google.cloud.vision.v1p1beta1.AnnotateImageRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -515,7 +501,6 @@ public com.google.cloud.vision.v1p1beta1.AnnotateImageRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.AnnotateImageRequest buildPartial() {
       com.google.cloud.vision.v1p1beta1.AnnotateImageRequest result = new com.google.cloud.vision.v1p1beta1.AnnotateImageRequest(this);
       int from_bitField0_ = bitField0_;
@@ -544,39 +529,32 @@ public com.google.cloud.vision.v1p1beta1.AnnotateImageRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p1beta1.AnnotateImageRequest) {
         return mergeFrom((com.google.cloud.vision.v1p1beta1.AnnotateImageRequest)other);
@@ -625,12 +603,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.AnnotateImageRequest
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1267,13 +1243,11 @@ public com.google.cloud.vision.v1p1beta1.ImageContextOrBuilder getImageContextOr
       }
       return imageContextBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1295,12 +1269,11 @@ public static com.google.cloud.vision.v1p1beta1.AnnotateImageRequest getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnnotateImageRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateImageRequest(input, extensionRegistry);
+        return new AnnotateImageRequest(input, extensionRegistry);
     }
   };
 
@@ -1313,7 +1286,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p1beta1.AnnotateImageRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/AnnotateImageResponse.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/AnnotateImageResponse.java
index b86b1ba16c99..0ff690ddecc6 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/AnnotateImageResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/AnnotateImageResponse.java
@@ -37,9 +37,6 @@ private AnnotateImageResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private AnnotateImageResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               faceAnnotations_ = new java.util.ArrayList();
@@ -174,13 +178,6 @@ private AnnotateImageResponse(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -213,7 +210,6 @@ private AnnotateImageResponse(
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_AnnotateImageResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_AnnotateImageResponse_fieldAccessorTable
@@ -711,7 +707,6 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -721,7 +716,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < faceAnnotations_.size(); i++) {
@@ -760,7 +754,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -996,7 +989,6 @@ public static com.google.cloud.vision.v1p1beta1.AnnotateImageResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1004,7 +996,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.AnnotateImageResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1032,7 +1023,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_AnnotateImageResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_AnnotateImageResponse_fieldAccessorTable
@@ -1060,7 +1050,6 @@ private void maybeForceBuilderInitialization() {
         getTextAnnotationsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (faceAnnotationsBuilder_ == null) {
@@ -1132,18 +1121,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_AnnotateImageResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.AnnotateImageResponse getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p1beta1.AnnotateImageResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.AnnotateImageResponse build() {
       com.google.cloud.vision.v1p1beta1.AnnotateImageResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -1152,7 +1138,6 @@ public com.google.cloud.vision.v1p1beta1.AnnotateImageResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.AnnotateImageResponse buildPartial() {
       com.google.cloud.vision.v1p1beta1.AnnotateImageResponse result = new com.google.cloud.vision.v1p1beta1.AnnotateImageResponse(this);
       int from_bitField0_ = bitField0_;
@@ -1237,39 +1222,32 @@ public com.google.cloud.vision.v1p1beta1.AnnotateImageResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p1beta1.AnnotateImageResponse) {
         return mergeFrom((com.google.cloud.vision.v1p1beta1.AnnotateImageResponse)other);
@@ -1434,12 +1412,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.AnnotateImageResponse
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3981,13 +3957,11 @@ public com.google.rpc.StatusOrBuilder getErrorOrBuilder() {
       }
       return errorBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -4009,12 +3983,11 @@ public static com.google.cloud.vision.v1p1beta1.AnnotateImageResponse getDefault
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnnotateImageResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateImageResponse(input, extensionRegistry);
+        return new AnnotateImageResponse(input, extensionRegistry);
     }
   };
 
@@ -4027,7 +4000,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p1beta1.AnnotateImageResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/BatchAnnotateImagesRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/BatchAnnotateImagesRequest.java
index e3a0587c0a0d..a3f36986a050 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/BatchAnnotateImagesRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/BatchAnnotateImagesRequest.java
@@ -33,9 +33,6 @@ private BatchAnnotateImagesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private BatchAnnotateImagesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               requests_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private BatchAnnotateImagesRequest(
                 input.readMessage(com.google.cloud.vision.v1p1beta1.AnnotateImageRequest.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private BatchAnnotateImagesRequest(
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_BatchAnnotateImagesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_BatchAnnotateImagesRequest_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.cloud.vision.v1p1beta1.AnnotateImageRequestOrBuilder getReques
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < requests_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesRequest parse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_BatchAnnotateImagesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_BatchAnnotateImagesRequest_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getRequestsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (requestsBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_BatchAnnotateImagesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesRequest build() {
       com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesRequest buildPartial() {
       com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesRequest result = new com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesRequest(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesRequest buildPartial
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesRequest) {
         return mergeFrom((com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesRequest)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesRe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.cloud.vision.v1p1beta1.AnnotateImageRequest.Builder addRequest
       }
       return requestsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesRequest getDe
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BatchAnnotateImagesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchAnnotateImagesRequest(input, extensionRegistry);
+        return new BatchAnnotateImagesRequest(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/BatchAnnotateImagesResponse.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/BatchAnnotateImagesResponse.java
index 6138c9bd25f0..34d317c8e857 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/BatchAnnotateImagesResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/BatchAnnotateImagesResponse.java
@@ -33,9 +33,6 @@ private BatchAnnotateImagesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private BatchAnnotateImagesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               responses_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private BatchAnnotateImagesResponse(
                 input.readMessage(com.google.cloud.vision.v1p1beta1.AnnotateImageResponse.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private BatchAnnotateImagesResponse(
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_BatchAnnotateImagesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_BatchAnnotateImagesResponse_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.cloud.vision.v1p1beta1.AnnotateImageResponseOrBuilder getRespo
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < responses_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesResponse pars
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_BatchAnnotateImagesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_BatchAnnotateImagesResponse_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getResponsesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (responsesBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_BatchAnnotateImagesResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesResponse getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesResponse build() {
       com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesResponse buildPartial() {
       com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesResponse result = new com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesResponse buildPartia
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesResponse) {
         return mergeFrom((com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesResponse)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesRe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.cloud.vision.v1p1beta1.AnnotateImageResponse.Builder addRespon
       }
       return responsesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesResponse getD
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BatchAnnotateImagesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchAnnotateImagesResponse(input, extensionRegistry);
+        return new BatchAnnotateImagesResponse(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType(
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p1beta1.BatchAnnotateImagesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Block.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Block.java
index 611984bab30a..0d1f9f374e3f 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Block.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Block.java
@@ -35,9 +35,6 @@ private Block(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private Block(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p1beta1.TextAnnotation.TextProperty.Builder subBuilder = null;
             if (property_ != null) {
@@ -95,13 +99,6 @@ private Block(
             confidence_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -122,7 +119,6 @@ private Block(
     return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_Block_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_Block_fieldAccessorTable
@@ -500,7 +496,6 @@ public int getBlockTypeValue() {
    * .google.cloud.vision.v1p1beta1.Block.BlockType block_type = 4;
    */
   public com.google.cloud.vision.v1p1beta1.Block.BlockType getBlockType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p1beta1.Block.BlockType result = com.google.cloud.vision.v1p1beta1.Block.BlockType.valueOf(blockType_);
     return result == null ? com.google.cloud.vision.v1p1beta1.Block.BlockType.UNRECOGNIZED : result;
   }
@@ -519,7 +514,6 @@ public float getConfidence() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -529,7 +523,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (property_ != null) {
@@ -550,7 +543,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -712,7 +704,6 @@ public static com.google.cloud.vision.v1p1beta1.Block parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -720,7 +711,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.Block prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -748,7 +738,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_Block_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_Block_fieldAccessorTable
@@ -772,7 +761,6 @@ private void maybeForceBuilderInitialization() {
         getParagraphsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (propertyBuilder_ == null) {
@@ -800,18 +788,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_Block_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.Block getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p1beta1.Block.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.Block build() {
       com.google.cloud.vision.v1p1beta1.Block result = buildPartial();
       if (!result.isInitialized()) {
@@ -820,7 +805,6 @@ public com.google.cloud.vision.v1p1beta1.Block build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.Block buildPartial() {
       com.google.cloud.vision.v1p1beta1.Block result = new com.google.cloud.vision.v1p1beta1.Block(this);
       int from_bitField0_ = bitField0_;
@@ -851,39 +835,32 @@ public com.google.cloud.vision.v1p1beta1.Block buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p1beta1.Block) {
         return mergeFrom((com.google.cloud.vision.v1p1beta1.Block)other);
@@ -938,12 +915,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.Block other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1738,7 +1713,6 @@ public Builder setBlockTypeValue(int value) {
      * .google.cloud.vision.v1p1beta1.Block.BlockType block_type = 4;
      */
     public com.google.cloud.vision.v1p1beta1.Block.BlockType getBlockType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p1beta1.Block.BlockType result = com.google.cloud.vision.v1p1beta1.Block.BlockType.valueOf(blockType_);
       return result == null ? com.google.cloud.vision.v1p1beta1.Block.BlockType.UNRECOGNIZED : result;
     }
@@ -1809,13 +1783,11 @@ public Builder clearConfidence() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1837,12 +1809,11 @@ public static com.google.cloud.vision.v1p1beta1.Block getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Block parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Block(input, extensionRegistry);
+        return new Block(input, extensionRegistry);
     }
   };
 
@@ -1855,7 +1826,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p1beta1.Block getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/BoundingPoly.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/BoundingPoly.java
index 78e365eb7dc0..f762fd926a0e 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/BoundingPoly.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/BoundingPoly.java
@@ -33,9 +33,6 @@ private BoundingPoly(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private BoundingPoly(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               vertices_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private BoundingPoly(
                 input.readMessage(com.google.cloud.vision.v1p1beta1.Vertex.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private BoundingPoly(
     return com.google.cloud.vision.v1p1beta1.GeometryProto.internal_static_google_cloud_vision_v1p1beta1_BoundingPoly_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p1beta1.GeometryProto.internal_static_google_cloud_vision_v1p1beta1_BoundingPoly_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.cloud.vision.v1p1beta1.VertexOrBuilder getVerticesOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < vertices_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.vision.v1p1beta1.BoundingPoly parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.BoundingPoly prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p1beta1.GeometryProto.internal_static_google_cloud_vision_v1p1beta1_BoundingPoly_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.GeometryProto.internal_static_google_cloud_vision_v1p1beta1_BoundingPoly_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getVerticesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (verticesBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p1beta1.GeometryProto.internal_static_google_cloud_vision_v1p1beta1_BoundingPoly_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.BoundingPoly getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p1beta1.BoundingPoly.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.BoundingPoly build() {
       com.google.cloud.vision.v1p1beta1.BoundingPoly result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.cloud.vision.v1p1beta1.BoundingPoly build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.BoundingPoly buildPartial() {
       com.google.cloud.vision.v1p1beta1.BoundingPoly result = new com.google.cloud.vision.v1p1beta1.BoundingPoly(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.cloud.vision.v1p1beta1.BoundingPoly buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p1beta1.BoundingPoly) {
         return mergeFrom((com.google.cloud.vision.v1p1beta1.BoundingPoly)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.BoundingPoly other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.cloud.vision.v1p1beta1.Vertex.Builder addVerticesBuilder(
       }
       return verticesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.cloud.vision.v1p1beta1.BoundingPoly getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BoundingPoly parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BoundingPoly(input, extensionRegistry);
+        return new BoundingPoly(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p1beta1.BoundingPoly getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ColorInfo.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ColorInfo.java
index c1f72c800392..985c0e034713 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ColorInfo.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ColorInfo.java
@@ -35,9 +35,6 @@ private ColorInfo(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ColorInfo(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.type.Color.Builder subBuilder = null;
             if (color_ != null) {
@@ -72,13 +76,6 @@ private ColorInfo(
             pixelFraction_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private ColorInfo(
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_ColorInfo_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_ColorInfo_fieldAccessorTable
@@ -165,7 +161,6 @@ public float getPixelFraction() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -175,7 +170,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (color_ != null) {
@@ -190,7 +184,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -333,7 +326,6 @@ public static com.google.cloud.vision.v1p1beta1.ColorInfo parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -341,7 +333,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.ColorInfo prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -370,7 +361,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_ColorInfo_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_ColorInfo_fieldAccessorTable
@@ -393,7 +383,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (colorBuilder_ == null) {
@@ -409,18 +398,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_ColorInfo_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.ColorInfo getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p1beta1.ColorInfo.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.ColorInfo build() {
       com.google.cloud.vision.v1p1beta1.ColorInfo result = buildPartial();
       if (!result.isInitialized()) {
@@ -429,7 +415,6 @@ public com.google.cloud.vision.v1p1beta1.ColorInfo build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.ColorInfo buildPartial() {
       com.google.cloud.vision.v1p1beta1.ColorInfo result = new com.google.cloud.vision.v1p1beta1.ColorInfo(this);
       if (colorBuilder_ == null) {
@@ -443,39 +428,32 @@ public com.google.cloud.vision.v1p1beta1.ColorInfo buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p1beta1.ColorInfo) {
         return mergeFrom((com.google.cloud.vision.v1p1beta1.ColorInfo)other);
@@ -501,12 +479,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.ColorInfo other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -756,13 +732,11 @@ public Builder clearPixelFraction() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -784,12 +758,11 @@ public static com.google.cloud.vision.v1p1beta1.ColorInfo getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ColorInfo parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ColorInfo(input, extensionRegistry);
+        return new ColorInfo(input, extensionRegistry);
     }
   };
 
@@ -802,7 +775,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p1beta1.ColorInfo getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/CropHint.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/CropHint.java
index 9c5e085ae6b4..1be308ee32f5 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/CropHint.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/CropHint.java
@@ -34,9 +34,6 @@ private CropHint(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private CropHint(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p1beta1.BoundingPoly.Builder subBuilder = null;
             if (boundingPoly_ != null) {
@@ -71,13 +75,6 @@ private CropHint(
             importanceFraction_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -95,7 +92,6 @@ private CropHint(
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_CropHint_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_CropHint_fieldAccessorTable
@@ -167,7 +163,6 @@ public float getImportanceFraction() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -177,7 +172,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (boundingPoly_ != null) {
@@ -192,7 +186,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -335,7 +328,6 @@ public static com.google.cloud.vision.v1p1beta1.CropHint parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -343,7 +335,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.CropHint prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -371,7 +362,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_CropHint_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_CropHint_fieldAccessorTable
@@ -394,7 +384,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (boundingPolyBuilder_ == null) {
@@ -410,18 +399,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_CropHint_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.CropHint getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p1beta1.CropHint.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.CropHint build() {
       com.google.cloud.vision.v1p1beta1.CropHint result = buildPartial();
       if (!result.isInitialized()) {
@@ -430,7 +416,6 @@ public com.google.cloud.vision.v1p1beta1.CropHint build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.CropHint buildPartial() {
       com.google.cloud.vision.v1p1beta1.CropHint result = new com.google.cloud.vision.v1p1beta1.CropHint(this);
       if (boundingPolyBuilder_ == null) {
@@ -444,39 +429,32 @@ public com.google.cloud.vision.v1p1beta1.CropHint buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p1beta1.CropHint) {
         return mergeFrom((com.google.cloud.vision.v1p1beta1.CropHint)other);
@@ -502,12 +480,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.CropHint other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -766,13 +742,11 @@ public Builder clearImportanceFraction() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -794,12 +768,11 @@ public static com.google.cloud.vision.v1p1beta1.CropHint getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CropHint parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CropHint(input, extensionRegistry);
+        return new CropHint(input, extensionRegistry);
     }
   };
 
@@ -812,7 +785,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p1beta1.CropHint getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/CropHintsAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/CropHintsAnnotation.java
index 0642dc642388..856f01da2396 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/CropHintsAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/CropHintsAnnotation.java
@@ -33,9 +33,6 @@ private CropHintsAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private CropHintsAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               cropHints_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private CropHintsAnnotation(
                 input.readMessage(com.google.cloud.vision.v1p1beta1.CropHint.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private CropHintsAnnotation(
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_CropHintsAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_CropHintsAnnotation_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.cloud.vision.v1p1beta1.CropHintOrBuilder getCropHintsOrBuilder
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < cropHints_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.vision.v1p1beta1.CropHintsAnnotation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.CropHintsAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_CropHintsAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_CropHintsAnnotation_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getCropHintsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (cropHintsBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_CropHintsAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.CropHintsAnnotation getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p1beta1.CropHintsAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.CropHintsAnnotation build() {
       com.google.cloud.vision.v1p1beta1.CropHintsAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.cloud.vision.v1p1beta1.CropHintsAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.CropHintsAnnotation buildPartial() {
       com.google.cloud.vision.v1p1beta1.CropHintsAnnotation result = new com.google.cloud.vision.v1p1beta1.CropHintsAnnotation(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.cloud.vision.v1p1beta1.CropHintsAnnotation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p1beta1.CropHintsAnnotation) {
         return mergeFrom((com.google.cloud.vision.v1p1beta1.CropHintsAnnotation)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.CropHintsAnnotation o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.cloud.vision.v1p1beta1.CropHint.Builder addCropHintsBuilder(
       }
       return cropHintsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.cloud.vision.v1p1beta1.CropHintsAnnotation getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CropHintsAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CropHintsAnnotation(input, extensionRegistry);
+        return new CropHintsAnnotation(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p1beta1.CropHintsAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/CropHintsParams.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/CropHintsParams.java
index da8fd1b3d9a9..0db9cbdb97c7 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/CropHintsParams.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/CropHintsParams.java
@@ -33,9 +33,6 @@ private CropHintsParams(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private CropHintsParams(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 13: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               aspectRatios_ = new java.util.ArrayList();
@@ -68,13 +72,6 @@ private CropHintsParams(
             input.popLimit(limit);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -95,7 +92,6 @@ private CropHintsParams(
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_CropHintsParams_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_CropHintsParams_fieldAccessorTable
@@ -154,7 +150,6 @@ public float getAspectRatios(int index) {
   private int aspectRatiosMemoizedSerializedSize = -1;
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -164,7 +159,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     getSerializedSize();
@@ -178,7 +172,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -303,7 +296,6 @@ public static com.google.cloud.vision.v1p1beta1.CropHintsParams parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -311,7 +303,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.CropHintsParams prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -339,7 +330,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_CropHintsParams_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_CropHintsParams_fieldAccessorTable
@@ -362,7 +352,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       aspectRatios_ = java.util.Collections.emptyList();
@@ -370,18 +359,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_CropHintsParams_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.CropHintsParams getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p1beta1.CropHintsParams.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.CropHintsParams build() {
       com.google.cloud.vision.v1p1beta1.CropHintsParams result = buildPartial();
       if (!result.isInitialized()) {
@@ -390,7 +376,6 @@ public com.google.cloud.vision.v1p1beta1.CropHintsParams build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.CropHintsParams buildPartial() {
       com.google.cloud.vision.v1p1beta1.CropHintsParams result = new com.google.cloud.vision.v1p1beta1.CropHintsParams(this);
       int from_bitField0_ = bitField0_;
@@ -403,39 +388,32 @@ public com.google.cloud.vision.v1p1beta1.CropHintsParams buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p1beta1.CropHintsParams) {
         return mergeFrom((com.google.cloud.vision.v1p1beta1.CropHintsParams)other);
@@ -462,12 +440,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.CropHintsParams other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -615,13 +591,11 @@ public Builder clearAspectRatios() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -643,12 +617,11 @@ public static com.google.cloud.vision.v1p1beta1.CropHintsParams getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CropHintsParams parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CropHintsParams(input, extensionRegistry);
+        return new CropHintsParams(input, extensionRegistry);
     }
   };
 
@@ -661,7 +634,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p1beta1.CropHintsParams getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/DominantColorsAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/DominantColorsAnnotation.java
index 429a548f232a..7a3d79c416c9 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/DominantColorsAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/DominantColorsAnnotation.java
@@ -33,9 +33,6 @@ private DominantColorsAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private DominantColorsAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               colors_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private DominantColorsAnnotation(
                 input.readMessage(com.google.cloud.vision.v1p1beta1.ColorInfo.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private DominantColorsAnnotation(
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_DominantColorsAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_DominantColorsAnnotation_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.cloud.vision.v1p1beta1.ColorInfoOrBuilder getColorsOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < colors_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.vision.v1p1beta1.DominantColorsAnnotation parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.DominantColorsAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_DominantColorsAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_DominantColorsAnnotation_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getColorsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (colorsBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_DominantColorsAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.DominantColorsAnnotation getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p1beta1.DominantColorsAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.DominantColorsAnnotation build() {
       com.google.cloud.vision.v1p1beta1.DominantColorsAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.cloud.vision.v1p1beta1.DominantColorsAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.DominantColorsAnnotation buildPartial() {
       com.google.cloud.vision.v1p1beta1.DominantColorsAnnotation result = new com.google.cloud.vision.v1p1beta1.DominantColorsAnnotation(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.cloud.vision.v1p1beta1.DominantColorsAnnotation buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p1beta1.DominantColorsAnnotation) {
         return mergeFrom((com.google.cloud.vision.v1p1beta1.DominantColorsAnnotation)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.DominantColorsAnnotat
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.cloud.vision.v1p1beta1.ColorInfo.Builder addColorsBuilder(
       }
       return colorsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.cloud.vision.v1p1beta1.DominantColorsAnnotation getDefa
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DominantColorsAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DominantColorsAnnotation(input, extensionRegistry);
+        return new DominantColorsAnnotation(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p1beta1.DominantColorsAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/EntityAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/EntityAnnotation.java
index 9820c86ca6df..150fd5ec803d 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/EntityAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/EntityAnnotation.java
@@ -40,9 +40,6 @@ private EntityAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -54,6 +51,13 @@ private EntityAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -118,13 +122,6 @@ private EntityAnnotation(
                 input.readMessage(com.google.cloud.vision.v1p1beta1.Property.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -148,7 +145,6 @@ private EntityAnnotation(
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_EntityAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_EntityAnnotation_fieldAccessorTable
@@ -505,7 +501,6 @@ public com.google.cloud.vision.v1p1beta1.PropertyOrBuilder getPropertiesOrBuilde
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -515,7 +510,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getMidBytes().isEmpty()) {
@@ -548,7 +542,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -743,7 +736,6 @@ public static com.google.cloud.vision.v1p1beta1.EntityAnnotation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -751,7 +743,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.EntityAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -779,7 +770,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_EntityAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_EntityAnnotation_fieldAccessorTable
@@ -804,7 +794,6 @@ private void maybeForceBuilderInitialization() {
         getPropertiesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       mid_ = "";
@@ -840,18 +829,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_EntityAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.EntityAnnotation getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p1beta1.EntityAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.EntityAnnotation build() {
       com.google.cloud.vision.v1p1beta1.EntityAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -860,7 +846,6 @@ public com.google.cloud.vision.v1p1beta1.EntityAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.EntityAnnotation buildPartial() {
       com.google.cloud.vision.v1p1beta1.EntityAnnotation result = new com.google.cloud.vision.v1p1beta1.EntityAnnotation(this);
       int from_bitField0_ = bitField0_;
@@ -899,39 +884,32 @@ public com.google.cloud.vision.v1p1beta1.EntityAnnotation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p1beta1.EntityAnnotation) {
         return mergeFrom((com.google.cloud.vision.v1p1beta1.EntityAnnotation)other);
@@ -1024,12 +1002,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.EntityAnnotation othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2336,13 +2312,11 @@ public com.google.cloud.vision.v1p1beta1.Property.Builder addPropertiesBuilder(
       }
       return propertiesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2364,12 +2338,11 @@ public static com.google.cloud.vision.v1p1beta1.EntityAnnotation getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public EntityAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new EntityAnnotation(input, extensionRegistry);
+        return new EntityAnnotation(input, extensionRegistry);
     }
   };
 
@@ -2382,7 +2355,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p1beta1.EntityAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/FaceAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/FaceAnnotation.java
index 183b8c8a7c53..fa31b4ff8b63 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/FaceAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/FaceAnnotation.java
@@ -45,9 +45,6 @@ private FaceAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -59,6 +56,13 @@ private FaceAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p1beta1.BoundingPoly.Builder subBuilder = null;
             if (boundingPoly_ != null) {
@@ -161,13 +165,6 @@ private FaceAnnotation(
             headwearLikelihood_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -188,7 +185,6 @@ private FaceAnnotation(
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_FaceAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_FaceAnnotation_fieldAccessorTable
@@ -272,9 +268,6 @@ private Landmark(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -286,6 +279,13 @@ private Landmark(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 24: {
               int rawValue = input.readEnum();
 
@@ -305,13 +305,6 @@ private Landmark(
 
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -329,7 +322,6 @@ private Landmark(
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_FaceAnnotation_Landmark_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_FaceAnnotation_Landmark_fieldAccessorTable
@@ -1039,7 +1031,6 @@ public int getTypeValue() {
      * .google.cloud.vision.v1p1beta1.FaceAnnotation.Landmark.Type type = 3;
      */
     public com.google.cloud.vision.v1p1beta1.FaceAnnotation.Landmark.Type getType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p1beta1.FaceAnnotation.Landmark.Type result = com.google.cloud.vision.v1p1beta1.FaceAnnotation.Landmark.Type.valueOf(type_);
       return result == null ? com.google.cloud.vision.v1p1beta1.FaceAnnotation.Landmark.Type.UNRECOGNIZED : result;
     }
@@ -1078,7 +1069,6 @@ public com.google.cloud.vision.v1p1beta1.PositionOrBuilder getPositionOrBuilder(
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1088,7 +1078,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (type_ != com.google.cloud.vision.v1p1beta1.FaceAnnotation.Landmark.Type.UNKNOWN_LANDMARK.getNumber()) {
@@ -1100,7 +1089,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -1228,7 +1216,6 @@ public static com.google.cloud.vision.v1p1beta1.FaceAnnotation.Landmark parseFro
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -1236,7 +1223,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.FaceAnnotation.Landmark prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -1264,7 +1250,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_FaceAnnotation_Landmark_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_FaceAnnotation_Landmark_fieldAccessorTable
@@ -1287,7 +1272,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         type_ = 0;
@@ -1301,18 +1285,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_FaceAnnotation_Landmark_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p1beta1.FaceAnnotation.Landmark getDefaultInstanceForType() {
         return com.google.cloud.vision.v1p1beta1.FaceAnnotation.Landmark.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p1beta1.FaceAnnotation.Landmark build() {
         com.google.cloud.vision.v1p1beta1.FaceAnnotation.Landmark result = buildPartial();
         if (!result.isInitialized()) {
@@ -1321,7 +1302,6 @@ public com.google.cloud.vision.v1p1beta1.FaceAnnotation.Landmark build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p1beta1.FaceAnnotation.Landmark buildPartial() {
         com.google.cloud.vision.v1p1beta1.FaceAnnotation.Landmark result = new com.google.cloud.vision.v1p1beta1.FaceAnnotation.Landmark(this);
         result.type_ = type_;
@@ -1334,39 +1314,32 @@ public com.google.cloud.vision.v1p1beta1.FaceAnnotation.Landmark buildPartial()
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1p1beta1.FaceAnnotation.Landmark) {
           return mergeFrom((com.google.cloud.vision.v1p1beta1.FaceAnnotation.Landmark)other);
@@ -1389,12 +1362,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.FaceAnnotation.Landma
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1444,7 +1415,6 @@ public Builder setTypeValue(int value) {
        * .google.cloud.vision.v1p1beta1.FaceAnnotation.Landmark.Type type = 3;
        */
       public com.google.cloud.vision.v1p1beta1.FaceAnnotation.Landmark.Type getType() {
-        @SuppressWarnings("deprecation")
         com.google.cloud.vision.v1p1beta1.FaceAnnotation.Landmark.Type result = com.google.cloud.vision.v1p1beta1.FaceAnnotation.Landmark.Type.valueOf(type_);
         return result == null ? com.google.cloud.vision.v1p1beta1.FaceAnnotation.Landmark.Type.UNRECOGNIZED : result;
       }
@@ -1630,13 +1600,11 @@ public com.google.cloud.vision.v1p1beta1.PositionOrBuilder getPositionOrBuilder(
         }
         return positionBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1658,12 +1626,11 @@ public static com.google.cloud.vision.v1p1beta1.FaceAnnotation.Landmark getDefau
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Landmark parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Landmark(input, extensionRegistry);
+          return new Landmark(input, extensionRegistry);
       }
     };
 
@@ -1676,7 +1643,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.FaceAnnotation.Landmark getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1928,7 +1894,6 @@ public int getJoyLikelihoodValue() {
    * .google.cloud.vision.v1p1beta1.Likelihood joy_likelihood = 9;
    */
   public com.google.cloud.vision.v1p1beta1.Likelihood getJoyLikelihood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p1beta1.Likelihood result = com.google.cloud.vision.v1p1beta1.Likelihood.valueOf(joyLikelihood_);
     return result == null ? com.google.cloud.vision.v1p1beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -1953,7 +1918,6 @@ public int getSorrowLikelihoodValue() {
    * .google.cloud.vision.v1p1beta1.Likelihood sorrow_likelihood = 10;
    */
   public com.google.cloud.vision.v1p1beta1.Likelihood getSorrowLikelihood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p1beta1.Likelihood result = com.google.cloud.vision.v1p1beta1.Likelihood.valueOf(sorrowLikelihood_);
     return result == null ? com.google.cloud.vision.v1p1beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -1978,7 +1942,6 @@ public int getAngerLikelihoodValue() {
    * .google.cloud.vision.v1p1beta1.Likelihood anger_likelihood = 11;
    */
   public com.google.cloud.vision.v1p1beta1.Likelihood getAngerLikelihood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p1beta1.Likelihood result = com.google.cloud.vision.v1p1beta1.Likelihood.valueOf(angerLikelihood_);
     return result == null ? com.google.cloud.vision.v1p1beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -2003,7 +1966,6 @@ public int getSurpriseLikelihoodValue() {
    * .google.cloud.vision.v1p1beta1.Likelihood surprise_likelihood = 12;
    */
   public com.google.cloud.vision.v1p1beta1.Likelihood getSurpriseLikelihood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p1beta1.Likelihood result = com.google.cloud.vision.v1p1beta1.Likelihood.valueOf(surpriseLikelihood_);
     return result == null ? com.google.cloud.vision.v1p1beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -2028,7 +1990,6 @@ public int getUnderExposedLikelihoodValue() {
    * .google.cloud.vision.v1p1beta1.Likelihood under_exposed_likelihood = 13;
    */
   public com.google.cloud.vision.v1p1beta1.Likelihood getUnderExposedLikelihood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p1beta1.Likelihood result = com.google.cloud.vision.v1p1beta1.Likelihood.valueOf(underExposedLikelihood_);
     return result == null ? com.google.cloud.vision.v1p1beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -2053,7 +2014,6 @@ public int getBlurredLikelihoodValue() {
    * .google.cloud.vision.v1p1beta1.Likelihood blurred_likelihood = 14;
    */
   public com.google.cloud.vision.v1p1beta1.Likelihood getBlurredLikelihood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p1beta1.Likelihood result = com.google.cloud.vision.v1p1beta1.Likelihood.valueOf(blurredLikelihood_);
     return result == null ? com.google.cloud.vision.v1p1beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -2078,13 +2038,11 @@ public int getHeadwearLikelihoodValue() {
    * .google.cloud.vision.v1p1beta1.Likelihood headwear_likelihood = 15;
    */
   public com.google.cloud.vision.v1p1beta1.Likelihood getHeadwearLikelihood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p1beta1.Likelihood result = com.google.cloud.vision.v1p1beta1.Likelihood.valueOf(headwearLikelihood_);
     return result == null ? com.google.cloud.vision.v1p1beta1.Likelihood.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -2094,7 +2052,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (boundingPoly_ != null) {
@@ -2145,7 +2102,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -2393,7 +2349,6 @@ public static com.google.cloud.vision.v1p1beta1.FaceAnnotation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -2401,7 +2356,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.FaceAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -2429,7 +2383,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_FaceAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_FaceAnnotation_fieldAccessorTable
@@ -2453,7 +2406,6 @@ private void maybeForceBuilderInitialization() {
         getLandmarksFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (boundingPolyBuilder_ == null) {
@@ -2501,18 +2453,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_FaceAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.FaceAnnotation getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p1beta1.FaceAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.FaceAnnotation build() {
       com.google.cloud.vision.v1p1beta1.FaceAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -2521,7 +2470,6 @@ public com.google.cloud.vision.v1p1beta1.FaceAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.FaceAnnotation buildPartial() {
       com.google.cloud.vision.v1p1beta1.FaceAnnotation result = new com.google.cloud.vision.v1p1beta1.FaceAnnotation(this);
       int from_bitField0_ = bitField0_;
@@ -2562,39 +2510,32 @@ public com.google.cloud.vision.v1p1beta1.FaceAnnotation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p1beta1.FaceAnnotation) {
         return mergeFrom((com.google.cloud.vision.v1p1beta1.FaceAnnotation)other);
@@ -2679,12 +2620,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.FaceAnnotation other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3657,7 +3596,6 @@ public Builder setJoyLikelihoodValue(int value) {
      * .google.cloud.vision.v1p1beta1.Likelihood joy_likelihood = 9;
      */
     public com.google.cloud.vision.v1p1beta1.Likelihood getJoyLikelihood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p1beta1.Likelihood result = com.google.cloud.vision.v1p1beta1.Likelihood.valueOf(joyLikelihood_);
       return result == null ? com.google.cloud.vision.v1p1beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -3722,7 +3660,6 @@ public Builder setSorrowLikelihoodValue(int value) {
      * .google.cloud.vision.v1p1beta1.Likelihood sorrow_likelihood = 10;
      */
     public com.google.cloud.vision.v1p1beta1.Likelihood getSorrowLikelihood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p1beta1.Likelihood result = com.google.cloud.vision.v1p1beta1.Likelihood.valueOf(sorrowLikelihood_);
       return result == null ? com.google.cloud.vision.v1p1beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -3787,7 +3724,6 @@ public Builder setAngerLikelihoodValue(int value) {
      * .google.cloud.vision.v1p1beta1.Likelihood anger_likelihood = 11;
      */
     public com.google.cloud.vision.v1p1beta1.Likelihood getAngerLikelihood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p1beta1.Likelihood result = com.google.cloud.vision.v1p1beta1.Likelihood.valueOf(angerLikelihood_);
       return result == null ? com.google.cloud.vision.v1p1beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -3852,7 +3788,6 @@ public Builder setSurpriseLikelihoodValue(int value) {
      * .google.cloud.vision.v1p1beta1.Likelihood surprise_likelihood = 12;
      */
     public com.google.cloud.vision.v1p1beta1.Likelihood getSurpriseLikelihood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p1beta1.Likelihood result = com.google.cloud.vision.v1p1beta1.Likelihood.valueOf(surpriseLikelihood_);
       return result == null ? com.google.cloud.vision.v1p1beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -3917,7 +3852,6 @@ public Builder setUnderExposedLikelihoodValue(int value) {
      * .google.cloud.vision.v1p1beta1.Likelihood under_exposed_likelihood = 13;
      */
     public com.google.cloud.vision.v1p1beta1.Likelihood getUnderExposedLikelihood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p1beta1.Likelihood result = com.google.cloud.vision.v1p1beta1.Likelihood.valueOf(underExposedLikelihood_);
       return result == null ? com.google.cloud.vision.v1p1beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -3982,7 +3916,6 @@ public Builder setBlurredLikelihoodValue(int value) {
      * .google.cloud.vision.v1p1beta1.Likelihood blurred_likelihood = 14;
      */
     public com.google.cloud.vision.v1p1beta1.Likelihood getBlurredLikelihood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p1beta1.Likelihood result = com.google.cloud.vision.v1p1beta1.Likelihood.valueOf(blurredLikelihood_);
       return result == null ? com.google.cloud.vision.v1p1beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -4047,7 +3980,6 @@ public Builder setHeadwearLikelihoodValue(int value) {
      * .google.cloud.vision.v1p1beta1.Likelihood headwear_likelihood = 15;
      */
     public com.google.cloud.vision.v1p1beta1.Likelihood getHeadwearLikelihood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p1beta1.Likelihood result = com.google.cloud.vision.v1p1beta1.Likelihood.valueOf(headwearLikelihood_);
       return result == null ? com.google.cloud.vision.v1p1beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -4080,13 +4012,11 @@ public Builder clearHeadwearLikelihood() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -4108,12 +4038,11 @@ public static com.google.cloud.vision.v1p1beta1.FaceAnnotation getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public FaceAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FaceAnnotation(input, extensionRegistry);
+        return new FaceAnnotation(input, extensionRegistry);
     }
   };
 
@@ -4126,7 +4055,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p1beta1.FaceAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Feature.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Feature.java
index f551d2f84ac7..fcdb4fa867c2 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Feature.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Feature.java
@@ -38,9 +38,6 @@ private Feature(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private Feature(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -69,13 +73,6 @@ private Feature(
             model_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -93,7 +90,6 @@ private Feature(
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_Feature_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_Feature_fieldAccessorTable
@@ -394,7 +390,6 @@ public int getTypeValue() {
    * .google.cloud.vision.v1p1beta1.Feature.Type type = 1;
    */
   public com.google.cloud.vision.v1p1beta1.Feature.Type getType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p1beta1.Feature.Type result = com.google.cloud.vision.v1p1beta1.Feature.Type.valueOf(type_);
     return result == null ? com.google.cloud.vision.v1p1beta1.Feature.Type.UNRECOGNIZED : result;
   }
@@ -459,7 +454,6 @@ public java.lang.String getModel() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -469,7 +463,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (type_ != com.google.cloud.vision.v1p1beta1.Feature.Type.TYPE_UNSPECIFIED.getNumber()) {
@@ -484,7 +477,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -614,7 +606,6 @@ public static com.google.cloud.vision.v1p1beta1.Feature parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -622,7 +613,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.Feature prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -653,7 +643,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_Feature_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_Feature_fieldAccessorTable
@@ -676,7 +665,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       type_ = 0;
@@ -688,18 +676,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_Feature_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.Feature getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p1beta1.Feature.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.Feature build() {
       com.google.cloud.vision.v1p1beta1.Feature result = buildPartial();
       if (!result.isInitialized()) {
@@ -708,7 +693,6 @@ public com.google.cloud.vision.v1p1beta1.Feature build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.Feature buildPartial() {
       com.google.cloud.vision.v1p1beta1.Feature result = new com.google.cloud.vision.v1p1beta1.Feature(this);
       result.type_ = type_;
@@ -718,39 +702,32 @@ public com.google.cloud.vision.v1p1beta1.Feature buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p1beta1.Feature) {
         return mergeFrom((com.google.cloud.vision.v1p1beta1.Feature)other);
@@ -777,12 +754,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.Feature other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -832,7 +807,6 @@ public Builder setTypeValue(int value) {
      * .google.cloud.vision.v1p1beta1.Feature.Type type = 1;
      */
     public com.google.cloud.vision.v1p1beta1.Feature.Type getType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p1beta1.Feature.Type result = com.google.cloud.vision.v1p1beta1.Feature.Type.valueOf(type_);
       return result == null ? com.google.cloud.vision.v1p1beta1.Feature.Type.UNRECOGNIZED : result;
     }
@@ -1002,13 +976,11 @@ public Builder setModelBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1030,12 +1002,11 @@ public static com.google.cloud.vision.v1p1beta1.Feature getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Feature parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Feature(input, extensionRegistry);
+        return new Feature(input, extensionRegistry);
     }
   };
 
@@ -1048,7 +1019,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p1beta1.Feature getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Image.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Image.java
index b88d8e833b49..436a27f62aa6 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Image.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Image.java
@@ -33,9 +33,6 @@ private Image(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private Image(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
 
             content_ = input.readBytes();
@@ -65,13 +69,6 @@ private Image(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -89,7 +86,6 @@ private Image(
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_Image_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_Image_fieldAccessorTable
@@ -152,7 +148,6 @@ public com.google.cloud.vision.v1p1beta1.ImageSourceOrBuilder getSourceOrBuilder
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -162,7 +157,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!content_.isEmpty()) {
@@ -174,7 +168,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -303,7 +296,6 @@ public static com.google.cloud.vision.v1p1beta1.Image parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -311,7 +303,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.Image prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -339,7 +330,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_Image_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_Image_fieldAccessorTable
@@ -362,7 +352,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       content_ = com.google.protobuf.ByteString.EMPTY;
@@ -376,18 +365,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_Image_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.Image getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p1beta1.Image.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.Image build() {
       com.google.cloud.vision.v1p1beta1.Image result = buildPartial();
       if (!result.isInitialized()) {
@@ -396,7 +382,6 @@ public com.google.cloud.vision.v1p1beta1.Image build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.Image buildPartial() {
       com.google.cloud.vision.v1p1beta1.Image result = new com.google.cloud.vision.v1p1beta1.Image(this);
       result.content_ = content_;
@@ -409,39 +394,32 @@ public com.google.cloud.vision.v1p1beta1.Image buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p1beta1.Image) {
         return mergeFrom((com.google.cloud.vision.v1p1beta1.Image)other);
@@ -464,12 +442,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.Image other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -705,13 +681,11 @@ public com.google.cloud.vision.v1p1beta1.ImageSourceOrBuilder getSourceOrBuilder
       }
       return sourceBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -733,12 +707,11 @@ public static com.google.cloud.vision.v1p1beta1.Image getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Image parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Image(input, extensionRegistry);
+        return new Image(input, extensionRegistry);
     }
   };
 
@@ -751,7 +724,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p1beta1.Image getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorProto.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorProto.java
index 9f1c08e6f2cc..ea6afd6533b3 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorProto.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageAnnotatorProto.java
@@ -142,7 +142,7 @@ public static void registerAllExtensions(
       "eta1/web_detection.proto\032\027google/rpc/sta" +
       "tus.proto\032\027google/type/color.proto\032\030goog" +
       "le/type/latlng.proto\"\341\002\n\007Feature\0229\n\004type" +
-      "\030\001 \001(\0162+.google.cloud.vision.v1p1beta1.F" +
+      "\030\001 \001(\0162+.google.cloud.vision.v1p1beta1.F",
       "eature.Type\022\023\n\013max_results\030\002 \001(\005\022\r\n\005mode" +
       "l\030\003 \001(\t\"\366\001\n\004Type\022\024\n\020TYPE_UNSPECIFIED\020\000\022\022" +
       "\n\016FACE_DETECTION\020\001\022\026\n\022LANDMARK_DETECTION" +
@@ -152,7 +152,7 @@ public static void registerAllExtensions(
       "\024\n\020IMAGE_PROPERTIES\020\007\022\016\n\nCROP_HINTS\020\t\022\021\n" +
       "\rWEB_DETECTION\020\n\"7\n\013ImageSource\022\025\n\rgcs_i" +
       "mage_uri\030\001 \001(\t\022\021\n\timage_uri\030\002 \001(\t\"T\n\005Ima" +
-      "ge\022\017\n\007content\030\001 \001(\014\022:\n\006source\030\002 \001(\0132*.go" +
+      "ge\022\017\n\007content\030\001 \001(\014\022:\n\006source\030\002 \001(\0132*.go",
       "ogle.cloud.vision.v1p1beta1.ImageSource\"" +
       "\233\016\n\016FaceAnnotation\022B\n\rbounding_poly\030\001 \001(" +
       "\0132+.google.cloud.vision.v1p1beta1.Boundi" +
@@ -162,7 +162,7 @@ public static void registerAllExtensions(
       "1p1beta1.FaceAnnotation.Landmark\022\022\n\nroll" +
       "_angle\030\004 \001(\002\022\021\n\tpan_angle\030\005 \001(\002\022\022\n\ntilt_" +
       "angle\030\006 \001(\002\022\034\n\024detection_confidence\030\007 \001(" +
-      "\002\022\036\n\026landmarking_confidence\030\010 \001(\002\022A\n\016joy" +
+      "\002\022\036\n\026landmarking_confidence\030\010 \001(\002\022A\n\016joy",
       "_likelihood\030\t \001(\0162).google.cloud.vision." +
       "v1p1beta1.Likelihood\022D\n\021sorrow_likelihoo" +
       "d\030\n \001(\0162).google.cloud.vision.v1p1beta1." +
@@ -172,7 +172,7 @@ public static void registerAllExtensions(
       "oud.vision.v1p1beta1.Likelihood\022K\n\030under" +
       "_exposed_likelihood\030\r \001(\0162).google.cloud" +
       ".vision.v1p1beta1.Likelihood\022E\n\022blurred_" +
-      "likelihood\030\016 \001(\0162).google.cloud.vision.v" +
+      "likelihood\030\016 \001(\0162).google.cloud.vision.v",
       "1p1beta1.Likelihood\022F\n\023headwear_likeliho" +
       "od\030\017 \001(\0162).google.cloud.vision.v1p1beta1" +
       ".Likelihood\032\307\007\n\010Landmark\022I\n\004type\030\003 \001(\0162;" +
@@ -182,7 +182,7 @@ public static void registerAllExtensions(
       "\006\n\004Type\022\024\n\020UNKNOWN_LANDMARK\020\000\022\014\n\010LEFT_EY" +
       "E\020\001\022\r\n\tRIGHT_EYE\020\002\022\030\n\024LEFT_OF_LEFT_EYEBR" +
       "OW\020\003\022\031\n\025RIGHT_OF_LEFT_EYEBROW\020\004\022\031\n\025LEFT_" +
-      "OF_RIGHT_EYEBROW\020\005\022\032\n\026RIGHT_OF_RIGHT_EYE" +
+      "OF_RIGHT_EYEBROW\020\005\022\032\n\026RIGHT_OF_RIGHT_EYE",
       "BROW\020\006\022\031\n\025MIDPOINT_BETWEEN_EYES\020\007\022\014\n\010NOS" +
       "E_TIP\020\010\022\r\n\tUPPER_LIP\020\t\022\r\n\tLOWER_LIP\020\n\022\016\n" +
       "\nMOUTH_LEFT\020\013\022\017\n\013MOUTH_RIGHT\020\014\022\020\n\014MOUTH_" +
@@ -192,7 +192,7 @@ public static void registerAllExtensions(
       "HT_CORNER\020\022\022\034\n\030LEFT_EYE_BOTTOM_BOUNDARY\020" +
       "\023\022\030\n\024LEFT_EYE_LEFT_CORNER\020\024\022\032\n\026RIGHT_EYE" +
       "_TOP_BOUNDARY\020\025\022\032\n\026RIGHT_EYE_RIGHT_CORNE" +
-      "R\020\026\022\035\n\031RIGHT_EYE_BOTTOM_BOUNDARY\020\027\022\031\n\025RI" +
+      "R\020\026\022\035\n\031RIGHT_EYE_BOTTOM_BOUNDARY\020\027\022\031\n\025RI",
       "GHT_EYE_LEFT_CORNER\020\030\022\037\n\033LEFT_EYEBROW_UP" +
       "PER_MIDPOINT\020\031\022 \n\034RIGHT_EYEBROW_UPPER_MI" +
       "DPOINT\020\032\022\024\n\020LEFT_EAR_TRAGION\020\033\022\025\n\021RIGHT_" +
@@ -202,7 +202,7 @@ public static void registerAllExtensions(
       "\n\021CHIN_RIGHT_GONION\020\"\"4\n\014LocationInfo\022$\n" +
       "\007lat_lng\030\001 \001(\0132\023.google.type.LatLng\"=\n\010P" +
       "roperty\022\014\n\004name\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\022\024\n\014" +
-      "uint64_value\030\003 \001(\004\"\274\002\n\020EntityAnnotation\022" +
+      "uint64_value\030\003 \001(\004\"\274\002\n\020EntityAnnotation\022",
       "\013\n\003mid\030\001 \001(\t\022\016\n\006locale\030\002 \001(\t\022\023\n\013descript" +
       "ion\030\003 \001(\t\022\r\n\005score\030\004 \001(\002\022\022\n\nconfidence\030\005" +
       " \001(\002\022\022\n\ntopicality\030\006 \001(\002\022B\n\rbounding_pol" +
@@ -212,7 +212,7 @@ public static void registerAllExtensions(
       "properties\030\t \003(\0132\'.google.cloud.vision.v" +
       "1p1beta1.Property\"\274\002\n\024SafeSearchAnnotati" +
       "on\0228\n\005adult\030\001 \001(\0162).google.cloud.vision." +
-      "v1p1beta1.Likelihood\0228\n\005spoof\030\002 \001(\0162).go" +
+      "v1p1beta1.Likelihood\0228\n\005spoof\030\002 \001(\0162).go",
       "ogle.cloud.vision.v1p1beta1.Likelihood\022:" +
       "\n\007medical\030\003 \001(\0162).google.cloud.vision.v1" +
       "p1beta1.Likelihood\022;\n\010violence\030\004 \001(\0162).g" +
@@ -222,7 +222,7 @@ public static void registerAllExtensions(
       "at_lng\030\001 \001(\0132\023.google.type.LatLng\022(\n\013max" +
       "_lat_lng\030\002 \001(\0132\023.google.type.LatLng\"U\n\tC" +
       "olorInfo\022!\n\005color\030\001 \001(\0132\022.google.type.Co" +
-      "lor\022\r\n\005score\030\002 \001(\002\022\026\n\016pixel_fraction\030\003 \001" +
+      "lor\022\r\n\005score\030\002 \001(\002\022\026\n\016pixel_fraction\030\003 \001",
       "(\002\"T\n\030DominantColorsAnnotation\0228\n\006colors" +
       "\030\001 \003(\0132(.google.cloud.vision.v1p1beta1.C" +
       "olorInfo\"c\n\017ImageProperties\022P\n\017dominant_" +
@@ -232,7 +232,7 @@ public static void registerAllExtensions(
       "vision.v1p1beta1.BoundingPoly\022\022\n\nconfide" +
       "nce\030\002 \001(\002\022\033\n\023importance_fraction\030\003 \001(\002\"R" +
       "\n\023CropHintsAnnotation\022;\n\ncrop_hints\030\001 \003(" +
-      "\0132\'.google.cloud.vision.v1p1beta1.CropHi" +
+      "\0132\'.google.cloud.vision.v1p1beta1.CropHi",
       "nt\"(\n\017CropHintsParams\022\025\n\raspect_ratios\030\001" +
       " \003(\002\"1\n\022WebDetectionParams\022\033\n\023include_ge" +
       "o_results\030\002 \001(\010\"\205\002\n\014ImageContext\022A\n\rlat_" +
@@ -242,7 +242,7 @@ public static void registerAllExtensions(
       "cloud.vision.v1p1beta1.CropHintsParams\022O" +
       "\n\024web_detection_params\030\006 \001(\01321.google.cl" +
       "oud.vision.v1p1beta1.WebDetectionParams\"" +
-      "\311\001\n\024AnnotateImageRequest\0223\n\005image\030\001 \001(\0132" +
+      "\311\001\n\024AnnotateImageRequest\0223\n\005image\030\001 \001(\0132",
       "$.google.cloud.vision.v1p1beta1.Image\0228\n" +
       "\010features\030\002 \003(\0132&.google.cloud.vision.v1" +
       "p1beta1.Feature\022B\n\rimage_context\030\003 \001(\0132+" +
@@ -252,7 +252,7 @@ public static void registerAllExtensions(
       "p1beta1.FaceAnnotation\022M\n\024landmark_annot" +
       "ations\030\002 \003(\0132/.google.cloud.vision.v1p1b" +
       "eta1.EntityAnnotation\022I\n\020logo_annotation" +
-      "s\030\003 \003(\0132/.google.cloud.vision.v1p1beta1." +
+      "s\030\003 \003(\0132/.google.cloud.vision.v1p1beta1.",
       "EntityAnnotation\022J\n\021label_annotations\030\004 " +
       "\003(\0132/.google.cloud.vision.v1p1beta1.Enti" +
       "tyAnnotation\022I\n\020text_annotations\030\005 \003(\0132/" +
@@ -262,7 +262,7 @@ public static void registerAllExtensions(
       "tion\022S\n\026safe_search_annotation\030\006 \001(\01323.g" +
       "oogle.cloud.vision.v1p1beta1.SafeSearchA" +
       "nnotation\022S\n\033image_properties_annotation" +
-      "\030\010 \001(\0132..google.cloud.vision.v1p1beta1.I" +
+      "\030\010 \001(\0132..google.cloud.vision.v1p1beta1.I",
       "mageProperties\022Q\n\025crop_hints_annotation\030" +
       "\013 \001(\01322.google.cloud.vision.v1p1beta1.Cr" +
       "opHintsAnnotation\022B\n\rweb_detection\030\r \001(\013" +
@@ -272,7 +272,7 @@ public static void registerAllExtensions(
       "ts\030\001 \003(\01323.google.cloud.vision.v1p1beta1" +
       ".AnnotateImageRequest\"f\n\033BatchAnnotateIm" +
       "agesResponse\022G\n\tresponses\030\001 \003(\01324.google" +
-      ".cloud.vision.v1p1beta1.AnnotateImageRes" +
+      ".cloud.vision.v1p1beta1.AnnotateImageRes",
       "ponse*e\n\nLikelihood\022\013\n\007UNKNOWN\020\000\022\021\n\rVERY" +
       "_UNLIKELY\020\001\022\014\n\010UNLIKELY\020\002\022\014\n\010POSSIBLE\020\003\022" +
       "\n\n\006LIKELY\020\004\022\017\n\013VERY_LIKELY\020\0052\306\001\n\016ImageAn" +
@@ -282,7 +282,7 @@ public static void registerAllExtensions(
       "a1.BatchAnnotateImagesResponse\"%\202\323\344\223\002\037\"\032" +
       "/v1p1beta1/images:annotate:\001*B\202\001\n!com.go" +
       "ogle.cloud.vision.v1p1beta1B\023ImageAnnota" +
-      "torProtoP\001ZCgoogle.golang.org/genproto/g" +
+      "torProtoP\001ZCgoogle.golang.org/genproto/g",
       "oogleapis/cloud/vision/v1p1beta1;vision\370" +
       "\001\001b\006proto3"
     };
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageContext.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageContext.java
index 1de740a54a38..745e1226ac94 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageContext.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageContext.java
@@ -33,9 +33,6 @@ private ImageContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ImageContext(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p1beta1.LatLongRect.Builder subBuilder = null;
             if (latLongRect_ != null) {
@@ -95,13 +99,6 @@ private ImageContext(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -122,7 +119,6 @@ private ImageContext(
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_ImageContext_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_ImageContext_fieldAccessorTable
@@ -304,7 +300,6 @@ public com.google.cloud.vision.v1p1beta1.WebDetectionParamsOrBuilder getWebDetec
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -314,7 +309,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (latLongRect_ != null) {
@@ -332,7 +326,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -493,7 +486,6 @@ public static com.google.cloud.vision.v1p1beta1.ImageContext parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -501,7 +493,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.ImageContext prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -529,7 +520,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_ImageContext_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_ImageContext_fieldAccessorTable
@@ -552,7 +542,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (latLongRectBuilder_ == null) {
@@ -578,18 +567,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_ImageContext_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.ImageContext getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p1beta1.ImageContext.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.ImageContext build() {
       com.google.cloud.vision.v1p1beta1.ImageContext result = buildPartial();
       if (!result.isInitialized()) {
@@ -598,7 +584,6 @@ public com.google.cloud.vision.v1p1beta1.ImageContext build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.ImageContext buildPartial() {
       com.google.cloud.vision.v1p1beta1.ImageContext result = new com.google.cloud.vision.v1p1beta1.ImageContext(this);
       int from_bitField0_ = bitField0_;
@@ -628,39 +613,32 @@ public com.google.cloud.vision.v1p1beta1.ImageContext buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p1beta1.ImageContext) {
         return mergeFrom((com.google.cloud.vision.v1p1beta1.ImageContext)other);
@@ -696,12 +674,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.ImageContext other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1372,13 +1348,11 @@ public com.google.cloud.vision.v1p1beta1.WebDetectionParamsOrBuilder getWebDetec
       }
       return webDetectionParamsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1400,12 +1374,11 @@ public static com.google.cloud.vision.v1p1beta1.ImageContext getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ImageContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImageContext(input, extensionRegistry);
+        return new ImageContext(input, extensionRegistry);
     }
   };
 
@@ -1418,7 +1391,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p1beta1.ImageContext getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageProperties.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageProperties.java
index af8edd449b45..abd06142bded 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageProperties.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageProperties.java
@@ -32,9 +32,6 @@ private ImageProperties(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private ImageProperties(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p1beta1.DominantColorsAnnotation.Builder subBuilder = null;
             if (dominantColors_ != null) {
@@ -59,13 +63,6 @@ private ImageProperties(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private ImageProperties(
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_ImageProperties_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_ImageProperties_fieldAccessorTable
@@ -125,7 +121,6 @@ public com.google.cloud.vision.v1p1beta1.DominantColorsAnnotationOrBuilder getDo
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -135,7 +130,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (dominantColors_ != null) {
@@ -144,7 +138,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static com.google.cloud.vision.v1p1beta1.ImageProperties parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.ImageProperties prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_ImageProperties_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_ImageProperties_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (dominantColorsBuilder_ == null) {
@@ -336,18 +325,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_ImageProperties_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.ImageProperties getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p1beta1.ImageProperties.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.ImageProperties build() {
       com.google.cloud.vision.v1p1beta1.ImageProperties result = buildPartial();
       if (!result.isInitialized()) {
@@ -356,7 +342,6 @@ public com.google.cloud.vision.v1p1beta1.ImageProperties build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.ImageProperties buildPartial() {
       com.google.cloud.vision.v1p1beta1.ImageProperties result = new com.google.cloud.vision.v1p1beta1.ImageProperties(this);
       if (dominantColorsBuilder_ == null) {
@@ -368,39 +353,32 @@ public com.google.cloud.vision.v1p1beta1.ImageProperties buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p1beta1.ImageProperties) {
         return mergeFrom((com.google.cloud.vision.v1p1beta1.ImageProperties)other);
@@ -420,12 +398,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.ImageProperties other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -596,13 +572,11 @@ public com.google.cloud.vision.v1p1beta1.DominantColorsAnnotationOrBuilder getDo
       }
       return dominantColorsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -624,12 +598,11 @@ public static com.google.cloud.vision.v1p1beta1.ImageProperties getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ImageProperties parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImageProperties(input, extensionRegistry);
+        return new ImageProperties(input, extensionRegistry);
     }
   };
 
@@ -642,7 +615,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p1beta1.ImageProperties getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageSource.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageSource.java
index 6d57e2506645..c91902fc73b1 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageSource.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/ImageSource.java
@@ -34,9 +34,6 @@ private ImageSource(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ImageSource(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private ImageSource(
             imageUri_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private ImageSource(
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_ImageSource_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_ImageSource_fieldAccessorTable
@@ -205,7 +201,6 @@ public java.lang.String getImageUri() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -215,7 +210,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getGcsImageUriBytes().isEmpty()) {
@@ -227,7 +221,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -349,7 +342,6 @@ public static com.google.cloud.vision.v1p1beta1.ImageSource parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -357,7 +349,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.ImageSource prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -385,7 +376,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_ImageSource_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_ImageSource_fieldAccessorTable
@@ -408,7 +398,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       gcsImageUri_ = "";
@@ -418,18 +407,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_ImageSource_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.ImageSource getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p1beta1.ImageSource.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.ImageSource build() {
       com.google.cloud.vision.v1p1beta1.ImageSource result = buildPartial();
       if (!result.isInitialized()) {
@@ -438,7 +424,6 @@ public com.google.cloud.vision.v1p1beta1.ImageSource build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.ImageSource buildPartial() {
       com.google.cloud.vision.v1p1beta1.ImageSource result = new com.google.cloud.vision.v1p1beta1.ImageSource(this);
       result.gcsImageUri_ = gcsImageUri_;
@@ -447,39 +432,32 @@ public com.google.cloud.vision.v1p1beta1.ImageSource buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p1beta1.ImageSource) {
         return mergeFrom((com.google.cloud.vision.v1p1beta1.ImageSource)other);
@@ -504,12 +482,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.ImageSource other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -775,13 +751,11 @@ public Builder setImageUriBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -803,12 +777,11 @@ public static com.google.cloud.vision.v1p1beta1.ImageSource getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ImageSource parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImageSource(input, extensionRegistry);
+        return new ImageSource(input, extensionRegistry);
     }
   };
 
@@ -821,7 +794,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p1beta1.ImageSource getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/LatLongRect.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/LatLongRect.java
index 5eaf3dc366a9..d79b964609cc 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/LatLongRect.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/LatLongRect.java
@@ -32,9 +32,6 @@ private LatLongRect(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private LatLongRect(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.type.LatLng.Builder subBuilder = null;
             if (minLatLng_ != null) {
@@ -72,13 +76,6 @@ private LatLongRect(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private LatLongRect(
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_LatLongRect_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_LatLongRect_fieldAccessorTable
@@ -171,7 +167,6 @@ public com.google.type.LatLngOrBuilder getMaxLatLngOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -181,7 +176,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (minLatLng_ != null) {
@@ -193,7 +187,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -327,7 +320,6 @@ public static com.google.cloud.vision.v1p1beta1.LatLongRect parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -335,7 +327,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.LatLongRect prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -363,7 +354,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_LatLongRect_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_LatLongRect_fieldAccessorTable
@@ -386,7 +376,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (minLatLngBuilder_ == null) {
@@ -404,18 +393,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_LatLongRect_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.LatLongRect getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p1beta1.LatLongRect.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.LatLongRect build() {
       com.google.cloud.vision.v1p1beta1.LatLongRect result = buildPartial();
       if (!result.isInitialized()) {
@@ -424,7 +410,6 @@ public com.google.cloud.vision.v1p1beta1.LatLongRect build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.LatLongRect buildPartial() {
       com.google.cloud.vision.v1p1beta1.LatLongRect result = new com.google.cloud.vision.v1p1beta1.LatLongRect(this);
       if (minLatLngBuilder_ == null) {
@@ -441,39 +426,32 @@ public com.google.cloud.vision.v1p1beta1.LatLongRect buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p1beta1.LatLongRect) {
         return mergeFrom((com.google.cloud.vision.v1p1beta1.LatLongRect)other);
@@ -496,12 +474,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.LatLongRect other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -825,13 +801,11 @@ public com.google.type.LatLngOrBuilder getMaxLatLngOrBuilder() {
       }
       return maxLatLngBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -853,12 +827,11 @@ public static com.google.cloud.vision.v1p1beta1.LatLongRect getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LatLongRect parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LatLongRect(input, extensionRegistry);
+        return new LatLongRect(input, extensionRegistry);
     }
   };
 
@@ -871,7 +844,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p1beta1.LatLongRect getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/LocationInfo.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/LocationInfo.java
index f534bfc0514d..87b39e5a1d75 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/LocationInfo.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/LocationInfo.java
@@ -32,9 +32,6 @@ private LocationInfo(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private LocationInfo(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.type.LatLng.Builder subBuilder = null;
             if (latLng_ != null) {
@@ -59,13 +63,6 @@ private LocationInfo(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private LocationInfo(
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_LocationInfo_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_LocationInfo_fieldAccessorTable
@@ -125,7 +121,6 @@ public com.google.type.LatLngOrBuilder getLatLngOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -135,7 +130,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (latLng_ != null) {
@@ -144,7 +138,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static com.google.cloud.vision.v1p1beta1.LocationInfo parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.LocationInfo prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_LocationInfo_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_LocationInfo_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (latLngBuilder_ == null) {
@@ -336,18 +325,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_LocationInfo_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.LocationInfo getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p1beta1.LocationInfo.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.LocationInfo build() {
       com.google.cloud.vision.v1p1beta1.LocationInfo result = buildPartial();
       if (!result.isInitialized()) {
@@ -356,7 +342,6 @@ public com.google.cloud.vision.v1p1beta1.LocationInfo build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.LocationInfo buildPartial() {
       com.google.cloud.vision.v1p1beta1.LocationInfo result = new com.google.cloud.vision.v1p1beta1.LocationInfo(this);
       if (latLngBuilder_ == null) {
@@ -368,39 +353,32 @@ public com.google.cloud.vision.v1p1beta1.LocationInfo buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p1beta1.LocationInfo) {
         return mergeFrom((com.google.cloud.vision.v1p1beta1.LocationInfo)other);
@@ -420,12 +398,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.LocationInfo other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -596,13 +572,11 @@ public com.google.type.LatLngOrBuilder getLatLngOrBuilder() {
       }
       return latLngBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -624,12 +598,11 @@ public static com.google.cloud.vision.v1p1beta1.LocationInfo getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LocationInfo parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LocationInfo(input, extensionRegistry);
+        return new LocationInfo(input, extensionRegistry);
     }
   };
 
@@ -642,7 +615,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p1beta1.LocationInfo getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Page.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Page.java
index e46b7ff5444c..4585b644e514 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Page.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Page.java
@@ -36,9 +36,6 @@ private Page(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private Page(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p1beta1.TextAnnotation.TextProperty.Builder subBuilder = null;
             if (property_ != null) {
@@ -87,13 +91,6 @@ private Page(
             confidence_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -114,7 +111,6 @@ private Page(
     return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_Page_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_Page_fieldAccessorTable
@@ -251,7 +247,6 @@ public float getConfidence() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -261,7 +256,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (property_ != null) {
@@ -282,7 +276,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -440,7 +433,6 @@ public static com.google.cloud.vision.v1p1beta1.Page parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -448,7 +440,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.Page prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -476,7 +467,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_Page_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_Page_fieldAccessorTable
@@ -500,7 +490,6 @@ private void maybeForceBuilderInitialization() {
         getBlocksFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (propertyBuilder_ == null) {
@@ -524,18 +513,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_Page_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.Page getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p1beta1.Page.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.Page build() {
       com.google.cloud.vision.v1p1beta1.Page result = buildPartial();
       if (!result.isInitialized()) {
@@ -544,7 +530,6 @@ public com.google.cloud.vision.v1p1beta1.Page build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.Page buildPartial() {
       com.google.cloud.vision.v1p1beta1.Page result = new com.google.cloud.vision.v1p1beta1.Page(this);
       int from_bitField0_ = bitField0_;
@@ -571,39 +556,32 @@ public com.google.cloud.vision.v1p1beta1.Page buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p1beta1.Page) {
         return mergeFrom((com.google.cloud.vision.v1p1beta1.Page)other);
@@ -658,12 +636,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.Page other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1261,13 +1237,11 @@ public Builder clearConfidence() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1289,12 +1263,11 @@ public static com.google.cloud.vision.v1p1beta1.Page getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Page parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Page(input, extensionRegistry);
+        return new Page(input, extensionRegistry);
     }
   };
 
@@ -1307,7 +1280,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p1beta1.Page getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Paragraph.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Paragraph.java
index a35060d3a1b4..b06bbbfa9e8c 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Paragraph.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Paragraph.java
@@ -34,9 +34,6 @@ private Paragraph(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private Paragraph(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p1beta1.TextAnnotation.TextProperty.Builder subBuilder = null;
             if (property_ != null) {
@@ -88,13 +92,6 @@ private Paragraph(
             confidence_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -115,7 +112,6 @@ private Paragraph(
     return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_Paragraph_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_Paragraph_fieldAccessorTable
@@ -301,7 +297,6 @@ public float getConfidence() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -311,7 +306,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (property_ != null) {
@@ -329,7 +323,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -484,7 +477,6 @@ public static com.google.cloud.vision.v1p1beta1.Paragraph parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -492,7 +484,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.Paragraph prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -520,7 +511,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_Paragraph_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_Paragraph_fieldAccessorTable
@@ -544,7 +534,6 @@ private void maybeForceBuilderInitialization() {
         getWordsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (propertyBuilder_ == null) {
@@ -570,18 +559,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_Paragraph_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.Paragraph getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p1beta1.Paragraph.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.Paragraph build() {
       com.google.cloud.vision.v1p1beta1.Paragraph result = buildPartial();
       if (!result.isInitialized()) {
@@ -590,7 +576,6 @@ public com.google.cloud.vision.v1p1beta1.Paragraph build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.Paragraph buildPartial() {
       com.google.cloud.vision.v1p1beta1.Paragraph result = new com.google.cloud.vision.v1p1beta1.Paragraph(this);
       int from_bitField0_ = bitField0_;
@@ -620,39 +605,32 @@ public com.google.cloud.vision.v1p1beta1.Paragraph buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p1beta1.Paragraph) {
         return mergeFrom((com.google.cloud.vision.v1p1beta1.Paragraph)other);
@@ -704,12 +682,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.Paragraph other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1510,13 +1486,11 @@ public Builder clearConfidence() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1538,12 +1512,11 @@ public static com.google.cloud.vision.v1p1beta1.Paragraph getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Paragraph parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Paragraph(input, extensionRegistry);
+        return new Paragraph(input, extensionRegistry);
     }
   };
 
@@ -1556,7 +1529,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p1beta1.Paragraph getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Position.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Position.java
index a6ffdeceeb10..c8d9a1ceae60 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Position.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Position.java
@@ -37,9 +37,6 @@ private Position(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private Position(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 13: {
 
             x_ = input.readFloat();
@@ -66,13 +70,6 @@ private Position(
             z_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private Position(
     return com.google.cloud.vision.v1p1beta1.GeometryProto.internal_static_google_cloud_vision_v1p1beta1_Position_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p1beta1.GeometryProto.internal_static_google_cloud_vision_v1p1beta1_Position_fieldAccessorTable
@@ -138,7 +134,6 @@ public float getZ() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -148,7 +143,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (x_ != 0F) {
@@ -163,7 +157,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -304,7 +297,6 @@ public static com.google.cloud.vision.v1p1beta1.Position parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -312,7 +304,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.Position prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -342,7 +333,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p1beta1.GeometryProto.internal_static_google_cloud_vision_v1p1beta1_Position_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.GeometryProto.internal_static_google_cloud_vision_v1p1beta1_Position_fieldAccessorTable
@@ -365,7 +355,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       x_ = 0F;
@@ -377,18 +366,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p1beta1.GeometryProto.internal_static_google_cloud_vision_v1p1beta1_Position_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.Position getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p1beta1.Position.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.Position build() {
       com.google.cloud.vision.v1p1beta1.Position result = buildPartial();
       if (!result.isInitialized()) {
@@ -397,7 +383,6 @@ public com.google.cloud.vision.v1p1beta1.Position build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.Position buildPartial() {
       com.google.cloud.vision.v1p1beta1.Position result = new com.google.cloud.vision.v1p1beta1.Position(this);
       result.x_ = x_;
@@ -407,39 +392,32 @@ public com.google.cloud.vision.v1p1beta1.Position buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p1beta1.Position) {
         return mergeFrom((com.google.cloud.vision.v1p1beta1.Position)other);
@@ -465,12 +443,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.Position other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -602,13 +578,11 @@ public Builder clearZ() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -630,12 +604,11 @@ public static com.google.cloud.vision.v1p1beta1.Position getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Position parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Position(input, extensionRegistry);
+        return new Position(input, extensionRegistry);
     }
   };
 
@@ -648,7 +621,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p1beta1.Position getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Property.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Property.java
index ae6f1c346b66..82633a2c9afd 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Property.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Property.java
@@ -35,9 +35,6 @@ private Property(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private Property(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private Property(
             uint64Value_ = input.readUInt64();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private Property(
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_Property_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_Property_fieldAccessorTable
@@ -196,7 +192,6 @@ public long getUint64Value() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -206,7 +201,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -221,7 +215,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -352,7 +345,6 @@ public static com.google.cloud.vision.v1p1beta1.Property parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -360,7 +352,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.Property prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -388,7 +379,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_Property_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_Property_fieldAccessorTable
@@ -411,7 +401,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -423,18 +412,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_Property_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.Property getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p1beta1.Property.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.Property build() {
       com.google.cloud.vision.v1p1beta1.Property result = buildPartial();
       if (!result.isInitialized()) {
@@ -443,7 +429,6 @@ public com.google.cloud.vision.v1p1beta1.Property build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.Property buildPartial() {
       com.google.cloud.vision.v1p1beta1.Property result = new com.google.cloud.vision.v1p1beta1.Property(this);
       result.name_ = name_;
@@ -453,39 +438,32 @@ public com.google.cloud.vision.v1p1beta1.Property buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p1beta1.Property) {
         return mergeFrom((com.google.cloud.vision.v1p1beta1.Property)other);
@@ -513,12 +491,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.Property other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -752,13 +728,11 @@ public Builder clearUint64Value() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -780,12 +754,11 @@ public static com.google.cloud.vision.v1p1beta1.Property getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Property parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Property(input, extensionRegistry);
+        return new Property(input, extensionRegistry);
     }
   };
 
@@ -798,7 +771,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p1beta1.Property getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/SafeSearchAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/SafeSearchAnnotation.java
index 2a3959ad1f1a..21281f1e22d4 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/SafeSearchAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/SafeSearchAnnotation.java
@@ -39,9 +39,6 @@ private SafeSearchAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private SafeSearchAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -83,13 +87,6 @@ private SafeSearchAnnotation(
             racy_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -107,7 +104,6 @@ private SafeSearchAnnotation(
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_SafeSearchAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_SafeSearchAnnotation_fieldAccessorTable
@@ -139,7 +135,6 @@ public int getAdultValue() {
    * .google.cloud.vision.v1p1beta1.Likelihood adult = 1;
    */
   public com.google.cloud.vision.v1p1beta1.Likelihood getAdult() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p1beta1.Likelihood result = com.google.cloud.vision.v1p1beta1.Likelihood.valueOf(adult_);
     return result == null ? com.google.cloud.vision.v1p1beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -168,7 +163,6 @@ public int getSpoofValue() {
    * .google.cloud.vision.v1p1beta1.Likelihood spoof = 2;
    */
   public com.google.cloud.vision.v1p1beta1.Likelihood getSpoof() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p1beta1.Likelihood result = com.google.cloud.vision.v1p1beta1.Likelihood.valueOf(spoof_);
     return result == null ? com.google.cloud.vision.v1p1beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -193,7 +187,6 @@ public int getMedicalValue() {
    * .google.cloud.vision.v1p1beta1.Likelihood medical = 3;
    */
   public com.google.cloud.vision.v1p1beta1.Likelihood getMedical() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p1beta1.Likelihood result = com.google.cloud.vision.v1p1beta1.Likelihood.valueOf(medical_);
     return result == null ? com.google.cloud.vision.v1p1beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -218,7 +211,6 @@ public int getViolenceValue() {
    * .google.cloud.vision.v1p1beta1.Likelihood violence = 4;
    */
   public com.google.cloud.vision.v1p1beta1.Likelihood getViolence() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p1beta1.Likelihood result = com.google.cloud.vision.v1p1beta1.Likelihood.valueOf(violence_);
     return result == null ? com.google.cloud.vision.v1p1beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -249,13 +241,11 @@ public int getRacyValue() {
    * .google.cloud.vision.v1p1beta1.Likelihood racy = 9;
    */
   public com.google.cloud.vision.v1p1beta1.Likelihood getRacy() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p1beta1.Likelihood result = com.google.cloud.vision.v1p1beta1.Likelihood.valueOf(racy_);
     return result == null ? com.google.cloud.vision.v1p1beta1.Likelihood.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -265,7 +255,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (adult_ != com.google.cloud.vision.v1p1beta1.Likelihood.UNKNOWN.getNumber()) {
@@ -286,7 +275,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -429,7 +417,6 @@ public static com.google.cloud.vision.v1p1beta1.SafeSearchAnnotation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -437,7 +424,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.SafeSearchAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -467,7 +453,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_SafeSearchAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_SafeSearchAnnotation_fieldAccessorTable
@@ -490,7 +475,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       adult_ = 0;
@@ -506,18 +490,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_SafeSearchAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.SafeSearchAnnotation getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p1beta1.SafeSearchAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.SafeSearchAnnotation build() {
       com.google.cloud.vision.v1p1beta1.SafeSearchAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -526,7 +507,6 @@ public com.google.cloud.vision.v1p1beta1.SafeSearchAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.SafeSearchAnnotation buildPartial() {
       com.google.cloud.vision.v1p1beta1.SafeSearchAnnotation result = new com.google.cloud.vision.v1p1beta1.SafeSearchAnnotation(this);
       result.adult_ = adult_;
@@ -538,39 +518,32 @@ public com.google.cloud.vision.v1p1beta1.SafeSearchAnnotation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p1beta1.SafeSearchAnnotation) {
         return mergeFrom((com.google.cloud.vision.v1p1beta1.SafeSearchAnnotation)other);
@@ -602,12 +575,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.SafeSearchAnnotation
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -663,7 +634,6 @@ public Builder setAdultValue(int value) {
      * .google.cloud.vision.v1p1beta1.Likelihood adult = 1;
      */
     public com.google.cloud.vision.v1p1beta1.Likelihood getAdult() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p1beta1.Likelihood result = com.google.cloud.vision.v1p1beta1.Likelihood.valueOf(adult_);
       return result == null ? com.google.cloud.vision.v1p1beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -738,7 +708,6 @@ public Builder setSpoofValue(int value) {
      * .google.cloud.vision.v1p1beta1.Likelihood spoof = 2;
      */
     public com.google.cloud.vision.v1p1beta1.Likelihood getSpoof() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p1beta1.Likelihood result = com.google.cloud.vision.v1p1beta1.Likelihood.valueOf(spoof_);
       return result == null ? com.google.cloud.vision.v1p1beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -807,7 +776,6 @@ public Builder setMedicalValue(int value) {
      * .google.cloud.vision.v1p1beta1.Likelihood medical = 3;
      */
     public com.google.cloud.vision.v1p1beta1.Likelihood getMedical() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p1beta1.Likelihood result = com.google.cloud.vision.v1p1beta1.Likelihood.valueOf(medical_);
       return result == null ? com.google.cloud.vision.v1p1beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -872,7 +840,6 @@ public Builder setViolenceValue(int value) {
      * .google.cloud.vision.v1p1beta1.Likelihood violence = 4;
      */
     public com.google.cloud.vision.v1p1beta1.Likelihood getViolence() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p1beta1.Likelihood result = com.google.cloud.vision.v1p1beta1.Likelihood.valueOf(violence_);
       return result == null ? com.google.cloud.vision.v1p1beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -946,7 +913,6 @@ public Builder setRacyValue(int value) {
      * .google.cloud.vision.v1p1beta1.Likelihood racy = 9;
      */
     public com.google.cloud.vision.v1p1beta1.Likelihood getRacy() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p1beta1.Likelihood result = com.google.cloud.vision.v1p1beta1.Likelihood.valueOf(racy_);
       return result == null ? com.google.cloud.vision.v1p1beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -985,13 +951,11 @@ public Builder clearRacy() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1013,12 +977,11 @@ public static com.google.cloud.vision.v1p1beta1.SafeSearchAnnotation getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SafeSearchAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SafeSearchAnnotation(input, extensionRegistry);
+        return new SafeSearchAnnotation(input, extensionRegistry);
     }
   };
 
@@ -1031,7 +994,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p1beta1.SafeSearchAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Symbol.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Symbol.java
index 05d4ff3a3ab1..3ae3965b90d8 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Symbol.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Symbol.java
@@ -34,9 +34,6 @@ private Symbol(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private Symbol(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p1beta1.TextAnnotation.TextProperty.Builder subBuilder = null;
             if (property_ != null) {
@@ -85,13 +89,6 @@ private Symbol(
             confidence_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -109,7 +106,6 @@ private Symbol(
     return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_Symbol_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_Symbol_fieldAccessorTable
@@ -281,7 +277,6 @@ public float getConfidence() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -291,7 +286,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (property_ != null) {
@@ -309,7 +303,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -461,7 +454,6 @@ public static com.google.cloud.vision.v1p1beta1.Symbol parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -469,7 +461,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.Symbol prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -497,7 +488,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_Symbol_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_Symbol_fieldAccessorTable
@@ -520,7 +510,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (propertyBuilder_ == null) {
@@ -542,18 +531,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_Symbol_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.Symbol getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p1beta1.Symbol.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.Symbol build() {
       com.google.cloud.vision.v1p1beta1.Symbol result = buildPartial();
       if (!result.isInitialized()) {
@@ -562,7 +548,6 @@ public com.google.cloud.vision.v1p1beta1.Symbol build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.Symbol buildPartial() {
       com.google.cloud.vision.v1p1beta1.Symbol result = new com.google.cloud.vision.v1p1beta1.Symbol(this);
       if (propertyBuilder_ == null) {
@@ -581,39 +566,32 @@ public com.google.cloud.vision.v1p1beta1.Symbol buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p1beta1.Symbol) {
         return mergeFrom((com.google.cloud.vision.v1p1beta1.Symbol)other);
@@ -643,12 +621,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.Symbol other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1225,13 +1201,11 @@ public Builder clearConfidence() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1253,12 +1227,11 @@ public static com.google.cloud.vision.v1p1beta1.Symbol getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Symbol parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Symbol(input, extensionRegistry);
+        return new Symbol(input, extensionRegistry);
     }
   };
 
@@ -1271,7 +1244,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p1beta1.Symbol getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/TextAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/TextAnnotation.java
index 1cf4f8661ca2..4f4609a948f1 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/TextAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/TextAnnotation.java
@@ -41,9 +41,6 @@ private TextAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -55,6 +52,13 @@ private TextAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               pages_ = new java.util.ArrayList();
@@ -70,13 +74,6 @@ private TextAnnotation(
             text_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private TextAnnotation(
     return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_TextAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_TextAnnotation_fieldAccessorTable
@@ -171,9 +167,6 @@ private DetectedLanguage(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -185,6 +178,13 @@ private DetectedLanguage(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -196,13 +196,6 @@ private DetectedLanguage(
               confidence_ = input.readFloat();
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -220,7 +213,6 @@ private DetectedLanguage(
       return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_TextAnnotation_DetectedLanguage_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_TextAnnotation_DetectedLanguage_fieldAccessorTable
@@ -288,7 +280,6 @@ public float getConfidence() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -298,7 +289,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getLanguageCodeBytes().isEmpty()) {
@@ -310,7 +300,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -436,7 +425,6 @@ public static com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedLanguage
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -444,7 +432,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedLanguage prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -472,7 +459,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_TextAnnotation_DetectedLanguage_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_TextAnnotation_DetectedLanguage_fieldAccessorTable
@@ -495,7 +481,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         languageCode_ = "";
@@ -505,18 +490,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_TextAnnotation_DetectedLanguage_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedLanguage getDefaultInstanceForType() {
         return com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedLanguage.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedLanguage build() {
         com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedLanguage result = buildPartial();
         if (!result.isInitialized()) {
@@ -525,7 +507,6 @@ public com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedLanguage build()
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedLanguage buildPartial() {
         com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedLanguage result = new com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedLanguage(this);
         result.languageCode_ = languageCode_;
@@ -534,39 +515,32 @@ public com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedLanguage buildPa
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedLanguage) {
           return mergeFrom((com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedLanguage)other);
@@ -590,12 +564,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.TextAnnotation.Detect
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -750,13 +722,11 @@ public Builder clearConfidence() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -778,12 +748,11 @@ public static com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedLanguage
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public DetectedLanguage parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new DetectedLanguage(input, extensionRegistry);
+          return new DetectedLanguage(input, extensionRegistry);
       }
     };
 
@@ -796,7 +765,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedLanguage getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -864,9 +832,6 @@ private DetectedBreak(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -878,6 +843,13 @@ private DetectedBreak(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 8: {
               int rawValue = input.readEnum();
 
@@ -889,13 +861,6 @@ private DetectedBreak(
               isPrefix_ = input.readBool();
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -913,7 +878,6 @@ private DetectedBreak(
       return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_TextAnnotation_DetectedBreak_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_TextAnnotation_DetectedBreak_fieldAccessorTable
@@ -1129,7 +1093,6 @@ public int getTypeValue() {
      * .google.cloud.vision.v1p1beta1.TextAnnotation.DetectedBreak.BreakType type = 1;
      */
     public com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedBreak.BreakType getType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedBreak.BreakType result = com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedBreak.BreakType.valueOf(type_);
       return result == null ? com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedBreak.BreakType.UNRECOGNIZED : result;
     }
@@ -1148,7 +1111,6 @@ public boolean getIsPrefix() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1158,7 +1120,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (type_ != com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedBreak.BreakType.UNKNOWN.getNumber()) {
@@ -1170,7 +1131,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -1294,7 +1254,6 @@ public static com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedBreak par
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -1302,7 +1261,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedBreak prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -1330,7 +1288,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_TextAnnotation_DetectedBreak_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_TextAnnotation_DetectedBreak_fieldAccessorTable
@@ -1353,7 +1310,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         type_ = 0;
@@ -1363,18 +1319,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_TextAnnotation_DetectedBreak_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedBreak getDefaultInstanceForType() {
         return com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedBreak.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedBreak build() {
         com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedBreak result = buildPartial();
         if (!result.isInitialized()) {
@@ -1383,7 +1336,6 @@ public com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedBreak build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedBreak buildPartial() {
         com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedBreak result = new com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedBreak(this);
         result.type_ = type_;
@@ -1392,39 +1344,32 @@ public com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedBreak buildParti
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedBreak) {
           return mergeFrom((com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedBreak)other);
@@ -1447,12 +1392,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.TextAnnotation.Detect
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1502,7 +1445,6 @@ public Builder setTypeValue(int value) {
        * .google.cloud.vision.v1p1beta1.TextAnnotation.DetectedBreak.BreakType type = 1;
        */
       public com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedBreak.BreakType getType() {
-        @SuppressWarnings("deprecation")
         com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedBreak.BreakType result = com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedBreak.BreakType.valueOf(type_);
         return result == null ? com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedBreak.BreakType.UNRECOGNIZED : result;
       }
@@ -1573,13 +1515,11 @@ public Builder clearIsPrefix() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1601,12 +1541,11 @@ public static com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedBreak get
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public DetectedBreak parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new DetectedBreak(input, extensionRegistry);
+          return new DetectedBreak(input, extensionRegistry);
       }
     };
 
@@ -1619,7 +1558,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedBreak getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1729,9 +1667,6 @@ private TextProperty(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1743,6 +1678,13 @@ private TextProperty(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
                 detectedLanguages_ = new java.util.ArrayList();
@@ -1765,13 +1707,6 @@ private TextProperty(
 
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1792,7 +1727,6 @@ private TextProperty(
       return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_TextAnnotation_TextProperty_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_TextAnnotation_TextProperty_fieldAccessorTable
@@ -1890,7 +1824,6 @@ public com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedBreakOrBuilder g
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1900,7 +1833,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < detectedLanguages_.size(); i++) {
@@ -1912,7 +1844,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -2043,7 +1974,6 @@ public static com.google.cloud.vision.v1p1beta1.TextAnnotation.TextProperty pars
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -2051,7 +1981,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.TextAnnotation.TextProperty prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -2079,7 +2008,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_TextAnnotation_TextProperty_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_TextAnnotation_TextProperty_fieldAccessorTable
@@ -2103,7 +2031,6 @@ private void maybeForceBuilderInitialization() {
           getDetectedLanguagesFieldBuilder();
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         if (detectedLanguagesBuilder_ == null) {
@@ -2121,18 +2048,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_TextAnnotation_TextProperty_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p1beta1.TextAnnotation.TextProperty getDefaultInstanceForType() {
         return com.google.cloud.vision.v1p1beta1.TextAnnotation.TextProperty.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p1beta1.TextAnnotation.TextProperty build() {
         com.google.cloud.vision.v1p1beta1.TextAnnotation.TextProperty result = buildPartial();
         if (!result.isInitialized()) {
@@ -2141,7 +2065,6 @@ public com.google.cloud.vision.v1p1beta1.TextAnnotation.TextProperty build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p1beta1.TextAnnotation.TextProperty buildPartial() {
         com.google.cloud.vision.v1p1beta1.TextAnnotation.TextProperty result = new com.google.cloud.vision.v1p1beta1.TextAnnotation.TextProperty(this);
         int from_bitField0_ = bitField0_;
@@ -2165,39 +2088,32 @@ public com.google.cloud.vision.v1p1beta1.TextAnnotation.TextProperty buildPartia
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1p1beta1.TextAnnotation.TextProperty) {
           return mergeFrom((com.google.cloud.vision.v1p1beta1.TextAnnotation.TextProperty)other);
@@ -2243,12 +2159,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.TextAnnotation.TextPr
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2732,13 +2646,11 @@ public com.google.cloud.vision.v1p1beta1.TextAnnotation.DetectedBreakOrBuilder g
         }
         return detectedBreakBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -2760,12 +2672,11 @@ public static com.google.cloud.vision.v1p1beta1.TextAnnotation.TextProperty getD
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public TextProperty parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new TextProperty(input, extensionRegistry);
+          return new TextProperty(input, extensionRegistry);
       }
     };
 
@@ -2778,7 +2689,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.TextAnnotation.TextProperty getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -2884,7 +2794,6 @@ public java.lang.String getText() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -2894,7 +2803,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < pages_.size(); i++) {
@@ -2906,7 +2814,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -3031,7 +2938,6 @@ public static com.google.cloud.vision.v1p1beta1.TextAnnotation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -3039,7 +2945,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.TextAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -3074,7 +2979,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_TextAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_TextAnnotation_fieldAccessorTable
@@ -3098,7 +3002,6 @@ private void maybeForceBuilderInitialization() {
         getPagesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (pagesBuilder_ == null) {
@@ -3112,18 +3015,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_TextAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.TextAnnotation getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p1beta1.TextAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.TextAnnotation build() {
       com.google.cloud.vision.v1p1beta1.TextAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -3132,7 +3032,6 @@ public com.google.cloud.vision.v1p1beta1.TextAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.TextAnnotation buildPartial() {
       com.google.cloud.vision.v1p1beta1.TextAnnotation result = new com.google.cloud.vision.v1p1beta1.TextAnnotation(this);
       int from_bitField0_ = bitField0_;
@@ -3152,39 +3051,32 @@ public com.google.cloud.vision.v1p1beta1.TextAnnotation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p1beta1.TextAnnotation) {
         return mergeFrom((com.google.cloud.vision.v1p1beta1.TextAnnotation)other);
@@ -3231,12 +3123,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.TextAnnotation other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3656,13 +3546,11 @@ public Builder setTextBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -3684,12 +3572,11 @@ public static com.google.cloud.vision.v1p1beta1.TextAnnotation getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TextAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TextAnnotation(input, extensionRegistry);
+        return new TextAnnotation(input, extensionRegistry);
     }
   };
 
@@ -3702,7 +3589,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p1beta1.TextAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/TextAnnotationProto.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/TextAnnotationProto.java
index 9c36d352429c..1d13c1eaaea4 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/TextAnnotationProto.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/TextAnnotationProto.java
@@ -77,7 +77,7 @@ public static void registerAllExtensions(
       "\002 \001(\t\032=\n\020DetectedLanguage\022\025\n\rlanguage_co" +
       "de\030\001 \001(\t\022\022\n\nconfidence\030\002 \001(\002\032\334\001\n\rDetecte" +
       "dBreak\022S\n\004type\030\001 \001(\0162E.google.cloud.visi" +
-      "on.v1p1beta1.TextAnnotation.DetectedBrea" +
+      "on.v1p1beta1.TextAnnotation.DetectedBrea",
       "k.BreakType\022\021\n\tis_prefix\030\002 \001(\010\"c\n\tBreakT" +
       "ype\022\013\n\007UNKNOWN\020\000\022\t\n\005SPACE\020\001\022\016\n\nSURE_SPAC" +
       "E\020\002\022\022\n\016EOL_SURE_SPACE\020\003\022\n\n\006HYPHEN\020\004\022\016\n\nL" +
@@ -87,7 +87,7 @@ public static void registerAllExtensions(
       "\022S\n\016detected_break\030\002 \001(\0132;.google.cloud." +
       "vision.v1p1beta1.TextAnnotation.Detected" +
       "Break\"\275\001\n\004Page\022L\n\010property\030\001 \001(\0132:.googl" +
-      "e.cloud.vision.v1p1beta1.TextAnnotation." +
+      "e.cloud.vision.v1p1beta1.TextAnnotation.",
       "TextProperty\022\r\n\005width\030\002 \001(\005\022\016\n\006height\030\003 " +
       "\001(\005\0224\n\006blocks\030\004 \003(\0132$.google.cloud.visio" +
       "n.v1p1beta1.Block\022\022\n\nconfidence\030\005 \001(\002\"\202\003" +
@@ -97,7 +97,7 @@ public static void registerAllExtensions(
       "ud.vision.v1p1beta1.BoundingPoly\022<\n\npara" +
       "graphs\030\003 \003(\0132(.google.cloud.vision.v1p1b" +
       "eta1.Paragraph\022B\n\nblock_type\030\004 \001(\0162..goo" +
-      "gle.cloud.vision.v1p1beta1.Block.BlockTy" +
+      "gle.cloud.vision.v1p1beta1.Block.BlockTy",
       "pe\022\022\n\nconfidence\030\005 \001(\002\"R\n\tBlockType\022\013\n\007U" +
       "NKNOWN\020\000\022\010\n\004TEXT\020\001\022\t\n\005TABLE\020\002\022\013\n\007PICTURE" +
       "\020\003\022\t\n\005RULER\020\004\022\013\n\007BARCODE\020\005\"\344\001\n\tParagraph" +
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "on.v1p1beta1.BoundingPoly\0222\n\005words\030\003 \003(\013" +
       "2#.google.cloud.vision.v1p1beta1.Word\022\022\n" +
       "\nconfidence\030\004 \001(\002\"\343\001\n\004Word\022L\n\010property\030\001" +
-      " \001(\0132:.google.cloud.vision.v1p1beta1.Tex" +
+      " \001(\0132:.google.cloud.vision.v1p1beta1.Tex",
       "tAnnotation.TextProperty\022A\n\014bounding_box" +
       "\030\002 \001(\0132+.google.cloud.vision.v1p1beta1.B" +
       "oundingPoly\0226\n\007symbols\030\003 \003(\0132%.google.cl" +
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       "ion.TextProperty\022A\n\014bounding_box\030\002 \001(\0132+" +
       ".google.cloud.vision.v1p1beta1.BoundingP" +
       "oly\022\014\n\004text\030\003 \001(\t\022\022\n\nconfidence\030\004 \001(\002B\202\001" +
-      "\n!com.google.cloud.vision.v1p1beta1B\023Tex" +
+      "\n!com.google.cloud.vision.v1p1beta1B\023Tex",
       "tAnnotationProtoP\001ZCgoogle.golang.org/ge" +
       "nproto/googleapis/cloud/vision/v1p1beta1" +
       ";vision\370\001\001b\006proto3"
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Vertex.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Vertex.java
index a0cd71f1c2df..167d6f7d7bb6 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Vertex.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Vertex.java
@@ -35,9 +35,6 @@ private Vertex(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private Vertex(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
 
             x_ = input.readInt32();
@@ -59,13 +63,6 @@ private Vertex(
             y_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private Vertex(
     return com.google.cloud.vision.v1p1beta1.GeometryProto.internal_static_google_cloud_vision_v1p1beta1_Vertex_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p1beta1.GeometryProto.internal_static_google_cloud_vision_v1p1beta1_Vertex_fieldAccessorTable
@@ -118,7 +114,6 @@ public int getY() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -128,7 +123,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (x_ != 0) {
@@ -140,7 +134,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.cloud.vision.v1p1beta1.Vertex parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.Vertex prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p1beta1.GeometryProto.internal_static_google_cloud_vision_v1p1beta1_Vertex_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.GeometryProto.internal_static_google_cloud_vision_v1p1beta1_Vertex_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       x_ = 0;
@@ -334,18 +323,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p1beta1.GeometryProto.internal_static_google_cloud_vision_v1p1beta1_Vertex_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.Vertex getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p1beta1.Vertex.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.Vertex build() {
       com.google.cloud.vision.v1p1beta1.Vertex result = buildPartial();
       if (!result.isInitialized()) {
@@ -354,7 +340,6 @@ public com.google.cloud.vision.v1p1beta1.Vertex build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.Vertex buildPartial() {
       com.google.cloud.vision.v1p1beta1.Vertex result = new com.google.cloud.vision.v1p1beta1.Vertex(this);
       result.x_ = x_;
@@ -363,39 +348,32 @@ public com.google.cloud.vision.v1p1beta1.Vertex buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p1beta1.Vertex) {
         return mergeFrom((com.google.cloud.vision.v1p1beta1.Vertex)other);
@@ -418,12 +396,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.Vertex other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -517,13 +493,11 @@ public Builder clearY() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -545,12 +519,11 @@ public static com.google.cloud.vision.v1p1beta1.Vertex getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Vertex parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Vertex(input, extensionRegistry);
+        return new Vertex(input, extensionRegistry);
     }
   };
 
@@ -563,7 +536,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p1beta1.Vertex getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/WebDetection.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/WebDetection.java
index 253323444d53..55ccd018ede1 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/WebDetection.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/WebDetection.java
@@ -38,9 +38,6 @@ private WebDetection(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private WebDetection(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               webEntities_ = new java.util.ArrayList();
@@ -106,13 +110,6 @@ private WebDetection(
                 input.readMessage(com.google.cloud.vision.v1p1beta1.WebDetection.WebLabel.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -148,7 +145,6 @@ private WebDetection(
     return com.google.cloud.vision.v1p1beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p1beta1_WebDetection_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p1beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p1beta1_WebDetection_fieldAccessorTable
@@ -238,9 +234,6 @@ private WebEntity(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -252,6 +245,13 @@ private WebEntity(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -269,13 +269,6 @@ private WebEntity(
               description_ = s;
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -293,7 +286,6 @@ private WebEntity(
       return com.google.cloud.vision.v1p1beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p1beta1_WebDetection_WebEntity_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p1beta1_WebDetection_WebEntity_fieldAccessorTable
@@ -400,7 +392,6 @@ public java.lang.String getDescription() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -410,7 +401,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getEntityIdBytes().isEmpty()) {
@@ -425,7 +415,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -558,7 +547,6 @@ public static com.google.cloud.vision.v1p1beta1.WebDetection.WebEntity parseFrom
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -566,7 +554,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.WebDetection.WebEntity prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -594,7 +581,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1p1beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p1beta1_WebDetection_WebEntity_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1p1beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p1beta1_WebDetection_WebEntity_fieldAccessorTable
@@ -617,7 +603,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         entityId_ = "";
@@ -629,18 +614,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1p1beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p1beta1_WebDetection_WebEntity_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p1beta1.WebDetection.WebEntity getDefaultInstanceForType() {
         return com.google.cloud.vision.v1p1beta1.WebDetection.WebEntity.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p1beta1.WebDetection.WebEntity build() {
         com.google.cloud.vision.v1p1beta1.WebDetection.WebEntity result = buildPartial();
         if (!result.isInitialized()) {
@@ -649,7 +631,6 @@ public com.google.cloud.vision.v1p1beta1.WebDetection.WebEntity build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p1beta1.WebDetection.WebEntity buildPartial() {
         com.google.cloud.vision.v1p1beta1.WebDetection.WebEntity result = new com.google.cloud.vision.v1p1beta1.WebDetection.WebEntity(this);
         result.entityId_ = entityId_;
@@ -659,39 +640,32 @@ public com.google.cloud.vision.v1p1beta1.WebDetection.WebEntity buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1p1beta1.WebDetection.WebEntity) {
           return mergeFrom((com.google.cloud.vision.v1p1beta1.WebDetection.WebEntity)other);
@@ -719,12 +693,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.WebDetection.WebEntit
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -961,13 +933,11 @@ public Builder setDescriptionBytes(
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -989,12 +959,11 @@ public static com.google.cloud.vision.v1p1beta1.WebDetection.WebEntity getDefaul
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public WebEntity parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new WebEntity(input, extensionRegistry);
+          return new WebEntity(input, extensionRegistry);
       }
     };
 
@@ -1007,7 +976,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.WebDetection.WebEntity getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1076,9 +1044,6 @@ private WebImage(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1090,6 +1055,13 @@ private WebImage(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -1101,13 +1073,6 @@ private WebImage(
               score_ = input.readFloat();
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1125,7 +1090,6 @@ private WebImage(
       return com.google.cloud.vision.v1p1beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p1beta1_WebDetection_WebImage_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p1beta1_WebDetection_WebImage_fieldAccessorTable
@@ -1189,7 +1153,6 @@ public float getScore() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1199,7 +1162,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getUrlBytes().isEmpty()) {
@@ -1211,7 +1173,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -1337,7 +1298,6 @@ public static com.google.cloud.vision.v1p1beta1.WebDetection.WebImage parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -1345,7 +1305,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.WebDetection.WebImage prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -1373,7 +1332,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1p1beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p1beta1_WebDetection_WebImage_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1p1beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p1beta1_WebDetection_WebImage_fieldAccessorTable
@@ -1396,7 +1354,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         url_ = "";
@@ -1406,18 +1363,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1p1beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p1beta1_WebDetection_WebImage_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p1beta1.WebDetection.WebImage getDefaultInstanceForType() {
         return com.google.cloud.vision.v1p1beta1.WebDetection.WebImage.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p1beta1.WebDetection.WebImage build() {
         com.google.cloud.vision.v1p1beta1.WebDetection.WebImage result = buildPartial();
         if (!result.isInitialized()) {
@@ -1426,7 +1380,6 @@ public com.google.cloud.vision.v1p1beta1.WebDetection.WebImage build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p1beta1.WebDetection.WebImage buildPartial() {
         com.google.cloud.vision.v1p1beta1.WebDetection.WebImage result = new com.google.cloud.vision.v1p1beta1.WebDetection.WebImage(this);
         result.url_ = url_;
@@ -1435,39 +1388,32 @@ public com.google.cloud.vision.v1p1beta1.WebDetection.WebImage buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1p1beta1.WebDetection.WebImage) {
           return mergeFrom((com.google.cloud.vision.v1p1beta1.WebDetection.WebImage)other);
@@ -1491,12 +1437,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.WebDetection.WebImage
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1641,13 +1585,11 @@ public Builder clearScore() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1669,12 +1611,11 @@ public static com.google.cloud.vision.v1p1beta1.WebDetection.WebImage getDefault
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public WebImage parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new WebImage(input, extensionRegistry);
+          return new WebImage(input, extensionRegistry);
       }
     };
 
@@ -1687,7 +1628,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.WebDetection.WebImage getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1885,9 +1825,6 @@ private WebPage(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1899,6 +1836,13 @@ private WebPage(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -1934,13 +1878,6 @@ private WebPage(
                   input.readMessage(com.google.cloud.vision.v1p1beta1.WebDetection.WebImage.parser(), extensionRegistry));
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1964,7 +1901,6 @@ private WebPage(
       return com.google.cloud.vision.v1p1beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p1beta1_WebDetection_WebPage_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p1beta1_WebDetection_WebPage_fieldAccessorTable
@@ -2201,7 +2137,6 @@ public com.google.cloud.vision.v1p1beta1.WebDetection.WebImageOrBuilder getParti
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -2211,7 +2146,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getUrlBytes().isEmpty()) {
@@ -2232,7 +2166,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -2385,7 +2318,6 @@ public static com.google.cloud.vision.v1p1beta1.WebDetection.WebPage parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -2393,7 +2325,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.WebDetection.WebPage prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -2421,7 +2352,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1p1beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p1beta1_WebDetection_WebPage_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1p1beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p1beta1_WebDetection_WebPage_fieldAccessorTable
@@ -2446,7 +2376,6 @@ private void maybeForceBuilderInitialization() {
           getPartialMatchingImagesFieldBuilder();
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         url_ = "";
@@ -2470,18 +2399,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1p1beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p1beta1_WebDetection_WebPage_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p1beta1.WebDetection.WebPage getDefaultInstanceForType() {
         return com.google.cloud.vision.v1p1beta1.WebDetection.WebPage.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p1beta1.WebDetection.WebPage build() {
         com.google.cloud.vision.v1p1beta1.WebDetection.WebPage result = buildPartial();
         if (!result.isInitialized()) {
@@ -2490,7 +2416,6 @@ public com.google.cloud.vision.v1p1beta1.WebDetection.WebPage build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p1beta1.WebDetection.WebPage buildPartial() {
         com.google.cloud.vision.v1p1beta1.WebDetection.WebPage result = new com.google.cloud.vision.v1p1beta1.WebDetection.WebPage(this);
         int from_bitField0_ = bitField0_;
@@ -2521,39 +2446,32 @@ public com.google.cloud.vision.v1p1beta1.WebDetection.WebPage buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1p1beta1.WebDetection.WebPage) {
           return mergeFrom((com.google.cloud.vision.v1p1beta1.WebDetection.WebPage)other);
@@ -2633,12 +2551,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.WebDetection.WebPage
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3569,13 +3485,11 @@ public com.google.cloud.vision.v1p1beta1.WebDetection.WebImage.Builder addPartia
         }
         return partialMatchingImagesBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -3597,12 +3511,11 @@ public static com.google.cloud.vision.v1p1beta1.WebDetection.WebPage getDefaultI
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public WebPage parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new WebPage(input, extensionRegistry);
+          return new WebPage(input, extensionRegistry);
       }
     };
 
@@ -3615,7 +3528,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.WebDetection.WebPage getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -3697,9 +3609,6 @@ private WebLabel(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3711,6 +3620,13 @@ private WebLabel(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -3723,13 +3639,6 @@ private WebLabel(
               languageCode_ = s;
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -3747,7 +3656,6 @@ private WebLabel(
       return com.google.cloud.vision.v1p1beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p1beta1_WebDetection_WebLabel_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p1beta1_WebDetection_WebLabel_fieldAccessorTable
@@ -3844,7 +3752,6 @@ public java.lang.String getLanguageCode() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -3854,7 +3761,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getLabelBytes().isEmpty()) {
@@ -3866,7 +3772,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -3988,7 +3893,6 @@ public static com.google.cloud.vision.v1p1beta1.WebDetection.WebLabel parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -3996,7 +3900,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.WebDetection.WebLabel prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -4024,7 +3927,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1p1beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p1beta1_WebDetection_WebLabel_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1p1beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p1beta1_WebDetection_WebLabel_fieldAccessorTable
@@ -4047,7 +3949,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         label_ = "";
@@ -4057,18 +3958,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1p1beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p1beta1_WebDetection_WebLabel_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p1beta1.WebDetection.WebLabel getDefaultInstanceForType() {
         return com.google.cloud.vision.v1p1beta1.WebDetection.WebLabel.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p1beta1.WebDetection.WebLabel build() {
         com.google.cloud.vision.v1p1beta1.WebDetection.WebLabel result = buildPartial();
         if (!result.isInitialized()) {
@@ -4077,7 +3975,6 @@ public com.google.cloud.vision.v1p1beta1.WebDetection.WebLabel build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p1beta1.WebDetection.WebLabel buildPartial() {
         com.google.cloud.vision.v1p1beta1.WebDetection.WebLabel result = new com.google.cloud.vision.v1p1beta1.WebDetection.WebLabel(this);
         result.label_ = label_;
@@ -4086,39 +3983,32 @@ public com.google.cloud.vision.v1p1beta1.WebDetection.WebLabel buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1p1beta1.WebDetection.WebLabel) {
           return mergeFrom((com.google.cloud.vision.v1p1beta1.WebDetection.WebLabel)other);
@@ -4143,12 +4033,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.WebDetection.WebLabel
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4354,13 +4242,11 @@ public Builder setLanguageCodeBytes(
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -4382,12 +4268,11 @@ public static com.google.cloud.vision.v1p1beta1.WebDetection.WebLabel getDefault
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public WebLabel parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new WebLabel(input, extensionRegistry);
+          return new WebLabel(input, extensionRegistry);
       }
     };
 
@@ -4400,7 +4285,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.WebDetection.WebLabel getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -4753,7 +4637,6 @@ public com.google.cloud.vision.v1p1beta1.WebDetection.WebLabelOrBuilder getBestG
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -4763,7 +4646,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < webEntities_.size(); i++) {
@@ -4787,7 +4669,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -4955,7 +4836,6 @@ public static com.google.cloud.vision.v1p1beta1.WebDetection parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -4963,7 +4843,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.WebDetection prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -4991,7 +4870,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p1beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p1beta1_WebDetection_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p1beta1_WebDetection_fieldAccessorTable
@@ -5020,7 +4898,6 @@ private void maybeForceBuilderInitialization() {
         getBestGuessLabelsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (webEntitiesBuilder_ == null) {
@@ -5062,18 +4939,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p1beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p1beta1_WebDetection_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.WebDetection getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p1beta1.WebDetection.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.WebDetection build() {
       com.google.cloud.vision.v1p1beta1.WebDetection result = buildPartial();
       if (!result.isInitialized()) {
@@ -5082,7 +4956,6 @@ public com.google.cloud.vision.v1p1beta1.WebDetection build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.WebDetection buildPartial() {
       com.google.cloud.vision.v1p1beta1.WebDetection result = new com.google.cloud.vision.v1p1beta1.WebDetection(this);
       int from_bitField0_ = bitField0_;
@@ -5144,39 +5017,32 @@ public com.google.cloud.vision.v1p1beta1.WebDetection buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p1beta1.WebDetection) {
         return mergeFrom((com.google.cloud.vision.v1p1beta1.WebDetection)other);
@@ -5349,12 +5215,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.WebDetection other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -7299,13 +7163,11 @@ public com.google.cloud.vision.v1p1beta1.WebDetection.WebLabel.Builder addBestGu
       }
       return bestGuessLabelsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -7327,12 +7189,11 @@ public static com.google.cloud.vision.v1p1beta1.WebDetection getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public WebDetection parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WebDetection(input, extensionRegistry);
+        return new WebDetection(input, extensionRegistry);
     }
   };
 
@@ -7345,7 +7206,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p1beta1.WebDetection getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/WebDetectionParams.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/WebDetectionParams.java
index 8eece52d7720..47e025db8a3f 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/WebDetectionParams.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/WebDetectionParams.java
@@ -33,9 +33,6 @@ private WebDetectionParams(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,11 +44,6 @@ private WebDetectionParams(
           case 0:
             done = true;
             break;
-          case 16: {
-
-            includeGeoResults_ = input.readBool();
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -59,6 +51,11 @@ private WebDetectionParams(
             }
             break;
           }
+          case 16: {
+
+            includeGeoResults_ = input.readBool();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -76,7 +73,6 @@ private WebDetectionParams(
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_WebDetectionParams_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_WebDetectionParams_fieldAccessorTable
@@ -98,7 +94,6 @@ public boolean getIncludeGeoResults() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -108,7 +103,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (includeGeoResults_ != false) {
@@ -117,7 +111,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -234,7 +227,6 @@ public static com.google.cloud.vision.v1p1beta1.WebDetectionParams parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -242,7 +234,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.WebDetectionParams prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -270,7 +261,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_WebDetectionParams_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_WebDetectionParams_fieldAccessorTable
@@ -293,7 +283,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       includeGeoResults_ = false;
@@ -301,18 +290,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p1beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p1beta1_WebDetectionParams_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.WebDetectionParams getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p1beta1.WebDetectionParams.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.WebDetectionParams build() {
       com.google.cloud.vision.v1p1beta1.WebDetectionParams result = buildPartial();
       if (!result.isInitialized()) {
@@ -321,7 +307,6 @@ public com.google.cloud.vision.v1p1beta1.WebDetectionParams build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.WebDetectionParams buildPartial() {
       com.google.cloud.vision.v1p1beta1.WebDetectionParams result = new com.google.cloud.vision.v1p1beta1.WebDetectionParams(this);
       result.includeGeoResults_ = includeGeoResults_;
@@ -329,39 +314,32 @@ public com.google.cloud.vision.v1p1beta1.WebDetectionParams buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p1beta1.WebDetectionParams) {
         return mergeFrom((com.google.cloud.vision.v1p1beta1.WebDetectionParams)other);
@@ -381,12 +359,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.WebDetectionParams ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -442,13 +418,11 @@ public Builder clearIncludeGeoResults() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -470,12 +444,11 @@ public static com.google.cloud.vision.v1p1beta1.WebDetectionParams getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public WebDetectionParams parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WebDetectionParams(input, extensionRegistry);
+        return new WebDetectionParams(input, extensionRegistry);
     }
   };
 
@@ -488,7 +461,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p1beta1.WebDetectionParams getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/WebDetectionProto.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/WebDetectionProto.java
index d9c671c9192d..b2c743a32b40 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/WebDetectionProto.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/WebDetectionProto.java
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "oogle.cloud.vision.v1p1beta1.WebDetectio" +
       "n.WebImage\022U\n\027partial_matching_images\030\003 " +
       "\003(\01324.google.cloud.vision.v1p1beta1.WebD" +
-      "etection.WebImage\022W\n\032pages_with_matching" +
+      "etection.WebImage\022W\n\032pages_with_matching",
       "_images\030\004 \003(\01323.google.cloud.vision.v1p1" +
       "beta1.WebDetection.WebPage\022U\n\027visually_s" +
       "imilar_images\030\006 \003(\01324.google.cloud.visio" +
@@ -67,7 +67,7 @@ public static void registerAllExtensions(
       "bEntity\022\021\n\tentity_id\030\001 \001(\t\022\r\n\005score\030\002 \001(" +
       "\002\022\023\n\013description\030\003 \001(\t\032&\n\010WebImage\022\013\n\003ur" +
       "l\030\001 \001(\t\022\r\n\005score\030\002 \001(\002\032\344\001\n\007WebPage\022\013\n\003ur" +
-      "l\030\001 \001(\t\022\r\n\005score\030\002 \001(\002\022\022\n\npage_title\030\003 \001" +
+      "l\030\001 \001(\t\022\r\n\005score\030\002 \001(\002\022\022\n\npage_title\030\003 \001",
       "(\t\022R\n\024full_matching_images\030\004 \003(\01324.googl" +
       "e.cloud.vision.v1p1beta1.WebDetection.We" +
       "bImage\022U\n\027partial_matching_images\030\005 \003(\0132" +
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Word.java b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Word.java
index 98551a9f4cae..f78287bb1dab 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Word.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p1beta1/src/main/java/com/google/cloud/vision/v1p1beta1/Word.java
@@ -34,9 +34,6 @@ private Word(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private Word(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p1beta1.TextAnnotation.TextProperty.Builder subBuilder = null;
             if (property_ != null) {
@@ -88,13 +92,6 @@ private Word(
             confidence_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -115,7 +112,6 @@ private Word(
     return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_Word_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_Word_fieldAccessorTable
@@ -306,7 +302,6 @@ public float getConfidence() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -316,7 +311,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (property_ != null) {
@@ -334,7 +328,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -489,7 +482,6 @@ public static com.google.cloud.vision.v1p1beta1.Word parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -497,7 +489,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p1beta1.Word prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -525,7 +516,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_Word_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_Word_fieldAccessorTable
@@ -549,7 +539,6 @@ private void maybeForceBuilderInitialization() {
         getSymbolsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (propertyBuilder_ == null) {
@@ -575,18 +564,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p1beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p1beta1_Word_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.Word getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p1beta1.Word.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.Word build() {
       com.google.cloud.vision.v1p1beta1.Word result = buildPartial();
       if (!result.isInitialized()) {
@@ -595,7 +581,6 @@ public com.google.cloud.vision.v1p1beta1.Word build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p1beta1.Word buildPartial() {
       com.google.cloud.vision.v1p1beta1.Word result = new com.google.cloud.vision.v1p1beta1.Word(this);
       int from_bitField0_ = bitField0_;
@@ -625,39 +610,32 @@ public com.google.cloud.vision.v1p1beta1.Word buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p1beta1.Word) {
         return mergeFrom((com.google.cloud.vision.v1p1beta1.Word)other);
@@ -709,12 +687,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p1beta1.Word other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1533,13 +1509,11 @@ public Builder clearConfidence() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1561,12 +1535,11 @@ public static com.google.cloud.vision.v1p1beta1.Word getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Word parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Word(input, extensionRegistry);
+        return new Word(input, extensionRegistry);
     }
   };
 
@@ -1579,7 +1552,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p1beta1.Word getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AnnotateFileResponse.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AnnotateFileResponse.java
index f55301ba70b3..196a7e03215a 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AnnotateFileResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AnnotateFileResponse.java
@@ -34,9 +34,6 @@ private AnnotateFileResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private AnnotateFileResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p2beta1.InputConfig.Builder subBuilder = null;
             if (inputConfig_ != null) {
@@ -70,13 +74,6 @@ private AnnotateFileResponse(
                 input.readMessage(com.google.cloud.vision.v1p2beta1.AnnotateImageResponse.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private AnnotateFileResponse(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AnnotateFileResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AnnotateFileResponse_fieldAccessorTable
@@ -195,7 +191,6 @@ public com.google.cloud.vision.v1p2beta1.AnnotateImageResponseOrBuilder getRespo
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -205,7 +200,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (inputConfig_ != null) {
@@ -217,7 +211,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.cloud.vision.v1p2beta1.AnnotateFileResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.AnnotateFileResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -385,7 +376,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AnnotateFileResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AnnotateFileResponse_fieldAccessorTable
@@ -409,7 +399,6 @@ private void maybeForceBuilderInitialization() {
         getResponsesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (inputConfigBuilder_ == null) {
@@ -427,18 +416,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AnnotateFileResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.AnnotateFileResponse getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.AnnotateFileResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.AnnotateFileResponse build() {
       com.google.cloud.vision.v1p2beta1.AnnotateFileResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -447,7 +433,6 @@ public com.google.cloud.vision.v1p2beta1.AnnotateFileResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.AnnotateFileResponse buildPartial() {
       com.google.cloud.vision.v1p2beta1.AnnotateFileResponse result = new com.google.cloud.vision.v1p2beta1.AnnotateFileResponse(this);
       int from_bitField0_ = bitField0_;
@@ -471,39 +456,32 @@ public com.google.cloud.vision.v1p2beta1.AnnotateFileResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.AnnotateFileResponse) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.AnnotateFileResponse)other);
@@ -549,12 +527,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.AnnotateFileResponse
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1038,13 +1014,11 @@ public com.google.cloud.vision.v1p2beta1.AnnotateImageResponse.Builder addRespon
       }
       return responsesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1066,12 +1040,11 @@ public static com.google.cloud.vision.v1p2beta1.AnnotateFileResponse getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnnotateFileResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateFileResponse(input, extensionRegistry);
+        return new AnnotateFileResponse(input, extensionRegistry);
     }
   };
 
@@ -1084,7 +1057,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.AnnotateFileResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AnnotateImageRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AnnotateImageRequest.java
index e6b3a0ff2296..a5dda029e9dc 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AnnotateImageRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AnnotateImageRequest.java
@@ -34,9 +34,6 @@ private AnnotateImageRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private AnnotateImageRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p2beta1.Image.Builder subBuilder = null;
             if (image_ != null) {
@@ -83,13 +87,6 @@ private AnnotateImageRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -110,7 +107,6 @@ private AnnotateImageRequest(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AnnotateImageRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AnnotateImageRequest_fieldAccessorTable
@@ -241,7 +237,6 @@ public com.google.cloud.vision.v1p2beta1.ImageContextOrBuilder getImageContextOr
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -251,7 +246,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (image_ != null) {
@@ -266,7 +260,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -410,7 +403,6 @@ public static com.google.cloud.vision.v1p2beta1.AnnotateImageRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -418,7 +410,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.AnnotateImageRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -447,7 +438,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AnnotateImageRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AnnotateImageRequest_fieldAccessorTable
@@ -471,7 +461,6 @@ private void maybeForceBuilderInitialization() {
         getFeaturesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (imageBuilder_ == null) {
@@ -495,18 +484,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AnnotateImageRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.AnnotateImageRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.AnnotateImageRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.AnnotateImageRequest build() {
       com.google.cloud.vision.v1p2beta1.AnnotateImageRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -515,7 +501,6 @@ public com.google.cloud.vision.v1p2beta1.AnnotateImageRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.AnnotateImageRequest buildPartial() {
       com.google.cloud.vision.v1p2beta1.AnnotateImageRequest result = new com.google.cloud.vision.v1p2beta1.AnnotateImageRequest(this);
       int from_bitField0_ = bitField0_;
@@ -544,39 +529,32 @@ public com.google.cloud.vision.v1p2beta1.AnnotateImageRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.AnnotateImageRequest) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.AnnotateImageRequest)other);
@@ -625,12 +603,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.AnnotateImageRequest
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1267,13 +1243,11 @@ public com.google.cloud.vision.v1p2beta1.ImageContextOrBuilder getImageContextOr
       }
       return imageContextBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1295,12 +1269,11 @@ public static com.google.cloud.vision.v1p2beta1.AnnotateImageRequest getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnnotateImageRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateImageRequest(input, extensionRegistry);
+        return new AnnotateImageRequest(input, extensionRegistry);
     }
   };
 
@@ -1313,7 +1286,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.AnnotateImageRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AnnotateImageResponse.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AnnotateImageResponse.java
index d564f46ee35a..87cf739c2e99 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AnnotateImageResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AnnotateImageResponse.java
@@ -37,9 +37,6 @@ private AnnotateImageResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private AnnotateImageResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               faceAnnotations_ = new java.util.ArrayList();
@@ -187,13 +191,6 @@ private AnnotateImageResponse(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -226,7 +223,6 @@ private AnnotateImageResponse(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AnnotateImageResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AnnotateImageResponse_fieldAccessorTable
@@ -760,7 +756,6 @@ public com.google.cloud.vision.v1p2beta1.ImageAnnotationContextOrBuilder getCont
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -770,7 +765,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < faceAnnotations_.size(); i++) {
@@ -812,7 +806,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1061,7 +1054,6 @@ public static com.google.cloud.vision.v1p2beta1.AnnotateImageResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1069,7 +1061,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.AnnotateImageResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1097,7 +1088,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AnnotateImageResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AnnotateImageResponse_fieldAccessorTable
@@ -1125,7 +1115,6 @@ private void maybeForceBuilderInitialization() {
         getTextAnnotationsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (faceAnnotationsBuilder_ == null) {
@@ -1203,18 +1192,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AnnotateImageResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.AnnotateImageResponse getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.AnnotateImageResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.AnnotateImageResponse build() {
       com.google.cloud.vision.v1p2beta1.AnnotateImageResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -1223,7 +1209,6 @@ public com.google.cloud.vision.v1p2beta1.AnnotateImageResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.AnnotateImageResponse buildPartial() {
       com.google.cloud.vision.v1p2beta1.AnnotateImageResponse result = new com.google.cloud.vision.v1p2beta1.AnnotateImageResponse(this);
       int from_bitField0_ = bitField0_;
@@ -1313,39 +1298,32 @@ public com.google.cloud.vision.v1p2beta1.AnnotateImageResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.AnnotateImageResponse) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.AnnotateImageResponse)other);
@@ -1513,12 +1491,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.AnnotateImageResponse
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4222,13 +4198,11 @@ public com.google.cloud.vision.v1p2beta1.ImageAnnotationContextOrBuilder getCont
       }
       return contextBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -4250,12 +4224,11 @@ public static com.google.cloud.vision.v1p2beta1.AnnotateImageResponse getDefault
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnnotateImageResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateImageResponse(input, extensionRegistry);
+        return new AnnotateImageResponse(input, extensionRegistry);
     }
   };
 
@@ -4268,7 +4241,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.AnnotateImageResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncAnnotateFileRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncAnnotateFileRequest.java
index 86f3962eb5fd..c014b45d62e2 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncAnnotateFileRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncAnnotateFileRequest.java
@@ -33,9 +33,6 @@ private AsyncAnnotateFileRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private AsyncAnnotateFileRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p2beta1.InputConfig.Builder subBuilder = null;
             if (inputConfig_ != null) {
@@ -95,13 +99,6 @@ private AsyncAnnotateFileRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -122,7 +119,6 @@ private AsyncAnnotateFileRequest(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AsyncAnnotateFileRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AsyncAnnotateFileRequest_fieldAccessorTable
@@ -286,7 +282,6 @@ public com.google.cloud.vision.v1p2beta1.OutputConfigOrBuilder getOutputConfigOr
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -296,7 +291,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (inputConfig_ != null) {
@@ -314,7 +308,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -471,7 +464,6 @@ public static com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileRequest parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -479,7 +471,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -507,7 +498,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AsyncAnnotateFileRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AsyncAnnotateFileRequest_fieldAccessorTable
@@ -531,7 +521,6 @@ private void maybeForceBuilderInitialization() {
         getFeaturesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (inputConfigBuilder_ == null) {
@@ -561,18 +550,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AsyncAnnotateFileRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileRequest build() {
       com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -581,7 +567,6 @@ public com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileRequest buildPartial() {
       com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileRequest result = new com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileRequest(this);
       int from_bitField0_ = bitField0_;
@@ -615,39 +600,32 @@ public com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileRequest buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileRequest) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileRequest)other);
@@ -699,12 +677,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileRequ
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1494,13 +1470,11 @@ public com.google.cloud.vision.v1p2beta1.OutputConfigOrBuilder getOutputConfigOr
       }
       return outputConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1522,12 +1496,11 @@ public static com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileRequest getDefa
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AsyncAnnotateFileRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AsyncAnnotateFileRequest(input, extensionRegistry);
+        return new AsyncAnnotateFileRequest(input, extensionRegistry);
     }
   };
 
@@ -1540,7 +1513,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncAnnotateFileResponse.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncAnnotateFileResponse.java
index 7f51038989d9..140dcc81301f 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncAnnotateFileResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncAnnotateFileResponse.java
@@ -32,9 +32,6 @@ private AsyncAnnotateFileResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private AsyncAnnotateFileResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p2beta1.OutputConfig.Builder subBuilder = null;
             if (outputConfig_ != null) {
@@ -59,13 +63,6 @@ private AsyncAnnotateFileResponse(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private AsyncAnnotateFileResponse(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AsyncAnnotateFileResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AsyncAnnotateFileResponse_fieldAccessorTable
@@ -125,7 +121,6 @@ public com.google.cloud.vision.v1p2beta1.OutputConfigOrBuilder getOutputConfigOr
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -135,7 +130,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (outputConfig_ != null) {
@@ -144,7 +138,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileResponse parseF
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AsyncAnnotateFileResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AsyncAnnotateFileResponse_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (outputConfigBuilder_ == null) {
@@ -336,18 +325,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AsyncAnnotateFileResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileResponse getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileResponse build() {
       com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -356,7 +342,6 @@ public com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileResponse buildPartial() {
       com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileResponse result = new com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileResponse(this);
       if (outputConfigBuilder_ == null) {
@@ -368,39 +353,32 @@ public com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileResponse buildPartial(
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileResponse) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileResponse)other);
@@ -420,12 +398,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileResp
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -596,13 +572,11 @@ public com.google.cloud.vision.v1p2beta1.OutputConfigOrBuilder getOutputConfigOr
       }
       return outputConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -624,12 +598,11 @@ public static com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileResponse getDef
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AsyncAnnotateFileResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AsyncAnnotateFileResponse(input, extensionRegistry);
+        return new AsyncAnnotateFileResponse(input, extensionRegistry);
     }
   };
 
@@ -642,7 +615,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncBatchAnnotateFilesRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncBatchAnnotateFilesRequest.java
index c563c32dd5a2..21cb8238a079 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncBatchAnnotateFilesRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncBatchAnnotateFilesRequest.java
@@ -34,9 +34,6 @@ private AsyncBatchAnnotateFilesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private AsyncBatchAnnotateFilesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               requests_ = new java.util.ArrayList();
@@ -57,13 +61,6 @@ private AsyncBatchAnnotateFilesRequest(
                 input.readMessage(com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileRequest.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private AsyncBatchAnnotateFilesRequest(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AsyncBatchAnnotateFilesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AsyncBatchAnnotateFilesRequest_fieldAccessorTable
@@ -148,7 +144,6 @@ public com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileRequestOrBuilder getRe
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -158,7 +153,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < requests_.size(); i++) {
@@ -167,7 +161,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -285,7 +278,6 @@ public static com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesRequest p
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -293,7 +285,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -322,7 +313,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AsyncBatchAnnotateFilesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AsyncBatchAnnotateFilesRequest_fieldAccessorTable
@@ -346,7 +336,6 @@ private void maybeForceBuilderInitialization() {
         getRequestsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (requestsBuilder_ == null) {
@@ -358,18 +347,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AsyncBatchAnnotateFilesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesRequest build() {
       com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -378,7 +364,6 @@ public com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesRequest build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesRequest buildPartial() {
       com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesRequest result = new com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesRequest(this);
       int from_bitField0_ = bitField0_;
@@ -395,39 +380,32 @@ public com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesRequest buildPar
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesRequest) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesRequest)other);
@@ -470,12 +448,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFil
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -806,13 +782,11 @@ public com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileRequest.Builder addReq
       }
       return requestsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -834,12 +808,11 @@ public static com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesRequest g
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AsyncBatchAnnotateFilesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AsyncBatchAnnotateFilesRequest(input, extensionRegistry);
+        return new AsyncBatchAnnotateFilesRequest(input, extensionRegistry);
     }
   };
 
@@ -852,7 +825,6 @@ public com.google.protobuf.Parser getParserForTy
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncBatchAnnotateFilesResponse.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncBatchAnnotateFilesResponse.java
index 396f5b7510dd..4f2463056b02 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncBatchAnnotateFilesResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/AsyncBatchAnnotateFilesResponse.java
@@ -33,9 +33,6 @@ private AsyncBatchAnnotateFilesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private AsyncBatchAnnotateFilesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               responses_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private AsyncBatchAnnotateFilesResponse(
                 input.readMessage(com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileResponse.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private AsyncBatchAnnotateFilesResponse(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AsyncBatchAnnotateFilesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AsyncBatchAnnotateFilesResponse_fieldAccessorTable
@@ -152,7 +148,6 @@ public com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileResponseOrBuilder getR
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -162,7 +157,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < responses_.size(); i++) {
@@ -171,7 +165,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -289,7 +282,6 @@ public static com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesResponse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -297,7 +289,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -325,7 +316,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AsyncBatchAnnotateFilesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AsyncBatchAnnotateFilesResponse_fieldAccessorTable
@@ -349,7 +339,6 @@ private void maybeForceBuilderInitialization() {
         getResponsesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (responsesBuilder_ == null) {
@@ -361,18 +350,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_AsyncBatchAnnotateFilesResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesResponse getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesResponse build() {
       com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -381,7 +367,6 @@ public com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesResponse build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesResponse buildPartial() {
       com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesResponse result = new com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -398,39 +383,32 @@ public com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesResponse buildPa
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesResponse) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesResponse)other);
@@ -473,12 +451,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFil
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -827,13 +803,11 @@ public com.google.cloud.vision.v1p2beta1.AsyncAnnotateFileResponse.Builder addRe
       }
       return responsesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -855,12 +829,11 @@ public static com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesResponse
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AsyncBatchAnnotateFilesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AsyncBatchAnnotateFilesResponse(input, extensionRegistry);
+        return new AsyncBatchAnnotateFilesResponse(input, extensionRegistry);
     }
   };
 
@@ -873,7 +846,6 @@ public com.google.protobuf.Parser getParserForT
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.AsyncBatchAnnotateFilesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/BatchAnnotateImagesRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/BatchAnnotateImagesRequest.java
index b711fd468b11..74fe9a0df824 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/BatchAnnotateImagesRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/BatchAnnotateImagesRequest.java
@@ -33,9 +33,6 @@ private BatchAnnotateImagesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private BatchAnnotateImagesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               requests_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private BatchAnnotateImagesRequest(
                 input.readMessage(com.google.cloud.vision.v1p2beta1.AnnotateImageRequest.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private BatchAnnotateImagesRequest(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_BatchAnnotateImagesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_BatchAnnotateImagesRequest_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.cloud.vision.v1p2beta1.AnnotateImageRequestOrBuilder getReques
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < requests_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesRequest parse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_BatchAnnotateImagesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_BatchAnnotateImagesRequest_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getRequestsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (requestsBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_BatchAnnotateImagesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesRequest build() {
       com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesRequest buildPartial() {
       com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesRequest result = new com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesRequest(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesRequest buildPartial
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesRequest) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesRequest)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesRe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.cloud.vision.v1p2beta1.AnnotateImageRequest.Builder addRequest
       }
       return requestsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesRequest getDe
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BatchAnnotateImagesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchAnnotateImagesRequest(input, extensionRegistry);
+        return new BatchAnnotateImagesRequest(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/BatchAnnotateImagesResponse.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/BatchAnnotateImagesResponse.java
index 12186be90f6b..045ad94b135a 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/BatchAnnotateImagesResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/BatchAnnotateImagesResponse.java
@@ -33,9 +33,6 @@ private BatchAnnotateImagesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private BatchAnnotateImagesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               responses_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private BatchAnnotateImagesResponse(
                 input.readMessage(com.google.cloud.vision.v1p2beta1.AnnotateImageResponse.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private BatchAnnotateImagesResponse(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_BatchAnnotateImagesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_BatchAnnotateImagesResponse_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.cloud.vision.v1p2beta1.AnnotateImageResponseOrBuilder getRespo
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < responses_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesResponse pars
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_BatchAnnotateImagesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_BatchAnnotateImagesResponse_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getResponsesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (responsesBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_BatchAnnotateImagesResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesResponse getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesResponse build() {
       com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesResponse buildPartial() {
       com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesResponse result = new com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesResponse buildPartia
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesResponse) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesResponse)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesRe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.cloud.vision.v1p2beta1.AnnotateImageResponse.Builder addRespon
       }
       return responsesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesResponse getD
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BatchAnnotateImagesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchAnnotateImagesResponse(input, extensionRegistry);
+        return new BatchAnnotateImagesResponse(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType(
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.BatchAnnotateImagesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Block.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Block.java
index af8249b618c4..bdb6410e43bf 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Block.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Block.java
@@ -35,9 +35,6 @@ private Block(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private Block(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p2beta1.TextAnnotation.TextProperty.Builder subBuilder = null;
             if (property_ != null) {
@@ -95,13 +99,6 @@ private Block(
             confidence_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -122,7 +119,6 @@ private Block(
     return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_Block_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_Block_fieldAccessorTable
@@ -500,7 +496,6 @@ public int getBlockTypeValue() {
    * .google.cloud.vision.v1p2beta1.Block.BlockType block_type = 4;
    */
   public com.google.cloud.vision.v1p2beta1.Block.BlockType getBlockType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p2beta1.Block.BlockType result = com.google.cloud.vision.v1p2beta1.Block.BlockType.valueOf(blockType_);
     return result == null ? com.google.cloud.vision.v1p2beta1.Block.BlockType.UNRECOGNIZED : result;
   }
@@ -519,7 +514,6 @@ public float getConfidence() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -529,7 +523,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (property_ != null) {
@@ -550,7 +543,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -712,7 +704,6 @@ public static com.google.cloud.vision.v1p2beta1.Block parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -720,7 +711,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.Block prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -748,7 +738,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_Block_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_Block_fieldAccessorTable
@@ -772,7 +761,6 @@ private void maybeForceBuilderInitialization() {
         getParagraphsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (propertyBuilder_ == null) {
@@ -800,18 +788,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_Block_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.Block getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.Block.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.Block build() {
       com.google.cloud.vision.v1p2beta1.Block result = buildPartial();
       if (!result.isInitialized()) {
@@ -820,7 +805,6 @@ public com.google.cloud.vision.v1p2beta1.Block build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.Block buildPartial() {
       com.google.cloud.vision.v1p2beta1.Block result = new com.google.cloud.vision.v1p2beta1.Block(this);
       int from_bitField0_ = bitField0_;
@@ -851,39 +835,32 @@ public com.google.cloud.vision.v1p2beta1.Block buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.Block) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.Block)other);
@@ -938,12 +915,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.Block other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1738,7 +1713,6 @@ public Builder setBlockTypeValue(int value) {
      * .google.cloud.vision.v1p2beta1.Block.BlockType block_type = 4;
      */
     public com.google.cloud.vision.v1p2beta1.Block.BlockType getBlockType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p2beta1.Block.BlockType result = com.google.cloud.vision.v1p2beta1.Block.BlockType.valueOf(blockType_);
       return result == null ? com.google.cloud.vision.v1p2beta1.Block.BlockType.UNRECOGNIZED : result;
     }
@@ -1809,13 +1783,11 @@ public Builder clearConfidence() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1837,12 +1809,11 @@ public static com.google.cloud.vision.v1p2beta1.Block getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Block parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Block(input, extensionRegistry);
+        return new Block(input, extensionRegistry);
     }
   };
 
@@ -1855,7 +1826,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.Block getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/BoundingPoly.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/BoundingPoly.java
index 0f3be73b6cf2..8b4e632d7c1f 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/BoundingPoly.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/BoundingPoly.java
@@ -34,9 +34,6 @@ private BoundingPoly(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private BoundingPoly(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               vertices_ = new java.util.ArrayList();
@@ -66,13 +70,6 @@ private BoundingPoly(
                 input.readMessage(com.google.cloud.vision.v1p2beta1.NormalizedVertex.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private BoundingPoly(
     return com.google.cloud.vision.v1p2beta1.GeometryProto.internal_static_google_cloud_vision_v1p2beta1_BoundingPoly_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.GeometryProto.internal_static_google_cloud_vision_v1p2beta1_BoundingPoly_fieldAccessorTable
@@ -215,7 +211,6 @@ public com.google.cloud.vision.v1p2beta1.NormalizedVertexOrBuilder getNormalized
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -225,7 +220,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < vertices_.size(); i++) {
@@ -237,7 +231,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -365,7 +358,6 @@ public static com.google.cloud.vision.v1p2beta1.BoundingPoly parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -373,7 +365,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.BoundingPoly prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -401,7 +392,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.GeometryProto.internal_static_google_cloud_vision_v1p2beta1_BoundingPoly_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.GeometryProto.internal_static_google_cloud_vision_v1p2beta1_BoundingPoly_fieldAccessorTable
@@ -426,7 +416,6 @@ private void maybeForceBuilderInitialization() {
         getNormalizedVerticesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (verticesBuilder_ == null) {
@@ -444,18 +433,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.GeometryProto.internal_static_google_cloud_vision_v1p2beta1_BoundingPoly_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.BoundingPoly getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.BoundingPoly.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.BoundingPoly build() {
       com.google.cloud.vision.v1p2beta1.BoundingPoly result = buildPartial();
       if (!result.isInitialized()) {
@@ -464,7 +450,6 @@ public com.google.cloud.vision.v1p2beta1.BoundingPoly build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.BoundingPoly buildPartial() {
       com.google.cloud.vision.v1p2beta1.BoundingPoly result = new com.google.cloud.vision.v1p2beta1.BoundingPoly(this);
       int from_bitField0_ = bitField0_;
@@ -490,39 +475,32 @@ public com.google.cloud.vision.v1p2beta1.BoundingPoly buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.BoundingPoly) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.BoundingPoly)other);
@@ -591,12 +569,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.BoundingPoly other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1239,13 +1215,11 @@ public com.google.cloud.vision.v1p2beta1.NormalizedVertex.Builder addNormalizedV
       }
       return normalizedVerticesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1267,12 +1241,11 @@ public static com.google.cloud.vision.v1p2beta1.BoundingPoly getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BoundingPoly parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BoundingPoly(input, extensionRegistry);
+        return new BoundingPoly(input, extensionRegistry);
     }
   };
 
@@ -1285,7 +1258,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.BoundingPoly getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ColorInfo.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ColorInfo.java
index 8da322690613..db54d7eb7b55 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ColorInfo.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ColorInfo.java
@@ -35,9 +35,6 @@ private ColorInfo(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ColorInfo(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.type.Color.Builder subBuilder = null;
             if (color_ != null) {
@@ -72,13 +76,6 @@ private ColorInfo(
             pixelFraction_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private ColorInfo(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_ColorInfo_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_ColorInfo_fieldAccessorTable
@@ -165,7 +161,6 @@ public float getPixelFraction() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -175,7 +170,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (color_ != null) {
@@ -190,7 +184,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -333,7 +326,6 @@ public static com.google.cloud.vision.v1p2beta1.ColorInfo parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -341,7 +333,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.ColorInfo prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -370,7 +361,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_ColorInfo_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_ColorInfo_fieldAccessorTable
@@ -393,7 +383,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (colorBuilder_ == null) {
@@ -409,18 +398,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_ColorInfo_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.ColorInfo getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.ColorInfo.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.ColorInfo build() {
       com.google.cloud.vision.v1p2beta1.ColorInfo result = buildPartial();
       if (!result.isInitialized()) {
@@ -429,7 +415,6 @@ public com.google.cloud.vision.v1p2beta1.ColorInfo build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.ColorInfo buildPartial() {
       com.google.cloud.vision.v1p2beta1.ColorInfo result = new com.google.cloud.vision.v1p2beta1.ColorInfo(this);
       if (colorBuilder_ == null) {
@@ -443,39 +428,32 @@ public com.google.cloud.vision.v1p2beta1.ColorInfo buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.ColorInfo) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.ColorInfo)other);
@@ -501,12 +479,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.ColorInfo other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -756,13 +732,11 @@ public Builder clearPixelFraction() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -784,12 +758,11 @@ public static com.google.cloud.vision.v1p2beta1.ColorInfo getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ColorInfo parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ColorInfo(input, extensionRegistry);
+        return new ColorInfo(input, extensionRegistry);
     }
   };
 
@@ -802,7 +775,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.ColorInfo getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/CropHint.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/CropHint.java
index d3d0ab2845d0..8f8f00eeecdd 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/CropHint.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/CropHint.java
@@ -34,9 +34,6 @@ private CropHint(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private CropHint(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p2beta1.BoundingPoly.Builder subBuilder = null;
             if (boundingPoly_ != null) {
@@ -71,13 +75,6 @@ private CropHint(
             importanceFraction_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -95,7 +92,6 @@ private CropHint(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_CropHint_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_CropHint_fieldAccessorTable
@@ -167,7 +163,6 @@ public float getImportanceFraction() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -177,7 +172,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (boundingPoly_ != null) {
@@ -192,7 +186,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -335,7 +328,6 @@ public static com.google.cloud.vision.v1p2beta1.CropHint parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -343,7 +335,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.CropHint prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -371,7 +362,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_CropHint_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_CropHint_fieldAccessorTable
@@ -394,7 +384,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (boundingPolyBuilder_ == null) {
@@ -410,18 +399,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_CropHint_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.CropHint getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.CropHint.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.CropHint build() {
       com.google.cloud.vision.v1p2beta1.CropHint result = buildPartial();
       if (!result.isInitialized()) {
@@ -430,7 +416,6 @@ public com.google.cloud.vision.v1p2beta1.CropHint build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.CropHint buildPartial() {
       com.google.cloud.vision.v1p2beta1.CropHint result = new com.google.cloud.vision.v1p2beta1.CropHint(this);
       if (boundingPolyBuilder_ == null) {
@@ -444,39 +429,32 @@ public com.google.cloud.vision.v1p2beta1.CropHint buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.CropHint) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.CropHint)other);
@@ -502,12 +480,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.CropHint other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -766,13 +742,11 @@ public Builder clearImportanceFraction() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -794,12 +768,11 @@ public static com.google.cloud.vision.v1p2beta1.CropHint getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CropHint parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CropHint(input, extensionRegistry);
+        return new CropHint(input, extensionRegistry);
     }
   };
 
@@ -812,7 +785,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.CropHint getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/CropHintsAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/CropHintsAnnotation.java
index e3161d7ff917..23344c9a1d89 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/CropHintsAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/CropHintsAnnotation.java
@@ -33,9 +33,6 @@ private CropHintsAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private CropHintsAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               cropHints_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private CropHintsAnnotation(
                 input.readMessage(com.google.cloud.vision.v1p2beta1.CropHint.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private CropHintsAnnotation(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_CropHintsAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_CropHintsAnnotation_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.cloud.vision.v1p2beta1.CropHintOrBuilder getCropHintsOrBuilder
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < cropHints_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.vision.v1p2beta1.CropHintsAnnotation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.CropHintsAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_CropHintsAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_CropHintsAnnotation_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getCropHintsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (cropHintsBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_CropHintsAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.CropHintsAnnotation getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.CropHintsAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.CropHintsAnnotation build() {
       com.google.cloud.vision.v1p2beta1.CropHintsAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.cloud.vision.v1p2beta1.CropHintsAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.CropHintsAnnotation buildPartial() {
       com.google.cloud.vision.v1p2beta1.CropHintsAnnotation result = new com.google.cloud.vision.v1p2beta1.CropHintsAnnotation(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.cloud.vision.v1p2beta1.CropHintsAnnotation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.CropHintsAnnotation) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.CropHintsAnnotation)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.CropHintsAnnotation o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.cloud.vision.v1p2beta1.CropHint.Builder addCropHintsBuilder(
       }
       return cropHintsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.cloud.vision.v1p2beta1.CropHintsAnnotation getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CropHintsAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CropHintsAnnotation(input, extensionRegistry);
+        return new CropHintsAnnotation(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.CropHintsAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/CropHintsParams.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/CropHintsParams.java
index 3899d743e818..15c96c5c3835 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/CropHintsParams.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/CropHintsParams.java
@@ -33,9 +33,6 @@ private CropHintsParams(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private CropHintsParams(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 13: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               aspectRatios_ = new java.util.ArrayList();
@@ -68,13 +72,6 @@ private CropHintsParams(
             input.popLimit(limit);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -95,7 +92,6 @@ private CropHintsParams(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_CropHintsParams_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_CropHintsParams_fieldAccessorTable
@@ -154,7 +150,6 @@ public float getAspectRatios(int index) {
   private int aspectRatiosMemoizedSerializedSize = -1;
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -164,7 +159,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     getSerializedSize();
@@ -178,7 +172,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -303,7 +296,6 @@ public static com.google.cloud.vision.v1p2beta1.CropHintsParams parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -311,7 +303,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.CropHintsParams prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -339,7 +330,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_CropHintsParams_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_CropHintsParams_fieldAccessorTable
@@ -362,7 +352,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       aspectRatios_ = java.util.Collections.emptyList();
@@ -370,18 +359,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_CropHintsParams_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.CropHintsParams getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.CropHintsParams.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.CropHintsParams build() {
       com.google.cloud.vision.v1p2beta1.CropHintsParams result = buildPartial();
       if (!result.isInitialized()) {
@@ -390,7 +376,6 @@ public com.google.cloud.vision.v1p2beta1.CropHintsParams build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.CropHintsParams buildPartial() {
       com.google.cloud.vision.v1p2beta1.CropHintsParams result = new com.google.cloud.vision.v1p2beta1.CropHintsParams(this);
       int from_bitField0_ = bitField0_;
@@ -403,39 +388,32 @@ public com.google.cloud.vision.v1p2beta1.CropHintsParams buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.CropHintsParams) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.CropHintsParams)other);
@@ -462,12 +440,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.CropHintsParams other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -615,13 +591,11 @@ public Builder clearAspectRatios() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -643,12 +617,11 @@ public static com.google.cloud.vision.v1p2beta1.CropHintsParams getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CropHintsParams parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CropHintsParams(input, extensionRegistry);
+        return new CropHintsParams(input, extensionRegistry);
     }
   };
 
@@ -661,7 +634,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.CropHintsParams getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/DominantColorsAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/DominantColorsAnnotation.java
index 26c463f2827c..359402bc7e3a 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/DominantColorsAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/DominantColorsAnnotation.java
@@ -33,9 +33,6 @@ private DominantColorsAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private DominantColorsAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               colors_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private DominantColorsAnnotation(
                 input.readMessage(com.google.cloud.vision.v1p2beta1.ColorInfo.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private DominantColorsAnnotation(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_DominantColorsAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_DominantColorsAnnotation_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.cloud.vision.v1p2beta1.ColorInfoOrBuilder getColorsOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < colors_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.vision.v1p2beta1.DominantColorsAnnotation parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.DominantColorsAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_DominantColorsAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_DominantColorsAnnotation_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getColorsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (colorsBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_DominantColorsAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.DominantColorsAnnotation getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.DominantColorsAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.DominantColorsAnnotation build() {
       com.google.cloud.vision.v1p2beta1.DominantColorsAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.cloud.vision.v1p2beta1.DominantColorsAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.DominantColorsAnnotation buildPartial() {
       com.google.cloud.vision.v1p2beta1.DominantColorsAnnotation result = new com.google.cloud.vision.v1p2beta1.DominantColorsAnnotation(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.cloud.vision.v1p2beta1.DominantColorsAnnotation buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.DominantColorsAnnotation) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.DominantColorsAnnotation)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.DominantColorsAnnotat
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.cloud.vision.v1p2beta1.ColorInfo.Builder addColorsBuilder(
       }
       return colorsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.cloud.vision.v1p2beta1.DominantColorsAnnotation getDefa
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DominantColorsAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DominantColorsAnnotation(input, extensionRegistry);
+        return new DominantColorsAnnotation(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.DominantColorsAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/EntityAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/EntityAnnotation.java
index 236396fbada6..2cb194f35038 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/EntityAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/EntityAnnotation.java
@@ -40,9 +40,6 @@ private EntityAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -54,6 +51,13 @@ private EntityAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -118,13 +122,6 @@ private EntityAnnotation(
                 input.readMessage(com.google.cloud.vision.v1p2beta1.Property.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -148,7 +145,6 @@ private EntityAnnotation(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_EntityAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_EntityAnnotation_fieldAccessorTable
@@ -508,7 +504,6 @@ public com.google.cloud.vision.v1p2beta1.PropertyOrBuilder getPropertiesOrBuilde
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -518,7 +513,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getMidBytes().isEmpty()) {
@@ -551,7 +545,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -746,7 +739,6 @@ public static com.google.cloud.vision.v1p2beta1.EntityAnnotation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -754,7 +746,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.EntityAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -782,7 +773,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_EntityAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_EntityAnnotation_fieldAccessorTable
@@ -807,7 +797,6 @@ private void maybeForceBuilderInitialization() {
         getPropertiesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       mid_ = "";
@@ -843,18 +832,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_EntityAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.EntityAnnotation getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.EntityAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.EntityAnnotation build() {
       com.google.cloud.vision.v1p2beta1.EntityAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -863,7 +849,6 @@ public com.google.cloud.vision.v1p2beta1.EntityAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.EntityAnnotation buildPartial() {
       com.google.cloud.vision.v1p2beta1.EntityAnnotation result = new com.google.cloud.vision.v1p2beta1.EntityAnnotation(this);
       int from_bitField0_ = bitField0_;
@@ -902,39 +887,32 @@ public com.google.cloud.vision.v1p2beta1.EntityAnnotation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.EntityAnnotation) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.EntityAnnotation)other);
@@ -1027,12 +1005,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.EntityAnnotation othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2347,13 +2323,11 @@ public com.google.cloud.vision.v1p2beta1.Property.Builder addPropertiesBuilder(
       }
       return propertiesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2375,12 +2349,11 @@ public static com.google.cloud.vision.v1p2beta1.EntityAnnotation getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public EntityAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new EntityAnnotation(input, extensionRegistry);
+        return new EntityAnnotation(input, extensionRegistry);
     }
   };
 
@@ -2393,7 +2366,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.EntityAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/FaceAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/FaceAnnotation.java
index ab56cec77d39..e749c001ff22 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/FaceAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/FaceAnnotation.java
@@ -45,9 +45,6 @@ private FaceAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -59,6 +56,13 @@ private FaceAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p2beta1.BoundingPoly.Builder subBuilder = null;
             if (boundingPoly_ != null) {
@@ -161,13 +165,6 @@ private FaceAnnotation(
             headwearLikelihood_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -188,7 +185,6 @@ private FaceAnnotation(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_FaceAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_FaceAnnotation_fieldAccessorTable
@@ -272,9 +268,6 @@ private Landmark(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -286,6 +279,13 @@ private Landmark(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 24: {
               int rawValue = input.readEnum();
 
@@ -305,13 +305,6 @@ private Landmark(
 
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -329,7 +322,6 @@ private Landmark(
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_FaceAnnotation_Landmark_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_FaceAnnotation_Landmark_fieldAccessorTable
@@ -1039,7 +1031,6 @@ public int getTypeValue() {
      * .google.cloud.vision.v1p2beta1.FaceAnnotation.Landmark.Type type = 3;
      */
     public com.google.cloud.vision.v1p2beta1.FaceAnnotation.Landmark.Type getType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p2beta1.FaceAnnotation.Landmark.Type result = com.google.cloud.vision.v1p2beta1.FaceAnnotation.Landmark.Type.valueOf(type_);
       return result == null ? com.google.cloud.vision.v1p2beta1.FaceAnnotation.Landmark.Type.UNRECOGNIZED : result;
     }
@@ -1078,7 +1069,6 @@ public com.google.cloud.vision.v1p2beta1.PositionOrBuilder getPositionOrBuilder(
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1088,7 +1078,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (type_ != com.google.cloud.vision.v1p2beta1.FaceAnnotation.Landmark.Type.UNKNOWN_LANDMARK.getNumber()) {
@@ -1100,7 +1089,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -1228,7 +1216,6 @@ public static com.google.cloud.vision.v1p2beta1.FaceAnnotation.Landmark parseFro
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -1236,7 +1223,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.FaceAnnotation.Landmark prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -1264,7 +1250,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_FaceAnnotation_Landmark_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_FaceAnnotation_Landmark_fieldAccessorTable
@@ -1287,7 +1272,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         type_ = 0;
@@ -1301,18 +1285,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_FaceAnnotation_Landmark_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p2beta1.FaceAnnotation.Landmark getDefaultInstanceForType() {
         return com.google.cloud.vision.v1p2beta1.FaceAnnotation.Landmark.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p2beta1.FaceAnnotation.Landmark build() {
         com.google.cloud.vision.v1p2beta1.FaceAnnotation.Landmark result = buildPartial();
         if (!result.isInitialized()) {
@@ -1321,7 +1302,6 @@ public com.google.cloud.vision.v1p2beta1.FaceAnnotation.Landmark build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p2beta1.FaceAnnotation.Landmark buildPartial() {
         com.google.cloud.vision.v1p2beta1.FaceAnnotation.Landmark result = new com.google.cloud.vision.v1p2beta1.FaceAnnotation.Landmark(this);
         result.type_ = type_;
@@ -1334,39 +1314,32 @@ public com.google.cloud.vision.v1p2beta1.FaceAnnotation.Landmark buildPartial()
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1p2beta1.FaceAnnotation.Landmark) {
           return mergeFrom((com.google.cloud.vision.v1p2beta1.FaceAnnotation.Landmark)other);
@@ -1389,12 +1362,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.FaceAnnotation.Landma
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1444,7 +1415,6 @@ public Builder setTypeValue(int value) {
        * .google.cloud.vision.v1p2beta1.FaceAnnotation.Landmark.Type type = 3;
        */
       public com.google.cloud.vision.v1p2beta1.FaceAnnotation.Landmark.Type getType() {
-        @SuppressWarnings("deprecation")
         com.google.cloud.vision.v1p2beta1.FaceAnnotation.Landmark.Type result = com.google.cloud.vision.v1p2beta1.FaceAnnotation.Landmark.Type.valueOf(type_);
         return result == null ? com.google.cloud.vision.v1p2beta1.FaceAnnotation.Landmark.Type.UNRECOGNIZED : result;
       }
@@ -1630,13 +1600,11 @@ public com.google.cloud.vision.v1p2beta1.PositionOrBuilder getPositionOrBuilder(
         }
         return positionBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1658,12 +1626,11 @@ public static com.google.cloud.vision.v1p2beta1.FaceAnnotation.Landmark getDefau
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Landmark parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Landmark(input, extensionRegistry);
+          return new Landmark(input, extensionRegistry);
       }
     };
 
@@ -1676,7 +1643,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.FaceAnnotation.Landmark getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1928,7 +1894,6 @@ public int getJoyLikelihoodValue() {
    * .google.cloud.vision.v1p2beta1.Likelihood joy_likelihood = 9;
    */
   public com.google.cloud.vision.v1p2beta1.Likelihood getJoyLikelihood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p2beta1.Likelihood result = com.google.cloud.vision.v1p2beta1.Likelihood.valueOf(joyLikelihood_);
     return result == null ? com.google.cloud.vision.v1p2beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -1953,7 +1918,6 @@ public int getSorrowLikelihoodValue() {
    * .google.cloud.vision.v1p2beta1.Likelihood sorrow_likelihood = 10;
    */
   public com.google.cloud.vision.v1p2beta1.Likelihood getSorrowLikelihood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p2beta1.Likelihood result = com.google.cloud.vision.v1p2beta1.Likelihood.valueOf(sorrowLikelihood_);
     return result == null ? com.google.cloud.vision.v1p2beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -1978,7 +1942,6 @@ public int getAngerLikelihoodValue() {
    * .google.cloud.vision.v1p2beta1.Likelihood anger_likelihood = 11;
    */
   public com.google.cloud.vision.v1p2beta1.Likelihood getAngerLikelihood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p2beta1.Likelihood result = com.google.cloud.vision.v1p2beta1.Likelihood.valueOf(angerLikelihood_);
     return result == null ? com.google.cloud.vision.v1p2beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -2003,7 +1966,6 @@ public int getSurpriseLikelihoodValue() {
    * .google.cloud.vision.v1p2beta1.Likelihood surprise_likelihood = 12;
    */
   public com.google.cloud.vision.v1p2beta1.Likelihood getSurpriseLikelihood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p2beta1.Likelihood result = com.google.cloud.vision.v1p2beta1.Likelihood.valueOf(surpriseLikelihood_);
     return result == null ? com.google.cloud.vision.v1p2beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -2028,7 +1990,6 @@ public int getUnderExposedLikelihoodValue() {
    * .google.cloud.vision.v1p2beta1.Likelihood under_exposed_likelihood = 13;
    */
   public com.google.cloud.vision.v1p2beta1.Likelihood getUnderExposedLikelihood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p2beta1.Likelihood result = com.google.cloud.vision.v1p2beta1.Likelihood.valueOf(underExposedLikelihood_);
     return result == null ? com.google.cloud.vision.v1p2beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -2053,7 +2014,6 @@ public int getBlurredLikelihoodValue() {
    * .google.cloud.vision.v1p2beta1.Likelihood blurred_likelihood = 14;
    */
   public com.google.cloud.vision.v1p2beta1.Likelihood getBlurredLikelihood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p2beta1.Likelihood result = com.google.cloud.vision.v1p2beta1.Likelihood.valueOf(blurredLikelihood_);
     return result == null ? com.google.cloud.vision.v1p2beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -2078,13 +2038,11 @@ public int getHeadwearLikelihoodValue() {
    * .google.cloud.vision.v1p2beta1.Likelihood headwear_likelihood = 15;
    */
   public com.google.cloud.vision.v1p2beta1.Likelihood getHeadwearLikelihood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p2beta1.Likelihood result = com.google.cloud.vision.v1p2beta1.Likelihood.valueOf(headwearLikelihood_);
     return result == null ? com.google.cloud.vision.v1p2beta1.Likelihood.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -2094,7 +2052,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (boundingPoly_ != null) {
@@ -2145,7 +2102,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -2393,7 +2349,6 @@ public static com.google.cloud.vision.v1p2beta1.FaceAnnotation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -2401,7 +2356,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.FaceAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -2429,7 +2383,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_FaceAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_FaceAnnotation_fieldAccessorTable
@@ -2453,7 +2406,6 @@ private void maybeForceBuilderInitialization() {
         getLandmarksFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (boundingPolyBuilder_ == null) {
@@ -2501,18 +2453,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_FaceAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.FaceAnnotation getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.FaceAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.FaceAnnotation build() {
       com.google.cloud.vision.v1p2beta1.FaceAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -2521,7 +2470,6 @@ public com.google.cloud.vision.v1p2beta1.FaceAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.FaceAnnotation buildPartial() {
       com.google.cloud.vision.v1p2beta1.FaceAnnotation result = new com.google.cloud.vision.v1p2beta1.FaceAnnotation(this);
       int from_bitField0_ = bitField0_;
@@ -2562,39 +2510,32 @@ public com.google.cloud.vision.v1p2beta1.FaceAnnotation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.FaceAnnotation) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.FaceAnnotation)other);
@@ -2679,12 +2620,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.FaceAnnotation other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3657,7 +3596,6 @@ public Builder setJoyLikelihoodValue(int value) {
      * .google.cloud.vision.v1p2beta1.Likelihood joy_likelihood = 9;
      */
     public com.google.cloud.vision.v1p2beta1.Likelihood getJoyLikelihood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p2beta1.Likelihood result = com.google.cloud.vision.v1p2beta1.Likelihood.valueOf(joyLikelihood_);
       return result == null ? com.google.cloud.vision.v1p2beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -3722,7 +3660,6 @@ public Builder setSorrowLikelihoodValue(int value) {
      * .google.cloud.vision.v1p2beta1.Likelihood sorrow_likelihood = 10;
      */
     public com.google.cloud.vision.v1p2beta1.Likelihood getSorrowLikelihood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p2beta1.Likelihood result = com.google.cloud.vision.v1p2beta1.Likelihood.valueOf(sorrowLikelihood_);
       return result == null ? com.google.cloud.vision.v1p2beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -3787,7 +3724,6 @@ public Builder setAngerLikelihoodValue(int value) {
      * .google.cloud.vision.v1p2beta1.Likelihood anger_likelihood = 11;
      */
     public com.google.cloud.vision.v1p2beta1.Likelihood getAngerLikelihood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p2beta1.Likelihood result = com.google.cloud.vision.v1p2beta1.Likelihood.valueOf(angerLikelihood_);
       return result == null ? com.google.cloud.vision.v1p2beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -3852,7 +3788,6 @@ public Builder setSurpriseLikelihoodValue(int value) {
      * .google.cloud.vision.v1p2beta1.Likelihood surprise_likelihood = 12;
      */
     public com.google.cloud.vision.v1p2beta1.Likelihood getSurpriseLikelihood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p2beta1.Likelihood result = com.google.cloud.vision.v1p2beta1.Likelihood.valueOf(surpriseLikelihood_);
       return result == null ? com.google.cloud.vision.v1p2beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -3917,7 +3852,6 @@ public Builder setUnderExposedLikelihoodValue(int value) {
      * .google.cloud.vision.v1p2beta1.Likelihood under_exposed_likelihood = 13;
      */
     public com.google.cloud.vision.v1p2beta1.Likelihood getUnderExposedLikelihood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p2beta1.Likelihood result = com.google.cloud.vision.v1p2beta1.Likelihood.valueOf(underExposedLikelihood_);
       return result == null ? com.google.cloud.vision.v1p2beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -3982,7 +3916,6 @@ public Builder setBlurredLikelihoodValue(int value) {
      * .google.cloud.vision.v1p2beta1.Likelihood blurred_likelihood = 14;
      */
     public com.google.cloud.vision.v1p2beta1.Likelihood getBlurredLikelihood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p2beta1.Likelihood result = com.google.cloud.vision.v1p2beta1.Likelihood.valueOf(blurredLikelihood_);
       return result == null ? com.google.cloud.vision.v1p2beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -4047,7 +3980,6 @@ public Builder setHeadwearLikelihoodValue(int value) {
      * .google.cloud.vision.v1p2beta1.Likelihood headwear_likelihood = 15;
      */
     public com.google.cloud.vision.v1p2beta1.Likelihood getHeadwearLikelihood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p2beta1.Likelihood result = com.google.cloud.vision.v1p2beta1.Likelihood.valueOf(headwearLikelihood_);
       return result == null ? com.google.cloud.vision.v1p2beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -4080,13 +4012,11 @@ public Builder clearHeadwearLikelihood() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -4108,12 +4038,11 @@ public static com.google.cloud.vision.v1p2beta1.FaceAnnotation getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public FaceAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FaceAnnotation(input, extensionRegistry);
+        return new FaceAnnotation(input, extensionRegistry);
     }
   };
 
@@ -4126,7 +4055,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.FaceAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Feature.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Feature.java
index dbe0292ff0e7..279934713476 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Feature.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Feature.java
@@ -37,9 +37,6 @@ private Feature(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private Feature(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -68,13 +72,6 @@ private Feature(
             model_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -92,7 +89,6 @@ private Feature(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_Feature_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_Feature_fieldAccessorTable
@@ -401,7 +397,6 @@ public int getTypeValue() {
    * .google.cloud.vision.v1p2beta1.Feature.Type type = 1;
    */
   public com.google.cloud.vision.v1p2beta1.Feature.Type getType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p2beta1.Feature.Type result = com.google.cloud.vision.v1p2beta1.Feature.Type.valueOf(type_);
     return result == null ? com.google.cloud.vision.v1p2beta1.Feature.Type.UNRECOGNIZED : result;
   }
@@ -467,7 +462,6 @@ public java.lang.String getModel() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -477,7 +471,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (type_ != com.google.cloud.vision.v1p2beta1.Feature.Type.TYPE_UNSPECIFIED.getNumber()) {
@@ -492,7 +485,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -622,7 +614,6 @@ public static com.google.cloud.vision.v1p2beta1.Feature parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -630,7 +621,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.Feature prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -660,7 +650,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_Feature_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_Feature_fieldAccessorTable
@@ -683,7 +672,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       type_ = 0;
@@ -695,18 +683,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_Feature_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.Feature getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.Feature.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.Feature build() {
       com.google.cloud.vision.v1p2beta1.Feature result = buildPartial();
       if (!result.isInitialized()) {
@@ -715,7 +700,6 @@ public com.google.cloud.vision.v1p2beta1.Feature build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.Feature buildPartial() {
       com.google.cloud.vision.v1p2beta1.Feature result = new com.google.cloud.vision.v1p2beta1.Feature(this);
       result.type_ = type_;
@@ -725,39 +709,32 @@ public com.google.cloud.vision.v1p2beta1.Feature buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.Feature) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.Feature)other);
@@ -784,12 +761,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.Feature other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -839,7 +814,6 @@ public Builder setTypeValue(int value) {
      * .google.cloud.vision.v1p2beta1.Feature.Type type = 1;
      */
     public com.google.cloud.vision.v1p2beta1.Feature.Type getType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p2beta1.Feature.Type result = com.google.cloud.vision.v1p2beta1.Feature.Type.valueOf(type_);
       return result == null ? com.google.cloud.vision.v1p2beta1.Feature.Type.UNRECOGNIZED : result;
     }
@@ -1012,13 +986,11 @@ public Builder setModelBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1040,12 +1012,11 @@ public static com.google.cloud.vision.v1p2beta1.Feature getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Feature parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Feature(input, extensionRegistry);
+        return new Feature(input, extensionRegistry);
     }
   };
 
@@ -1058,7 +1029,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.Feature getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/GcsDestination.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/GcsDestination.java
index a251221a675f..bfac61efffce 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/GcsDestination.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/GcsDestination.java
@@ -33,9 +33,6 @@ private GcsDestination(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GcsDestination(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            uri_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GcsDestination(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            uri_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GcsDestination(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_GcsDestination_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_GcsDestination_fieldAccessorTable
@@ -150,7 +146,6 @@ public java.lang.String getUri() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -160,7 +155,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getUriBytes().isEmpty()) {
@@ -169,7 +163,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.vision.v1p2beta1.GcsDestination parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.GcsDestination prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_GcsDestination_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_GcsDestination_fieldAccessorTable
@@ -343,7 +333,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       uri_ = "";
@@ -351,18 +340,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_GcsDestination_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.GcsDestination getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.GcsDestination.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.GcsDestination build() {
       com.google.cloud.vision.v1p2beta1.GcsDestination result = buildPartial();
       if (!result.isInitialized()) {
@@ -371,7 +357,6 @@ public com.google.cloud.vision.v1p2beta1.GcsDestination build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.GcsDestination buildPartial() {
       com.google.cloud.vision.v1p2beta1.GcsDestination result = new com.google.cloud.vision.v1p2beta1.GcsDestination(this);
       result.uri_ = uri_;
@@ -379,39 +364,32 @@ public com.google.cloud.vision.v1p2beta1.GcsDestination buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.GcsDestination) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.GcsDestination)other);
@@ -432,12 +410,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.GcsDestination other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -599,13 +575,11 @@ public Builder setUriBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -627,12 +601,11 @@ public static com.google.cloud.vision.v1p2beta1.GcsDestination getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GcsDestination parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GcsDestination(input, extensionRegistry);
+        return new GcsDestination(input, extensionRegistry);
     }
   };
 
@@ -645,7 +618,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.GcsDestination getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/GcsSource.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/GcsSource.java
index 62dddaf4b98b..460dbb9622f8 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/GcsSource.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/GcsSource.java
@@ -33,9 +33,6 @@ private GcsSource(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GcsSource(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            uri_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GcsSource(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            uri_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GcsSource(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_GcsSource_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_GcsSource_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getUri() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getUriBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.cloud.vision.v1p2beta1.GcsSource parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.GcsSource prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_GcsSource_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_GcsSource_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       uri_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_GcsSource_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.GcsSource getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.GcsSource.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.GcsSource build() {
       com.google.cloud.vision.v1p2beta1.GcsSource result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.cloud.vision.v1p2beta1.GcsSource build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.GcsSource buildPartial() {
       com.google.cloud.vision.v1p2beta1.GcsSource result = new com.google.cloud.vision.v1p2beta1.GcsSource(this);
       result.uri_ = uri_;
@@ -359,39 +344,32 @@ public com.google.cloud.vision.v1p2beta1.GcsSource buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.GcsSource) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.GcsSource)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.GcsSource other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setUriBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.cloud.vision.v1p2beta1.GcsSource getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GcsSource parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GcsSource(input, extensionRegistry);
+        return new GcsSource(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.GcsSource getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/GeometryProto.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/GeometryProto.java
index ab205d764955..ad42c4af3a2e 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/GeometryProto.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/GeometryProto.java
@@ -52,7 +52,7 @@ public static void registerAllExtensions(
       "vertices\030\002 \003(\0132/.google.cloud.vision.v1p" +
       "2beta1.NormalizedVertex\"+\n\010Position\022\t\n\001x" +
       "\030\001 \001(\002\022\t\n\001y\030\002 \001(\002\022\t\n\001z\030\003 \001(\002B|\n!com.goog" +
-      "le.cloud.vision.v1p2beta1B\rGeometryProto" +
+      "le.cloud.vision.v1p2beta1B\rGeometryProto",
       "P\001ZCgoogle.golang.org/genproto/googleapi" +
       "s/cloud/vision/v1p2beta1;vision\370\001\001b\006prot" +
       "o3"
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Image.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Image.java
index 85f609657830..540f5194405e 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Image.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Image.java
@@ -33,9 +33,6 @@ private Image(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private Image(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
 
             content_ = input.readBytes();
@@ -65,13 +69,6 @@ private Image(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -89,7 +86,6 @@ private Image(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_Image_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_Image_fieldAccessorTable
@@ -152,7 +148,6 @@ public com.google.cloud.vision.v1p2beta1.ImageSourceOrBuilder getSourceOrBuilder
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -162,7 +157,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!content_.isEmpty()) {
@@ -174,7 +168,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -303,7 +296,6 @@ public static com.google.cloud.vision.v1p2beta1.Image parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -311,7 +303,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.Image prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -339,7 +330,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_Image_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_Image_fieldAccessorTable
@@ -362,7 +352,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       content_ = com.google.protobuf.ByteString.EMPTY;
@@ -376,18 +365,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_Image_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.Image getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.Image.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.Image build() {
       com.google.cloud.vision.v1p2beta1.Image result = buildPartial();
       if (!result.isInitialized()) {
@@ -396,7 +382,6 @@ public com.google.cloud.vision.v1p2beta1.Image build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.Image buildPartial() {
       com.google.cloud.vision.v1p2beta1.Image result = new com.google.cloud.vision.v1p2beta1.Image(this);
       result.content_ = content_;
@@ -409,39 +394,32 @@ public com.google.cloud.vision.v1p2beta1.Image buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.Image) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.Image)other);
@@ -464,12 +442,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.Image other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -705,13 +681,11 @@ public com.google.cloud.vision.v1p2beta1.ImageSourceOrBuilder getSourceOrBuilder
       }
       return sourceBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -733,12 +707,11 @@ public static com.google.cloud.vision.v1p2beta1.Image getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Image parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Image(input, extensionRegistry);
+        return new Image(input, extensionRegistry);
     }
   };
 
@@ -751,7 +724,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.Image getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotationContext.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotationContext.java
index 65652e4534ce..c946f25c34fd 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotationContext.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotationContext.java
@@ -35,9 +35,6 @@ private ImageAnnotationContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ImageAnnotationContext(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private ImageAnnotationContext(
             pageNumber_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private ImageAnnotationContext(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_ImageAnnotationContext_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_ImageAnnotationContext_fieldAccessorTable
@@ -149,7 +145,6 @@ public int getPageNumber() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -159,7 +154,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getUriBytes().isEmpty()) {
@@ -171,7 +165,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -294,7 +287,6 @@ public static com.google.cloud.vision.v1p2beta1.ImageAnnotationContext parseFrom
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -302,7 +294,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.ImageAnnotationContext prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -331,7 +322,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_ImageAnnotationContext_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_ImageAnnotationContext_fieldAccessorTable
@@ -354,7 +344,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       uri_ = "";
@@ -364,18 +353,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_ImageAnnotationContext_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.ImageAnnotationContext getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotationContext.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.ImageAnnotationContext build() {
       com.google.cloud.vision.v1p2beta1.ImageAnnotationContext result = buildPartial();
       if (!result.isInitialized()) {
@@ -384,7 +370,6 @@ public com.google.cloud.vision.v1p2beta1.ImageAnnotationContext build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.ImageAnnotationContext buildPartial() {
       com.google.cloud.vision.v1p2beta1.ImageAnnotationContext result = new com.google.cloud.vision.v1p2beta1.ImageAnnotationContext(this);
       result.uri_ = uri_;
@@ -393,39 +378,32 @@ public com.google.cloud.vision.v1p2beta1.ImageAnnotationContext buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.ImageAnnotationContext) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.ImageAnnotationContext)other);
@@ -449,12 +427,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.ImageAnnotationContex
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -602,13 +578,11 @@ public Builder clearPageNumber() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -630,12 +604,11 @@ public static com.google.cloud.vision.v1p2beta1.ImageAnnotationContext getDefaul
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ImageAnnotationContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImageAnnotationContext(input, extensionRegistry);
+        return new ImageAnnotationContext(input, extensionRegistry);
     }
   };
 
@@ -648,7 +621,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.ImageAnnotationContext getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorProto.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorProto.java
index ffd6355588f9..1fcaa69fc00c 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorProto.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageAnnotatorProto.java
@@ -197,7 +197,7 @@ public static void registerAllExtensions(
       "eta1/web_detection.proto\032#google/longrun" +
       "ning/operations.proto\032\037google/protobuf/t" +
       "imestamp.proto\032\027google/rpc/status.proto\032" +
-      "\027google/type/color.proto\032\030google/type/la" +
+      "\027google/type/color.proto\032\030google/type/la",
       "tlng.proto\"\341\002\n\007Feature\0229\n\004type\030\001 \001(\0162+.g" +
       "oogle.cloud.vision.v1p2beta1.Feature.Typ" +
       "e\022\023\n\013max_results\030\002 \001(\005\022\r\n\005model\030\003 \001(\t\"\366\001" +
@@ -207,7 +207,7 @@ public static void registerAllExtensions(
       "T_DETECTION\020\005\022\033\n\027DOCUMENT_TEXT_DETECTION" +
       "\020\013\022\031\n\025SAFE_SEARCH_DETECTION\020\006\022\024\n\020IMAGE_P" +
       "ROPERTIES\020\007\022\016\n\nCROP_HINTS\020\t\022\021\n\rWEB_DETEC" +
-      "TION\020\n\"7\n\013ImageSource\022\025\n\rgcs_image_uri\030\001" +
+      "TION\020\n\"7\n\013ImageSource\022\025\n\rgcs_image_uri\030\001",
       " \001(\t\022\021\n\timage_uri\030\002 \001(\t\"T\n\005Image\022\017\n\007cont" +
       "ent\030\001 \001(\014\022:\n\006source\030\002 \001(\0132*.google.cloud" +
       ".vision.v1p2beta1.ImageSource\"\233\016\n\016FaceAn" +
@@ -217,7 +217,7 @@ public static void registerAllExtensions(
       "sion.v1p2beta1.BoundingPoly\022I\n\tlandmarks" +
       "\030\003 \003(\01326.google.cloud.vision.v1p2beta1.F" +
       "aceAnnotation.Landmark\022\022\n\nroll_angle\030\004 \001" +
-      "(\002\022\021\n\tpan_angle\030\005 \001(\002\022\022\n\ntilt_angle\030\006 \001(" +
+      "(\002\022\021\n\tpan_angle\030\005 \001(\002\022\022\n\ntilt_angle\030\006 \001(",
       "\002\022\034\n\024detection_confidence\030\007 \001(\002\022\036\n\026landm" +
       "arking_confidence\030\010 \001(\002\022A\n\016joy_likelihoo" +
       "d\030\t \001(\0162).google.cloud.vision.v1p2beta1." +
@@ -227,7 +227,7 @@ public static void registerAllExtensions(
       "d.vision.v1p2beta1.Likelihood\022F\n\023surpris" +
       "e_likelihood\030\014 \001(\0162).google.cloud.vision" +
       ".v1p2beta1.Likelihood\022K\n\030under_exposed_l" +
-      "ikelihood\030\r \001(\0162).google.cloud.vision.v1" +
+      "ikelihood\030\r \001(\0162).google.cloud.vision.v1",
       "p2beta1.Likelihood\022E\n\022blurred_likelihood" +
       "\030\016 \001(\0162).google.cloud.vision.v1p2beta1.L" +
       "ikelihood\022F\n\023headwear_likelihood\030\017 \001(\0162)" +
@@ -237,7 +237,7 @@ public static void registerAllExtensions(
       "mark.Type\0229\n\010position\030\004 \001(\0132\'.google.clo" +
       "ud.vision.v1p2beta1.Position\"\264\006\n\004Type\022\024\n" +
       "\020UNKNOWN_LANDMARK\020\000\022\014\n\010LEFT_EYE\020\001\022\r\n\tRIG" +
-      "HT_EYE\020\002\022\030\n\024LEFT_OF_LEFT_EYEBROW\020\003\022\031\n\025RI" +
+      "HT_EYE\020\002\022\030\n\024LEFT_OF_LEFT_EYEBROW\020\003\022\031\n\025RI",
       "GHT_OF_LEFT_EYEBROW\020\004\022\031\n\025LEFT_OF_RIGHT_E" +
       "YEBROW\020\005\022\032\n\026RIGHT_OF_RIGHT_EYEBROW\020\006\022\031\n\025" +
       "MIDPOINT_BETWEEN_EYES\020\007\022\014\n\010NOSE_TIP\020\010\022\r\n" +
@@ -247,7 +247,7 @@ public static void registerAllExtensions(
       "T\020\017\022\026\n\022NOSE_BOTTOM_CENTER\020\020\022\031\n\025LEFT_EYE_" +
       "TOP_BOUNDARY\020\021\022\031\n\025LEFT_EYE_RIGHT_CORNER\020" +
       "\022\022\034\n\030LEFT_EYE_BOTTOM_BOUNDARY\020\023\022\030\n\024LEFT_" +
-      "EYE_LEFT_CORNER\020\024\022\032\n\026RIGHT_EYE_TOP_BOUND" +
+      "EYE_LEFT_CORNER\020\024\022\032\n\026RIGHT_EYE_TOP_BOUND",
       "ARY\020\025\022\032\n\026RIGHT_EYE_RIGHT_CORNER\020\026\022\035\n\031RIG" +
       "HT_EYE_BOTTOM_BOUNDARY\020\027\022\031\n\025RIGHT_EYE_LE" +
       "FT_CORNER\020\030\022\037\n\033LEFT_EYEBROW_UPPER_MIDPOI" +
@@ -257,7 +257,7 @@ public static void registerAllExtensions(
       "IL\020\036\022\025\n\021FOREHEAD_GLABELLA\020\037\022\021\n\rCHIN_GNAT" +
       "HION\020 \022\024\n\020CHIN_LEFT_GONION\020!\022\025\n\021CHIN_RIG" +
       "HT_GONION\020\"\"4\n\014LocationInfo\022$\n\007lat_lng\030\001" +
-      " \001(\0132\023.google.type.LatLng\"=\n\010Property\022\014\n" +
+      " \001(\0132\023.google.type.LatLng\"=\n\010Property\022\014\n",
       "\004name\030\001 \001(\t\022\r\n\005value\030\002 \001(\t\022\024\n\014uint64_val" +
       "ue\030\003 \001(\004\"\274\002\n\020EntityAnnotation\022\013\n\003mid\030\001 \001" +
       "(\t\022\016\n\006locale\030\002 \001(\t\022\023\n\013description\030\003 \001(\t\022" +
@@ -267,7 +267,7 @@ public static void registerAllExtensions(
       "ly\022>\n\tlocations\030\010 \003(\0132+.google.cloud.vis" +
       "ion.v1p2beta1.LocationInfo\022;\n\nproperties" +
       "\030\t \003(\0132\'.google.cloud.vision.v1p2beta1.P" +
-      "roperty\"\274\002\n\024SafeSearchAnnotation\0228\n\005adul" +
+      "roperty\"\274\002\n\024SafeSearchAnnotation\0228\n\005adul",
       "t\030\001 \001(\0162).google.cloud.vision.v1p2beta1." +
       "Likelihood\0228\n\005spoof\030\002 \001(\0162).google.cloud" +
       ".vision.v1p2beta1.Likelihood\022:\n\007medical\030" +
@@ -277,7 +277,7 @@ public static void registerAllExtensions(
       "\001(\0162).google.cloud.vision.v1p2beta1.Like" +
       "lihood\"a\n\013LatLongRect\022(\n\013min_lat_lng\030\001 \001" +
       "(\0132\023.google.type.LatLng\022(\n\013max_lat_lng\030\002" +
-      " \001(\0132\023.google.type.LatLng\"U\n\tColorInfo\022!" +
+      " \001(\0132\023.google.type.LatLng\"U\n\tColorInfo\022!",
       "\n\005color\030\001 \001(\0132\022.google.type.Color\022\r\n\005sco" +
       "re\030\002 \001(\002\022\026\n\016pixel_fraction\030\003 \001(\002\"T\n\030Domi" +
       "nantColorsAnnotation\0228\n\006colors\030\001 \003(\0132(.g" +
@@ -287,7 +287,7 @@ public static void registerAllExtensions(
       "antColorsAnnotation\"\177\n\010CropHint\022B\n\rbound" +
       "ing_poly\030\001 \001(\0132+.google.cloud.vision.v1p" +
       "2beta1.BoundingPoly\022\022\n\nconfidence\030\002 \001(\002\022" +
-      "\033\n\023importance_fraction\030\003 \001(\002\"R\n\023CropHint" +
+      "\033\n\023importance_fraction\030\003 \001(\002\"R\n\023CropHint",
       "sAnnotation\022;\n\ncrop_hints\030\001 \003(\0132\'.google" +
       ".cloud.vision.v1p2beta1.CropHint\"(\n\017Crop" +
       "HintsParams\022\025\n\raspect_ratios\030\001 \003(\002\"1\n\022We" +
@@ -297,7 +297,7 @@ public static void registerAllExtensions(
       "tLongRect\022\026\n\016language_hints\030\002 \003(\t\022I\n\021cro" +
       "p_hints_params\030\004 \001(\0132..google.cloud.visi" +
       "on.v1p2beta1.CropHintsParams\022O\n\024web_dete" +
-      "ction_params\030\006 \001(\01321.google.cloud.vision" +
+      "ction_params\030\006 \001(\01321.google.cloud.vision",
       ".v1p2beta1.WebDetectionParams\"\311\001\n\024Annota" +
       "teImageRequest\0223\n\005image\030\001 \001(\0132$.google.c" +
       "loud.vision.v1p2beta1.Image\0228\n\010features\030" +
@@ -307,7 +307,7 @@ public static void registerAllExtensions(
       "geAnnotationContext\022\013\n\003uri\030\001 \001(\t\022\023\n\013page" +
       "_number\030\002 \001(\005\"\212\007\n\025AnnotateImageResponse\022" +
       "G\n\020face_annotations\030\001 \003(\0132-.google.cloud" +
-      ".vision.v1p2beta1.FaceAnnotation\022M\n\024land" +
+      ".vision.v1p2beta1.FaceAnnotation\022M\n\024land",
       "mark_annotations\030\002 \003(\0132/.google.cloud.vi" +
       "sion.v1p2beta1.EntityAnnotation\022I\n\020logo_" +
       "annotations\030\003 \003(\0132/.google.cloud.vision." +
@@ -317,7 +317,7 @@ public static void registerAllExtensions(
       "ns\030\005 \003(\0132/.google.cloud.vision.v1p2beta1" +
       ".EntityAnnotation\022K\n\024full_text_annotatio" +
       "n\030\014 \001(\0132-.google.cloud.vision.v1p2beta1." +
-      "TextAnnotation\022S\n\026safe_search_annotation" +
+      "TextAnnotation\022S\n\026safe_search_annotation",
       "\030\006 \001(\01323.google.cloud.vision.v1p2beta1.S" +
       "afeSearchAnnotation\022S\n\033image_properties_" +
       "annotation\030\010 \001(\0132..google.cloud.vision.v" +
@@ -327,7 +327,7 @@ public static void registerAllExtensions(
       "tion\030\r \001(\0132+.google.cloud.vision.v1p2bet" +
       "a1.WebDetection\022!\n\005error\030\t \001(\0132\022.google." +
       "rpc.Status\022F\n\007context\030\025 \001(\01325.google.clo" +
-      "ud.vision.v1p2beta1.ImageAnnotationConte" +
+      "ud.vision.v1p2beta1.ImageAnnotationConte",
       "xt\"\241\001\n\024AnnotateFileResponse\022@\n\014input_con" +
       "fig\030\001 \001(\0132*.google.cloud.vision.v1p2beta" +
       "1.InputConfig\022G\n\tresponses\030\002 \003(\01324.googl" +
@@ -337,7 +337,7 @@ public static void registerAllExtensions(
       "2beta1.AnnotateImageRequest\"f\n\033BatchAnno" +
       "tateImagesResponse\022G\n\tresponses\030\001 \003(\01324." +
       "google.cloud.vision.v1p2beta1.AnnotateIm" +
-      "ageResponse\"\236\002\n\030AsyncAnnotateFileRequest" +
+      "ageResponse\"\236\002\n\030AsyncAnnotateFileRequest",
       "\022@\n\014input_config\030\001 \001(\0132*.google.cloud.vi" +
       "sion.v1p2beta1.InputConfig\0228\n\010features\030\002" +
       " \003(\0132&.google.cloud.vision.v1p2beta1.Fea" +
@@ -347,7 +347,7 @@ public static void registerAllExtensions(
       "p2beta1.OutputConfig\"_\n\031AsyncAnnotateFil" +
       "eResponse\022B\n\routput_config\030\001 \001(\0132+.googl" +
       "e.cloud.vision.v1p2beta1.OutputConfig\"k\n" +
-      "\036AsyncBatchAnnotateFilesRequest\022I\n\010reque" +
+      "\036AsyncBatchAnnotateFilesRequest\022I\n\010reque",
       "sts\030\001 \003(\01327.google.cloud.vision.v1p2beta" +
       "1.AsyncAnnotateFileRequest\"n\n\037AsyncBatch" +
       "AnnotateFilesResponse\022K\n\tresponses\030\001 \003(\013" +
@@ -357,7 +357,7 @@ public static void registerAllExtensions(
       "beta1.GcsSource\022\021\n\tmime_type\030\002 \001(\t\"j\n\014Ou" +
       "tputConfig\022F\n\017gcs_destination\030\001 \001(\0132-.go" +
       "ogle.cloud.vision.v1p2beta1.GcsDestinati" +
-      "on\022\022\n\nbatch_size\030\002 \001(\005\"\030\n\tGcsSource\022\013\n\003u" +
+      "on\022\022\n\nbatch_size\030\002 \001(\005\"\030\n\tGcsSource\022\013\n\003u",
       "ri\030\001 \001(\t\"\035\n\016GcsDestination\022\013\n\003uri\030\001 \001(\t\"" +
       "\217\002\n\021OperationMetadata\022E\n\005state\030\001 \001(\01626.g" +
       "oogle.cloud.vision.v1p2beta1.OperationMe" +
@@ -367,7 +367,7 @@ public static void registerAllExtensions(
       "\025\n\021STATE_UNSPECIFIED\020\000\022\013\n\007CREATED\020\001\022\013\n\007R" +
       "UNNING\020\002\022\010\n\004DONE\020\003\022\r\n\tCANCELLED\020\004*e\n\nLik" +
       "elihood\022\013\n\007UNKNOWN\020\000\022\021\n\rVERY_UNLIKELY\020\001\022" +
-      "\014\n\010UNLIKELY\020\002\022\014\n\010POSSIBLE\020\003\022\n\n\006LIKELY\020\004\022" +
+      "\014\n\010UNLIKELY\020\002\022\014\n\010POSSIBLE\020\003\022\n\n\006LIKELY\020\004\022",
       "\017\n\013VERY_LIKELY\020\0052\360\002\n\016ImageAnnotator\022\263\001\n\023" +
       "BatchAnnotateImages\0229.google.cloud.visio" +
       "n.v1p2beta1.BatchAnnotateImagesRequest\032:" +
@@ -377,7 +377,7 @@ public static void registerAllExtensions(
       "Files\022=.google.cloud.vision.v1p2beta1.As" +
       "yncBatchAnnotateFilesRequest\032\035.google.lo" +
       "ngrunning.Operation\".\202\323\344\223\002(\"#/v1p2beta1/" +
-      "files:asyncBatchAnnotate:\001*B\202\001\n!com.goog" +
+      "files:asyncBatchAnnotate:\001*B\202\001\n!com.goog",
       "le.cloud.vision.v1p2beta1B\023ImageAnnotato" +
       "rProtoP\001ZCgoogle.golang.org/genproto/goo" +
       "gleapis/cloud/vision/v1p2beta1;vision\370\001\001" +
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageContext.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageContext.java
index 9001f64f0784..6c4a68ab69a0 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageContext.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageContext.java
@@ -33,9 +33,6 @@ private ImageContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ImageContext(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p2beta1.LatLongRect.Builder subBuilder = null;
             if (latLongRect_ != null) {
@@ -95,13 +99,6 @@ private ImageContext(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -122,7 +119,6 @@ private ImageContext(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_ImageContext_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_ImageContext_fieldAccessorTable
@@ -304,7 +300,6 @@ public com.google.cloud.vision.v1p2beta1.WebDetectionParamsOrBuilder getWebDetec
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -314,7 +309,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (latLongRect_ != null) {
@@ -332,7 +326,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -493,7 +486,6 @@ public static com.google.cloud.vision.v1p2beta1.ImageContext parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -501,7 +493,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.ImageContext prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -529,7 +520,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_ImageContext_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_ImageContext_fieldAccessorTable
@@ -552,7 +542,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (latLongRectBuilder_ == null) {
@@ -578,18 +567,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_ImageContext_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.ImageContext getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.ImageContext.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.ImageContext build() {
       com.google.cloud.vision.v1p2beta1.ImageContext result = buildPartial();
       if (!result.isInitialized()) {
@@ -598,7 +584,6 @@ public com.google.cloud.vision.v1p2beta1.ImageContext build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.ImageContext buildPartial() {
       com.google.cloud.vision.v1p2beta1.ImageContext result = new com.google.cloud.vision.v1p2beta1.ImageContext(this);
       int from_bitField0_ = bitField0_;
@@ -628,39 +613,32 @@ public com.google.cloud.vision.v1p2beta1.ImageContext buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.ImageContext) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.ImageContext)other);
@@ -696,12 +674,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.ImageContext other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1372,13 +1348,11 @@ public com.google.cloud.vision.v1p2beta1.WebDetectionParamsOrBuilder getWebDetec
       }
       return webDetectionParamsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1400,12 +1374,11 @@ public static com.google.cloud.vision.v1p2beta1.ImageContext getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ImageContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImageContext(input, extensionRegistry);
+        return new ImageContext(input, extensionRegistry);
     }
   };
 
@@ -1418,7 +1391,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.ImageContext getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageProperties.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageProperties.java
index d282e2816bb3..6477a96d8b0e 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageProperties.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageProperties.java
@@ -32,9 +32,6 @@ private ImageProperties(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private ImageProperties(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p2beta1.DominantColorsAnnotation.Builder subBuilder = null;
             if (dominantColors_ != null) {
@@ -59,13 +63,6 @@ private ImageProperties(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private ImageProperties(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_ImageProperties_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_ImageProperties_fieldAccessorTable
@@ -125,7 +121,6 @@ public com.google.cloud.vision.v1p2beta1.DominantColorsAnnotationOrBuilder getDo
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -135,7 +130,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (dominantColors_ != null) {
@@ -144,7 +138,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static com.google.cloud.vision.v1p2beta1.ImageProperties parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.ImageProperties prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_ImageProperties_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_ImageProperties_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (dominantColorsBuilder_ == null) {
@@ -336,18 +325,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_ImageProperties_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.ImageProperties getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.ImageProperties.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.ImageProperties build() {
       com.google.cloud.vision.v1p2beta1.ImageProperties result = buildPartial();
       if (!result.isInitialized()) {
@@ -356,7 +342,6 @@ public com.google.cloud.vision.v1p2beta1.ImageProperties build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.ImageProperties buildPartial() {
       com.google.cloud.vision.v1p2beta1.ImageProperties result = new com.google.cloud.vision.v1p2beta1.ImageProperties(this);
       if (dominantColorsBuilder_ == null) {
@@ -368,39 +353,32 @@ public com.google.cloud.vision.v1p2beta1.ImageProperties buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.ImageProperties) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.ImageProperties)other);
@@ -420,12 +398,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.ImageProperties other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -596,13 +572,11 @@ public com.google.cloud.vision.v1p2beta1.DominantColorsAnnotationOrBuilder getDo
       }
       return dominantColorsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -624,12 +598,11 @@ public static com.google.cloud.vision.v1p2beta1.ImageProperties getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ImageProperties parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImageProperties(input, extensionRegistry);
+        return new ImageProperties(input, extensionRegistry);
     }
   };
 
@@ -642,7 +615,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.ImageProperties getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageSource.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageSource.java
index aa70b17f88ca..36daf5ba2282 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageSource.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/ImageSource.java
@@ -34,9 +34,6 @@ private ImageSource(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ImageSource(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private ImageSource(
             imageUri_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private ImageSource(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_ImageSource_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_ImageSource_fieldAccessorTable
@@ -211,7 +207,6 @@ public java.lang.String getImageUri() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -221,7 +216,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getGcsImageUriBytes().isEmpty()) {
@@ -233,7 +227,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -355,7 +348,6 @@ public static com.google.cloud.vision.v1p2beta1.ImageSource parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -363,7 +355,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.ImageSource prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -391,7 +382,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_ImageSource_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_ImageSource_fieldAccessorTable
@@ -414,7 +404,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       gcsImageUri_ = "";
@@ -424,18 +413,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_ImageSource_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.ImageSource getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.ImageSource.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.ImageSource build() {
       com.google.cloud.vision.v1p2beta1.ImageSource result = buildPartial();
       if (!result.isInitialized()) {
@@ -444,7 +430,6 @@ public com.google.cloud.vision.v1p2beta1.ImageSource build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.ImageSource buildPartial() {
       com.google.cloud.vision.v1p2beta1.ImageSource result = new com.google.cloud.vision.v1p2beta1.ImageSource(this);
       result.gcsImageUri_ = gcsImageUri_;
@@ -453,39 +438,32 @@ public com.google.cloud.vision.v1p2beta1.ImageSource buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.ImageSource) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.ImageSource)other);
@@ -510,12 +488,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.ImageSource other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -796,13 +772,11 @@ public Builder setImageUriBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -824,12 +798,11 @@ public static com.google.cloud.vision.v1p2beta1.ImageSource getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ImageSource parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImageSource(input, extensionRegistry);
+        return new ImageSource(input, extensionRegistry);
     }
   };
 
@@ -842,7 +815,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.ImageSource getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/InputConfig.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/InputConfig.java
index 5f1f9652cb9d..4f23a1bc2212 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/InputConfig.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/InputConfig.java
@@ -33,9 +33,6 @@ private InputConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private InputConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p2beta1.GcsSource.Builder subBuilder = null;
             if (gcsSource_ != null) {
@@ -66,13 +70,6 @@ private InputConfig(
             mimeType_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private InputConfig(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_InputConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_InputConfig_fieldAccessorTable
@@ -176,7 +172,6 @@ public java.lang.String getMimeType() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -186,7 +181,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (gcsSource_ != null) {
@@ -198,7 +192,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -326,7 +319,6 @@ public static com.google.cloud.vision.v1p2beta1.InputConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -334,7 +326,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.InputConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -362,7 +353,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_InputConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_InputConfig_fieldAccessorTable
@@ -385,7 +375,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (gcsSourceBuilder_ == null) {
@@ -399,18 +388,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_InputConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.InputConfig getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.InputConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.InputConfig build() {
       com.google.cloud.vision.v1p2beta1.InputConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -419,7 +405,6 @@ public com.google.cloud.vision.v1p2beta1.InputConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.InputConfig buildPartial() {
       com.google.cloud.vision.v1p2beta1.InputConfig result = new com.google.cloud.vision.v1p2beta1.InputConfig(this);
       if (gcsSourceBuilder_ == null) {
@@ -432,39 +417,32 @@ public com.google.cloud.vision.v1p2beta1.InputConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.InputConfig) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.InputConfig)other);
@@ -488,12 +466,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.InputConfig other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -758,13 +734,11 @@ public Builder setMimeTypeBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -786,12 +760,11 @@ public static com.google.cloud.vision.v1p2beta1.InputConfig getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public InputConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InputConfig(input, extensionRegistry);
+        return new InputConfig(input, extensionRegistry);
     }
   };
 
@@ -804,7 +777,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.InputConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/LatLongRect.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/LatLongRect.java
index 830d4aefbbf5..c288c4d0dc64 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/LatLongRect.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/LatLongRect.java
@@ -32,9 +32,6 @@ private LatLongRect(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private LatLongRect(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.type.LatLng.Builder subBuilder = null;
             if (minLatLng_ != null) {
@@ -72,13 +76,6 @@ private LatLongRect(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private LatLongRect(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_LatLongRect_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_LatLongRect_fieldAccessorTable
@@ -171,7 +167,6 @@ public com.google.type.LatLngOrBuilder getMaxLatLngOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -181,7 +176,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (minLatLng_ != null) {
@@ -193,7 +187,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -327,7 +320,6 @@ public static com.google.cloud.vision.v1p2beta1.LatLongRect parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -335,7 +327,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.LatLongRect prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -363,7 +354,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_LatLongRect_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_LatLongRect_fieldAccessorTable
@@ -386,7 +376,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (minLatLngBuilder_ == null) {
@@ -404,18 +393,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_LatLongRect_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.LatLongRect getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.LatLongRect.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.LatLongRect build() {
       com.google.cloud.vision.v1p2beta1.LatLongRect result = buildPartial();
       if (!result.isInitialized()) {
@@ -424,7 +410,6 @@ public com.google.cloud.vision.v1p2beta1.LatLongRect build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.LatLongRect buildPartial() {
       com.google.cloud.vision.v1p2beta1.LatLongRect result = new com.google.cloud.vision.v1p2beta1.LatLongRect(this);
       if (minLatLngBuilder_ == null) {
@@ -441,39 +426,32 @@ public com.google.cloud.vision.v1p2beta1.LatLongRect buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.LatLongRect) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.LatLongRect)other);
@@ -496,12 +474,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.LatLongRect other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -825,13 +801,11 @@ public com.google.type.LatLngOrBuilder getMaxLatLngOrBuilder() {
       }
       return maxLatLngBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -853,12 +827,11 @@ public static com.google.cloud.vision.v1p2beta1.LatLongRect getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LatLongRect parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LatLongRect(input, extensionRegistry);
+        return new LatLongRect(input, extensionRegistry);
     }
   };
 
@@ -871,7 +844,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.LatLongRect getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/LocationInfo.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/LocationInfo.java
index 61e649f23625..6153ca20b6c4 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/LocationInfo.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/LocationInfo.java
@@ -32,9 +32,6 @@ private LocationInfo(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private LocationInfo(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.type.LatLng.Builder subBuilder = null;
             if (latLng_ != null) {
@@ -59,13 +63,6 @@ private LocationInfo(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private LocationInfo(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_LocationInfo_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_LocationInfo_fieldAccessorTable
@@ -125,7 +121,6 @@ public com.google.type.LatLngOrBuilder getLatLngOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -135,7 +130,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (latLng_ != null) {
@@ -144,7 +138,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static com.google.cloud.vision.v1p2beta1.LocationInfo parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.LocationInfo prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_LocationInfo_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_LocationInfo_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (latLngBuilder_ == null) {
@@ -336,18 +325,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_LocationInfo_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.LocationInfo getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.LocationInfo.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.LocationInfo build() {
       com.google.cloud.vision.v1p2beta1.LocationInfo result = buildPartial();
       if (!result.isInitialized()) {
@@ -356,7 +342,6 @@ public com.google.cloud.vision.v1p2beta1.LocationInfo build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.LocationInfo buildPartial() {
       com.google.cloud.vision.v1p2beta1.LocationInfo result = new com.google.cloud.vision.v1p2beta1.LocationInfo(this);
       if (latLngBuilder_ == null) {
@@ -368,39 +353,32 @@ public com.google.cloud.vision.v1p2beta1.LocationInfo buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.LocationInfo) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.LocationInfo)other);
@@ -420,12 +398,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.LocationInfo other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -596,13 +572,11 @@ public com.google.type.LatLngOrBuilder getLatLngOrBuilder() {
       }
       return latLngBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -624,12 +598,11 @@ public static com.google.cloud.vision.v1p2beta1.LocationInfo getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LocationInfo parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LocationInfo(input, extensionRegistry);
+        return new LocationInfo(input, extensionRegistry);
     }
   };
 
@@ -642,7 +615,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.LocationInfo getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/NormalizedVertex.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/NormalizedVertex.java
index 73b7b5b4334d..619d3d49dcfb 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/NormalizedVertex.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/NormalizedVertex.java
@@ -36,9 +36,6 @@ private NormalizedVertex(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private NormalizedVertex(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 13: {
 
             x_ = input.readFloat();
@@ -60,13 +64,6 @@ private NormalizedVertex(
             y_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private NormalizedVertex(
     return com.google.cloud.vision.v1p2beta1.GeometryProto.internal_static_google_cloud_vision_v1p2beta1_NormalizedVertex_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.GeometryProto.internal_static_google_cloud_vision_v1p2beta1_NormalizedVertex_fieldAccessorTable
@@ -119,7 +115,6 @@ public float getY() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -129,7 +124,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (x_ != 0F) {
@@ -141,7 +135,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -271,7 +264,6 @@ public static com.google.cloud.vision.v1p2beta1.NormalizedVertex parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -279,7 +271,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.NormalizedVertex prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -309,7 +300,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.GeometryProto.internal_static_google_cloud_vision_v1p2beta1_NormalizedVertex_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.GeometryProto.internal_static_google_cloud_vision_v1p2beta1_NormalizedVertex_fieldAccessorTable
@@ -332,7 +322,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       x_ = 0F;
@@ -342,18 +331,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.GeometryProto.internal_static_google_cloud_vision_v1p2beta1_NormalizedVertex_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.NormalizedVertex getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.NormalizedVertex.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.NormalizedVertex build() {
       com.google.cloud.vision.v1p2beta1.NormalizedVertex result = buildPartial();
       if (!result.isInitialized()) {
@@ -362,7 +348,6 @@ public com.google.cloud.vision.v1p2beta1.NormalizedVertex build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.NormalizedVertex buildPartial() {
       com.google.cloud.vision.v1p2beta1.NormalizedVertex result = new com.google.cloud.vision.v1p2beta1.NormalizedVertex(this);
       result.x_ = x_;
@@ -371,39 +356,32 @@ public com.google.cloud.vision.v1p2beta1.NormalizedVertex buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.NormalizedVertex) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.NormalizedVertex)other);
@@ -426,12 +404,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.NormalizedVertex othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -525,13 +501,11 @@ public Builder clearY() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -553,12 +527,11 @@ public static com.google.cloud.vision.v1p2beta1.NormalizedVertex getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public NormalizedVertex parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new NormalizedVertex(input, extensionRegistry);
+        return new NormalizedVertex(input, extensionRegistry);
     }
   };
 
@@ -571,7 +544,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.NormalizedVertex getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/OperationMetadata.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/OperationMetadata.java
index 81eb90ff3d39..e1803dd5aadf 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/OperationMetadata.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/OperationMetadata.java
@@ -33,9 +33,6 @@ private OperationMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private OperationMetadata(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -79,13 +83,6 @@ private OperationMetadata(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private OperationMetadata(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_OperationMetadata_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_OperationMetadata_fieldAccessorTable
@@ -300,7 +296,6 @@ public int getStateValue() {
    * .google.cloud.vision.v1p2beta1.OperationMetadata.State state = 1;
    */
   public com.google.cloud.vision.v1p2beta1.OperationMetadata.State getState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p2beta1.OperationMetadata.State result = com.google.cloud.vision.v1p2beta1.OperationMetadata.State.valueOf(state_);
     return result == null ? com.google.cloud.vision.v1p2beta1.OperationMetadata.State.UNRECOGNIZED : result;
   }
@@ -372,7 +367,6 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -382,7 +376,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (state_ != com.google.cloud.vision.v1p2beta1.OperationMetadata.State.STATE_UNSPECIFIED.getNumber()) {
@@ -397,7 +390,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -538,7 +530,6 @@ public static com.google.cloud.vision.v1p2beta1.OperationMetadata parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -546,7 +537,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.OperationMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -574,7 +564,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_OperationMetadata_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_OperationMetadata_fieldAccessorTable
@@ -597,7 +586,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       state_ = 0;
@@ -617,18 +605,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_OperationMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.OperationMetadata getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.OperationMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.OperationMetadata build() {
       com.google.cloud.vision.v1p2beta1.OperationMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -637,7 +622,6 @@ public com.google.cloud.vision.v1p2beta1.OperationMetadata build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.OperationMetadata buildPartial() {
       com.google.cloud.vision.v1p2beta1.OperationMetadata result = new com.google.cloud.vision.v1p2beta1.OperationMetadata(this);
       result.state_ = state_;
@@ -655,39 +639,32 @@ public com.google.cloud.vision.v1p2beta1.OperationMetadata buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.OperationMetadata) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.OperationMetadata)other);
@@ -713,12 +690,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.OperationMetadata oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -768,7 +743,6 @@ public Builder setStateValue(int value) {
      * .google.cloud.vision.v1p2beta1.OperationMetadata.State state = 1;
      */
     public com.google.cloud.vision.v1p2beta1.OperationMetadata.State getState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p2beta1.OperationMetadata.State result = com.google.cloud.vision.v1p2beta1.OperationMetadata.State.valueOf(state_);
       return result == null ? com.google.cloud.vision.v1p2beta1.OperationMetadata.State.UNRECOGNIZED : result;
     }
@@ -1107,13 +1081,11 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
       }
       return updateTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1135,12 +1107,11 @@ public static com.google.cloud.vision.v1p2beta1.OperationMetadata getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public OperationMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new OperationMetadata(input, extensionRegistry);
+        return new OperationMetadata(input, extensionRegistry);
     }
   };
 
@@ -1153,7 +1124,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.OperationMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/OutputConfig.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/OutputConfig.java
index d65d06b60d93..cde6efe58caf 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/OutputConfig.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/OutputConfig.java
@@ -33,9 +33,6 @@ private OutputConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private OutputConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p2beta1.GcsDestination.Builder subBuilder = null;
             if (gcsDestination_ != null) {
@@ -65,13 +69,6 @@ private OutputConfig(
             batchSize_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -89,7 +86,6 @@ private OutputConfig(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_OutputConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_OutputConfig_fieldAccessorTable
@@ -151,7 +147,6 @@ public int getBatchSize() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -161,7 +156,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (gcsDestination_ != null) {
@@ -173,7 +167,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -302,7 +295,6 @@ public static com.google.cloud.vision.v1p2beta1.OutputConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -310,7 +302,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.OutputConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -338,7 +329,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_OutputConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_OutputConfig_fieldAccessorTable
@@ -361,7 +351,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (gcsDestinationBuilder_ == null) {
@@ -375,18 +364,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_OutputConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.OutputConfig getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.OutputConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.OutputConfig build() {
       com.google.cloud.vision.v1p2beta1.OutputConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -395,7 +381,6 @@ public com.google.cloud.vision.v1p2beta1.OutputConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.OutputConfig buildPartial() {
       com.google.cloud.vision.v1p2beta1.OutputConfig result = new com.google.cloud.vision.v1p2beta1.OutputConfig(this);
       if (gcsDestinationBuilder_ == null) {
@@ -408,39 +393,32 @@ public com.google.cloud.vision.v1p2beta1.OutputConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.OutputConfig) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.OutputConfig)other);
@@ -463,12 +441,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.OutputConfig other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -698,13 +674,11 @@ public Builder clearBatchSize() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -726,12 +700,11 @@ public static com.google.cloud.vision.v1p2beta1.OutputConfig getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public OutputConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new OutputConfig(input, extensionRegistry);
+        return new OutputConfig(input, extensionRegistry);
     }
   };
 
@@ -744,7 +717,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.OutputConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Page.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Page.java
index 53999f17c17b..723c2bd45dfa 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Page.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Page.java
@@ -36,9 +36,6 @@ private Page(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private Page(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p2beta1.TextAnnotation.TextProperty.Builder subBuilder = null;
             if (property_ != null) {
@@ -87,13 +91,6 @@ private Page(
             confidence_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -114,7 +111,6 @@ private Page(
     return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_Page_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_Page_fieldAccessorTable
@@ -253,7 +249,6 @@ public float getConfidence() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -263,7 +258,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (property_ != null) {
@@ -284,7 +278,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -442,7 +435,6 @@ public static com.google.cloud.vision.v1p2beta1.Page parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -450,7 +442,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.Page prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -478,7 +469,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_Page_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_Page_fieldAccessorTable
@@ -502,7 +492,6 @@ private void maybeForceBuilderInitialization() {
         getBlocksFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (propertyBuilder_ == null) {
@@ -526,18 +515,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_Page_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.Page getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.Page.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.Page build() {
       com.google.cloud.vision.v1p2beta1.Page result = buildPartial();
       if (!result.isInitialized()) {
@@ -546,7 +532,6 @@ public com.google.cloud.vision.v1p2beta1.Page build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.Page buildPartial() {
       com.google.cloud.vision.v1p2beta1.Page result = new com.google.cloud.vision.v1p2beta1.Page(this);
       int from_bitField0_ = bitField0_;
@@ -573,39 +558,32 @@ public com.google.cloud.vision.v1p2beta1.Page buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.Page) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.Page)other);
@@ -660,12 +638,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.Page other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1269,13 +1245,11 @@ public Builder clearConfidence() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1297,12 +1271,11 @@ public static com.google.cloud.vision.v1p2beta1.Page getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Page parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Page(input, extensionRegistry);
+        return new Page(input, extensionRegistry);
     }
   };
 
@@ -1315,7 +1288,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.Page getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Paragraph.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Paragraph.java
index 5e0c5f8847c3..aab5a4d01eb3 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Paragraph.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Paragraph.java
@@ -34,9 +34,6 @@ private Paragraph(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private Paragraph(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p2beta1.TextAnnotation.TextProperty.Builder subBuilder = null;
             if (property_ != null) {
@@ -88,13 +92,6 @@ private Paragraph(
             confidence_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -115,7 +112,6 @@ private Paragraph(
     return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_Paragraph_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_Paragraph_fieldAccessorTable
@@ -301,7 +297,6 @@ public float getConfidence() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -311,7 +306,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (property_ != null) {
@@ -329,7 +323,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -484,7 +477,6 @@ public static com.google.cloud.vision.v1p2beta1.Paragraph parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -492,7 +484,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.Paragraph prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -520,7 +511,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_Paragraph_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_Paragraph_fieldAccessorTable
@@ -544,7 +534,6 @@ private void maybeForceBuilderInitialization() {
         getWordsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (propertyBuilder_ == null) {
@@ -570,18 +559,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_Paragraph_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.Paragraph getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.Paragraph.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.Paragraph build() {
       com.google.cloud.vision.v1p2beta1.Paragraph result = buildPartial();
       if (!result.isInitialized()) {
@@ -590,7 +576,6 @@ public com.google.cloud.vision.v1p2beta1.Paragraph build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.Paragraph buildPartial() {
       com.google.cloud.vision.v1p2beta1.Paragraph result = new com.google.cloud.vision.v1p2beta1.Paragraph(this);
       int from_bitField0_ = bitField0_;
@@ -620,39 +605,32 @@ public com.google.cloud.vision.v1p2beta1.Paragraph buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.Paragraph) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.Paragraph)other);
@@ -704,12 +682,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.Paragraph other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1510,13 +1486,11 @@ public Builder clearConfidence() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1538,12 +1512,11 @@ public static com.google.cloud.vision.v1p2beta1.Paragraph getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Paragraph parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Paragraph(input, extensionRegistry);
+        return new Paragraph(input, extensionRegistry);
     }
   };
 
@@ -1556,7 +1529,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.Paragraph getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Position.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Position.java
index 7f2d575885de..9ee97d758c5e 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Position.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Position.java
@@ -37,9 +37,6 @@ private Position(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private Position(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 13: {
 
             x_ = input.readFloat();
@@ -66,13 +70,6 @@ private Position(
             z_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private Position(
     return com.google.cloud.vision.v1p2beta1.GeometryProto.internal_static_google_cloud_vision_v1p2beta1_Position_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.GeometryProto.internal_static_google_cloud_vision_v1p2beta1_Position_fieldAccessorTable
@@ -138,7 +134,6 @@ public float getZ() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -148,7 +143,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (x_ != 0F) {
@@ -163,7 +157,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -304,7 +297,6 @@ public static com.google.cloud.vision.v1p2beta1.Position parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -312,7 +304,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.Position prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -342,7 +333,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.GeometryProto.internal_static_google_cloud_vision_v1p2beta1_Position_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.GeometryProto.internal_static_google_cloud_vision_v1p2beta1_Position_fieldAccessorTable
@@ -365,7 +355,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       x_ = 0F;
@@ -377,18 +366,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.GeometryProto.internal_static_google_cloud_vision_v1p2beta1_Position_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.Position getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.Position.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.Position build() {
       com.google.cloud.vision.v1p2beta1.Position result = buildPartial();
       if (!result.isInitialized()) {
@@ -397,7 +383,6 @@ public com.google.cloud.vision.v1p2beta1.Position build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.Position buildPartial() {
       com.google.cloud.vision.v1p2beta1.Position result = new com.google.cloud.vision.v1p2beta1.Position(this);
       result.x_ = x_;
@@ -407,39 +392,32 @@ public com.google.cloud.vision.v1p2beta1.Position buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.Position) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.Position)other);
@@ -465,12 +443,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.Position other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -602,13 +578,11 @@ public Builder clearZ() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -630,12 +604,11 @@ public static com.google.cloud.vision.v1p2beta1.Position getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Position parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Position(input, extensionRegistry);
+        return new Position(input, extensionRegistry);
     }
   };
 
@@ -648,7 +621,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.Position getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Property.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Property.java
index 03b1fd5399ab..057de3283e8b 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Property.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Property.java
@@ -35,9 +35,6 @@ private Property(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private Property(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private Property(
             uint64Value_ = input.readUInt64();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private Property(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_Property_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_Property_fieldAccessorTable
@@ -196,7 +192,6 @@ public long getUint64Value() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -206,7 +201,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -221,7 +215,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -352,7 +345,6 @@ public static com.google.cloud.vision.v1p2beta1.Property parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -360,7 +352,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.Property prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -388,7 +379,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_Property_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_Property_fieldAccessorTable
@@ -411,7 +401,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -423,18 +412,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_Property_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.Property getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.Property.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.Property build() {
       com.google.cloud.vision.v1p2beta1.Property result = buildPartial();
       if (!result.isInitialized()) {
@@ -443,7 +429,6 @@ public com.google.cloud.vision.v1p2beta1.Property build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.Property buildPartial() {
       com.google.cloud.vision.v1p2beta1.Property result = new com.google.cloud.vision.v1p2beta1.Property(this);
       result.name_ = name_;
@@ -453,39 +438,32 @@ public com.google.cloud.vision.v1p2beta1.Property buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.Property) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.Property)other);
@@ -513,12 +491,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.Property other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -752,13 +728,11 @@ public Builder clearUint64Value() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -780,12 +754,11 @@ public static com.google.cloud.vision.v1p2beta1.Property getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Property parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Property(input, extensionRegistry);
+        return new Property(input, extensionRegistry);
     }
   };
 
@@ -798,7 +771,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.Property getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/SafeSearchAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/SafeSearchAnnotation.java
index 024640d20ddf..aa0e32b620a0 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/SafeSearchAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/SafeSearchAnnotation.java
@@ -39,9 +39,6 @@ private SafeSearchAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private SafeSearchAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -83,13 +87,6 @@ private SafeSearchAnnotation(
             racy_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -107,7 +104,6 @@ private SafeSearchAnnotation(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_SafeSearchAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_SafeSearchAnnotation_fieldAccessorTable
@@ -139,7 +135,6 @@ public int getAdultValue() {
    * .google.cloud.vision.v1p2beta1.Likelihood adult = 1;
    */
   public com.google.cloud.vision.v1p2beta1.Likelihood getAdult() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p2beta1.Likelihood result = com.google.cloud.vision.v1p2beta1.Likelihood.valueOf(adult_);
     return result == null ? com.google.cloud.vision.v1p2beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -168,7 +163,6 @@ public int getSpoofValue() {
    * .google.cloud.vision.v1p2beta1.Likelihood spoof = 2;
    */
   public com.google.cloud.vision.v1p2beta1.Likelihood getSpoof() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p2beta1.Likelihood result = com.google.cloud.vision.v1p2beta1.Likelihood.valueOf(spoof_);
     return result == null ? com.google.cloud.vision.v1p2beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -193,7 +187,6 @@ public int getMedicalValue() {
    * .google.cloud.vision.v1p2beta1.Likelihood medical = 3;
    */
   public com.google.cloud.vision.v1p2beta1.Likelihood getMedical() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p2beta1.Likelihood result = com.google.cloud.vision.v1p2beta1.Likelihood.valueOf(medical_);
     return result == null ? com.google.cloud.vision.v1p2beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -218,7 +211,6 @@ public int getViolenceValue() {
    * .google.cloud.vision.v1p2beta1.Likelihood violence = 4;
    */
   public com.google.cloud.vision.v1p2beta1.Likelihood getViolence() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p2beta1.Likelihood result = com.google.cloud.vision.v1p2beta1.Likelihood.valueOf(violence_);
     return result == null ? com.google.cloud.vision.v1p2beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -249,13 +241,11 @@ public int getRacyValue() {
    * .google.cloud.vision.v1p2beta1.Likelihood racy = 9;
    */
   public com.google.cloud.vision.v1p2beta1.Likelihood getRacy() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p2beta1.Likelihood result = com.google.cloud.vision.v1p2beta1.Likelihood.valueOf(racy_);
     return result == null ? com.google.cloud.vision.v1p2beta1.Likelihood.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -265,7 +255,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (adult_ != com.google.cloud.vision.v1p2beta1.Likelihood.UNKNOWN.getNumber()) {
@@ -286,7 +275,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -429,7 +417,6 @@ public static com.google.cloud.vision.v1p2beta1.SafeSearchAnnotation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -437,7 +424,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.SafeSearchAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -467,7 +453,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_SafeSearchAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_SafeSearchAnnotation_fieldAccessorTable
@@ -490,7 +475,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       adult_ = 0;
@@ -506,18 +490,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_SafeSearchAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.SafeSearchAnnotation getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.SafeSearchAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.SafeSearchAnnotation build() {
       com.google.cloud.vision.v1p2beta1.SafeSearchAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -526,7 +507,6 @@ public com.google.cloud.vision.v1p2beta1.SafeSearchAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.SafeSearchAnnotation buildPartial() {
       com.google.cloud.vision.v1p2beta1.SafeSearchAnnotation result = new com.google.cloud.vision.v1p2beta1.SafeSearchAnnotation(this);
       result.adult_ = adult_;
@@ -538,39 +518,32 @@ public com.google.cloud.vision.v1p2beta1.SafeSearchAnnotation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.SafeSearchAnnotation) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.SafeSearchAnnotation)other);
@@ -602,12 +575,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.SafeSearchAnnotation
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -663,7 +634,6 @@ public Builder setAdultValue(int value) {
      * .google.cloud.vision.v1p2beta1.Likelihood adult = 1;
      */
     public com.google.cloud.vision.v1p2beta1.Likelihood getAdult() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p2beta1.Likelihood result = com.google.cloud.vision.v1p2beta1.Likelihood.valueOf(adult_);
       return result == null ? com.google.cloud.vision.v1p2beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -738,7 +708,6 @@ public Builder setSpoofValue(int value) {
      * .google.cloud.vision.v1p2beta1.Likelihood spoof = 2;
      */
     public com.google.cloud.vision.v1p2beta1.Likelihood getSpoof() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p2beta1.Likelihood result = com.google.cloud.vision.v1p2beta1.Likelihood.valueOf(spoof_);
       return result == null ? com.google.cloud.vision.v1p2beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -807,7 +776,6 @@ public Builder setMedicalValue(int value) {
      * .google.cloud.vision.v1p2beta1.Likelihood medical = 3;
      */
     public com.google.cloud.vision.v1p2beta1.Likelihood getMedical() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p2beta1.Likelihood result = com.google.cloud.vision.v1p2beta1.Likelihood.valueOf(medical_);
       return result == null ? com.google.cloud.vision.v1p2beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -872,7 +840,6 @@ public Builder setViolenceValue(int value) {
      * .google.cloud.vision.v1p2beta1.Likelihood violence = 4;
      */
     public com.google.cloud.vision.v1p2beta1.Likelihood getViolence() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p2beta1.Likelihood result = com.google.cloud.vision.v1p2beta1.Likelihood.valueOf(violence_);
       return result == null ? com.google.cloud.vision.v1p2beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -946,7 +913,6 @@ public Builder setRacyValue(int value) {
      * .google.cloud.vision.v1p2beta1.Likelihood racy = 9;
      */
     public com.google.cloud.vision.v1p2beta1.Likelihood getRacy() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p2beta1.Likelihood result = com.google.cloud.vision.v1p2beta1.Likelihood.valueOf(racy_);
       return result == null ? com.google.cloud.vision.v1p2beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -985,13 +951,11 @@ public Builder clearRacy() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1013,12 +977,11 @@ public static com.google.cloud.vision.v1p2beta1.SafeSearchAnnotation getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SafeSearchAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SafeSearchAnnotation(input, extensionRegistry);
+        return new SafeSearchAnnotation(input, extensionRegistry);
     }
   };
 
@@ -1031,7 +994,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.SafeSearchAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Symbol.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Symbol.java
index 066fd89cd029..b9336b982366 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Symbol.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Symbol.java
@@ -34,9 +34,6 @@ private Symbol(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private Symbol(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p2beta1.TextAnnotation.TextProperty.Builder subBuilder = null;
             if (property_ != null) {
@@ -85,13 +89,6 @@ private Symbol(
             confidence_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -109,7 +106,6 @@ private Symbol(
     return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_Symbol_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_Symbol_fieldAccessorTable
@@ -281,7 +277,6 @@ public float getConfidence() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -291,7 +286,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (property_ != null) {
@@ -309,7 +303,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -461,7 +454,6 @@ public static com.google.cloud.vision.v1p2beta1.Symbol parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -469,7 +461,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.Symbol prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -497,7 +488,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_Symbol_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_Symbol_fieldAccessorTable
@@ -520,7 +510,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (propertyBuilder_ == null) {
@@ -542,18 +531,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_Symbol_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.Symbol getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.Symbol.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.Symbol build() {
       com.google.cloud.vision.v1p2beta1.Symbol result = buildPartial();
       if (!result.isInitialized()) {
@@ -562,7 +548,6 @@ public com.google.cloud.vision.v1p2beta1.Symbol build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.Symbol buildPartial() {
       com.google.cloud.vision.v1p2beta1.Symbol result = new com.google.cloud.vision.v1p2beta1.Symbol(this);
       if (propertyBuilder_ == null) {
@@ -581,39 +566,32 @@ public com.google.cloud.vision.v1p2beta1.Symbol buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.Symbol) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.Symbol)other);
@@ -643,12 +621,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.Symbol other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1225,13 +1201,11 @@ public Builder clearConfidence() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1253,12 +1227,11 @@ public static com.google.cloud.vision.v1p2beta1.Symbol getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Symbol parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Symbol(input, extensionRegistry);
+        return new Symbol(input, extensionRegistry);
     }
   };
 
@@ -1271,7 +1244,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.Symbol getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/TextAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/TextAnnotation.java
index 756c9b4c2675..931ff73bdbe4 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/TextAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/TextAnnotation.java
@@ -40,9 +40,6 @@ private TextAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -54,6 +51,13 @@ private TextAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               pages_ = new java.util.ArrayList();
@@ -69,13 +73,6 @@ private TextAnnotation(
             text_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private TextAnnotation(
     return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_TextAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_TextAnnotation_fieldAccessorTable
@@ -170,9 +166,6 @@ private DetectedLanguage(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -184,6 +177,13 @@ private DetectedLanguage(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -195,13 +195,6 @@ private DetectedLanguage(
               confidence_ = input.readFloat();
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -219,7 +212,6 @@ private DetectedLanguage(
       return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_TextAnnotation_DetectedLanguage_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_TextAnnotation_DetectedLanguage_fieldAccessorTable
@@ -287,7 +279,6 @@ public float getConfidence() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -297,7 +288,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getLanguageCodeBytes().isEmpty()) {
@@ -309,7 +299,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -435,7 +424,6 @@ public static com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedLanguage
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -443,7 +431,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedLanguage prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -471,7 +458,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_TextAnnotation_DetectedLanguage_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_TextAnnotation_DetectedLanguage_fieldAccessorTable
@@ -494,7 +480,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         languageCode_ = "";
@@ -504,18 +489,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_TextAnnotation_DetectedLanguage_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedLanguage getDefaultInstanceForType() {
         return com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedLanguage.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedLanguage build() {
         com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedLanguage result = buildPartial();
         if (!result.isInitialized()) {
@@ -524,7 +506,6 @@ public com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedLanguage build()
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedLanguage buildPartial() {
         com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedLanguage result = new com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedLanguage(this);
         result.languageCode_ = languageCode_;
@@ -533,39 +514,32 @@ public com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedLanguage buildPa
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedLanguage) {
           return mergeFrom((com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedLanguage)other);
@@ -589,12 +563,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.TextAnnotation.Detect
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -749,13 +721,11 @@ public Builder clearConfidence() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -777,12 +747,11 @@ public static com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedLanguage
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public DetectedLanguage parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new DetectedLanguage(input, extensionRegistry);
+          return new DetectedLanguage(input, extensionRegistry);
       }
     };
 
@@ -795,7 +764,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedLanguage getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -863,9 +831,6 @@ private DetectedBreak(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -877,6 +842,13 @@ private DetectedBreak(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 8: {
               int rawValue = input.readEnum();
 
@@ -888,13 +860,6 @@ private DetectedBreak(
               isPrefix_ = input.readBool();
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -912,7 +877,6 @@ private DetectedBreak(
       return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_TextAnnotation_DetectedBreak_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_TextAnnotation_DetectedBreak_fieldAccessorTable
@@ -1128,7 +1092,6 @@ public int getTypeValue() {
      * .google.cloud.vision.v1p2beta1.TextAnnotation.DetectedBreak.BreakType type = 1;
      */
     public com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedBreak.BreakType getType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedBreak.BreakType result = com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedBreak.BreakType.valueOf(type_);
       return result == null ? com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedBreak.BreakType.UNRECOGNIZED : result;
     }
@@ -1147,7 +1110,6 @@ public boolean getIsPrefix() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1157,7 +1119,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (type_ != com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedBreak.BreakType.UNKNOWN.getNumber()) {
@@ -1169,7 +1130,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -1293,7 +1253,6 @@ public static com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedBreak par
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -1301,7 +1260,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedBreak prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -1329,7 +1287,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_TextAnnotation_DetectedBreak_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_TextAnnotation_DetectedBreak_fieldAccessorTable
@@ -1352,7 +1309,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         type_ = 0;
@@ -1362,18 +1318,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_TextAnnotation_DetectedBreak_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedBreak getDefaultInstanceForType() {
         return com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedBreak.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedBreak build() {
         com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedBreak result = buildPartial();
         if (!result.isInitialized()) {
@@ -1382,7 +1335,6 @@ public com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedBreak build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedBreak buildPartial() {
         com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedBreak result = new com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedBreak(this);
         result.type_ = type_;
@@ -1391,39 +1343,32 @@ public com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedBreak buildParti
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedBreak) {
           return mergeFrom((com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedBreak)other);
@@ -1446,12 +1391,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.TextAnnotation.Detect
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1501,7 +1444,6 @@ public Builder setTypeValue(int value) {
        * .google.cloud.vision.v1p2beta1.TextAnnotation.DetectedBreak.BreakType type = 1;
        */
       public com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedBreak.BreakType getType() {
-        @SuppressWarnings("deprecation")
         com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedBreak.BreakType result = com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedBreak.BreakType.valueOf(type_);
         return result == null ? com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedBreak.BreakType.UNRECOGNIZED : result;
       }
@@ -1572,13 +1514,11 @@ public Builder clearIsPrefix() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1600,12 +1540,11 @@ public static com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedBreak get
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public DetectedBreak parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new DetectedBreak(input, extensionRegistry);
+          return new DetectedBreak(input, extensionRegistry);
       }
     };
 
@@ -1618,7 +1557,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedBreak getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1728,9 +1666,6 @@ private TextProperty(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1742,6 +1677,13 @@ private TextProperty(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
                 detectedLanguages_ = new java.util.ArrayList();
@@ -1764,13 +1706,6 @@ private TextProperty(
 
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1791,7 +1726,6 @@ private TextProperty(
       return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_TextAnnotation_TextProperty_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_TextAnnotation_TextProperty_fieldAccessorTable
@@ -1889,7 +1823,6 @@ public com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedBreakOrBuilder g
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1899,7 +1832,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < detectedLanguages_.size(); i++) {
@@ -1911,7 +1843,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -2042,7 +1973,6 @@ public static com.google.cloud.vision.v1p2beta1.TextAnnotation.TextProperty pars
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -2050,7 +1980,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.TextAnnotation.TextProperty prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -2078,7 +2007,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_TextAnnotation_TextProperty_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_TextAnnotation_TextProperty_fieldAccessorTable
@@ -2102,7 +2030,6 @@ private void maybeForceBuilderInitialization() {
           getDetectedLanguagesFieldBuilder();
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         if (detectedLanguagesBuilder_ == null) {
@@ -2120,18 +2047,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_TextAnnotation_TextProperty_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p2beta1.TextAnnotation.TextProperty getDefaultInstanceForType() {
         return com.google.cloud.vision.v1p2beta1.TextAnnotation.TextProperty.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p2beta1.TextAnnotation.TextProperty build() {
         com.google.cloud.vision.v1p2beta1.TextAnnotation.TextProperty result = buildPartial();
         if (!result.isInitialized()) {
@@ -2140,7 +2064,6 @@ public com.google.cloud.vision.v1p2beta1.TextAnnotation.TextProperty build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p2beta1.TextAnnotation.TextProperty buildPartial() {
         com.google.cloud.vision.v1p2beta1.TextAnnotation.TextProperty result = new com.google.cloud.vision.v1p2beta1.TextAnnotation.TextProperty(this);
         int from_bitField0_ = bitField0_;
@@ -2164,39 +2087,32 @@ public com.google.cloud.vision.v1p2beta1.TextAnnotation.TextProperty buildPartia
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1p2beta1.TextAnnotation.TextProperty) {
           return mergeFrom((com.google.cloud.vision.v1p2beta1.TextAnnotation.TextProperty)other);
@@ -2242,12 +2158,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.TextAnnotation.TextPr
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2731,13 +2645,11 @@ public com.google.cloud.vision.v1p2beta1.TextAnnotation.DetectedBreakOrBuilder g
         }
         return detectedBreakBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -2759,12 +2671,11 @@ public static com.google.cloud.vision.v1p2beta1.TextAnnotation.TextProperty getD
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public TextProperty parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new TextProperty(input, extensionRegistry);
+          return new TextProperty(input, extensionRegistry);
       }
     };
 
@@ -2777,7 +2688,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.TextAnnotation.TextProperty getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -2883,7 +2793,6 @@ public java.lang.String getText() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -2893,7 +2802,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < pages_.size(); i++) {
@@ -2905,7 +2813,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -3030,7 +2937,6 @@ public static com.google.cloud.vision.v1p2beta1.TextAnnotation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -3038,7 +2944,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.TextAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -3072,7 +2977,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_TextAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_TextAnnotation_fieldAccessorTable
@@ -3096,7 +3000,6 @@ private void maybeForceBuilderInitialization() {
         getPagesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (pagesBuilder_ == null) {
@@ -3110,18 +3013,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_TextAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.TextAnnotation getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.TextAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.TextAnnotation build() {
       com.google.cloud.vision.v1p2beta1.TextAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -3130,7 +3030,6 @@ public com.google.cloud.vision.v1p2beta1.TextAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.TextAnnotation buildPartial() {
       com.google.cloud.vision.v1p2beta1.TextAnnotation result = new com.google.cloud.vision.v1p2beta1.TextAnnotation(this);
       int from_bitField0_ = bitField0_;
@@ -3150,39 +3049,32 @@ public com.google.cloud.vision.v1p2beta1.TextAnnotation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.TextAnnotation) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.TextAnnotation)other);
@@ -3229,12 +3121,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.TextAnnotation other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3654,13 +3544,11 @@ public Builder setTextBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -3682,12 +3570,11 @@ public static com.google.cloud.vision.v1p2beta1.TextAnnotation getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TextAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TextAnnotation(input, extensionRegistry);
+        return new TextAnnotation(input, extensionRegistry);
     }
   };
 
@@ -3700,7 +3587,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.TextAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/TextAnnotationProto.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/TextAnnotationProto.java
index 027024e183f6..6db97a5e7dbd 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/TextAnnotationProto.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/TextAnnotationProto.java
@@ -77,7 +77,7 @@ public static void registerAllExtensions(
       "\002 \001(\t\032=\n\020DetectedLanguage\022\025\n\rlanguage_co" +
       "de\030\001 \001(\t\022\022\n\nconfidence\030\002 \001(\002\032\334\001\n\rDetecte" +
       "dBreak\022S\n\004type\030\001 \001(\0162E.google.cloud.visi" +
-      "on.v1p2beta1.TextAnnotation.DetectedBrea" +
+      "on.v1p2beta1.TextAnnotation.DetectedBrea",
       "k.BreakType\022\021\n\tis_prefix\030\002 \001(\010\"c\n\tBreakT" +
       "ype\022\013\n\007UNKNOWN\020\000\022\t\n\005SPACE\020\001\022\016\n\nSURE_SPAC" +
       "E\020\002\022\022\n\016EOL_SURE_SPACE\020\003\022\n\n\006HYPHEN\020\004\022\016\n\nL" +
@@ -87,7 +87,7 @@ public static void registerAllExtensions(
       "\022S\n\016detected_break\030\002 \001(\0132;.google.cloud." +
       "vision.v1p2beta1.TextAnnotation.Detected" +
       "Break\"\275\001\n\004Page\022L\n\010property\030\001 \001(\0132:.googl" +
-      "e.cloud.vision.v1p2beta1.TextAnnotation." +
+      "e.cloud.vision.v1p2beta1.TextAnnotation.",
       "TextProperty\022\r\n\005width\030\002 \001(\005\022\016\n\006height\030\003 " +
       "\001(\005\0224\n\006blocks\030\004 \003(\0132$.google.cloud.visio" +
       "n.v1p2beta1.Block\022\022\n\nconfidence\030\005 \001(\002\"\202\003" +
@@ -97,7 +97,7 @@ public static void registerAllExtensions(
       "ud.vision.v1p2beta1.BoundingPoly\022<\n\npara" +
       "graphs\030\003 \003(\0132(.google.cloud.vision.v1p2b" +
       "eta1.Paragraph\022B\n\nblock_type\030\004 \001(\0162..goo" +
-      "gle.cloud.vision.v1p2beta1.Block.BlockTy" +
+      "gle.cloud.vision.v1p2beta1.Block.BlockTy",
       "pe\022\022\n\nconfidence\030\005 \001(\002\"R\n\tBlockType\022\013\n\007U" +
       "NKNOWN\020\000\022\010\n\004TEXT\020\001\022\t\n\005TABLE\020\002\022\013\n\007PICTURE" +
       "\020\003\022\t\n\005RULER\020\004\022\013\n\007BARCODE\020\005\"\344\001\n\tParagraph" +
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "on.v1p2beta1.BoundingPoly\0222\n\005words\030\003 \003(\013" +
       "2#.google.cloud.vision.v1p2beta1.Word\022\022\n" +
       "\nconfidence\030\004 \001(\002\"\343\001\n\004Word\022L\n\010property\030\001" +
-      " \001(\0132:.google.cloud.vision.v1p2beta1.Tex" +
+      " \001(\0132:.google.cloud.vision.v1p2beta1.Tex",
       "tAnnotation.TextProperty\022A\n\014bounding_box" +
       "\030\002 \001(\0132+.google.cloud.vision.v1p2beta1.B" +
       "oundingPoly\0226\n\007symbols\030\003 \003(\0132%.google.cl" +
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       "ion.TextProperty\022A\n\014bounding_box\030\002 \001(\0132+" +
       ".google.cloud.vision.v1p2beta1.BoundingP" +
       "oly\022\014\n\004text\030\003 \001(\t\022\022\n\nconfidence\030\004 \001(\002B\202\001" +
-      "\n!com.google.cloud.vision.v1p2beta1B\023Tex" +
+      "\n!com.google.cloud.vision.v1p2beta1B\023Tex",
       "tAnnotationProtoP\001ZCgoogle.golang.org/ge" +
       "nproto/googleapis/cloud/vision/v1p2beta1" +
       ";vision\370\001\001b\006proto3"
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Vertex.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Vertex.java
index 3f1272707a25..97f6e1907800 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Vertex.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Vertex.java
@@ -35,9 +35,6 @@ private Vertex(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private Vertex(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
 
             x_ = input.readInt32();
@@ -59,13 +63,6 @@ private Vertex(
             y_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private Vertex(
     return com.google.cloud.vision.v1p2beta1.GeometryProto.internal_static_google_cloud_vision_v1p2beta1_Vertex_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.GeometryProto.internal_static_google_cloud_vision_v1p2beta1_Vertex_fieldAccessorTable
@@ -118,7 +114,6 @@ public int getY() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -128,7 +123,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (x_ != 0) {
@@ -140,7 +134,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.cloud.vision.v1p2beta1.Vertex parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.Vertex prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.GeometryProto.internal_static_google_cloud_vision_v1p2beta1_Vertex_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.GeometryProto.internal_static_google_cloud_vision_v1p2beta1_Vertex_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       x_ = 0;
@@ -334,18 +323,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.GeometryProto.internal_static_google_cloud_vision_v1p2beta1_Vertex_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.Vertex getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.Vertex.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.Vertex build() {
       com.google.cloud.vision.v1p2beta1.Vertex result = buildPartial();
       if (!result.isInitialized()) {
@@ -354,7 +340,6 @@ public com.google.cloud.vision.v1p2beta1.Vertex build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.Vertex buildPartial() {
       com.google.cloud.vision.v1p2beta1.Vertex result = new com.google.cloud.vision.v1p2beta1.Vertex(this);
       result.x_ = x_;
@@ -363,39 +348,32 @@ public com.google.cloud.vision.v1p2beta1.Vertex buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.Vertex) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.Vertex)other);
@@ -418,12 +396,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.Vertex other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -517,13 +493,11 @@ public Builder clearY() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -545,12 +519,11 @@ public static com.google.cloud.vision.v1p2beta1.Vertex getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Vertex parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Vertex(input, extensionRegistry);
+        return new Vertex(input, extensionRegistry);
     }
   };
 
@@ -563,7 +536,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.Vertex getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/WebDetection.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/WebDetection.java
index 6072fe2724e5..8b3ab6409bb8 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/WebDetection.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/WebDetection.java
@@ -38,9 +38,6 @@ private WebDetection(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private WebDetection(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               webEntities_ = new java.util.ArrayList();
@@ -106,13 +110,6 @@ private WebDetection(
                 input.readMessage(com.google.cloud.vision.v1p2beta1.WebDetection.WebLabel.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -148,7 +145,6 @@ private WebDetection(
     return com.google.cloud.vision.v1p2beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p2beta1_WebDetection_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p2beta1_WebDetection_fieldAccessorTable
@@ -238,9 +234,6 @@ private WebEntity(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -252,6 +245,13 @@ private WebEntity(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -269,13 +269,6 @@ private WebEntity(
               description_ = s;
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -293,7 +286,6 @@ private WebEntity(
       return com.google.cloud.vision.v1p2beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p2beta1_WebDetection_WebEntity_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p2beta1_WebDetection_WebEntity_fieldAccessorTable
@@ -400,7 +392,6 @@ public java.lang.String getDescription() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -410,7 +401,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getEntityIdBytes().isEmpty()) {
@@ -425,7 +415,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -558,7 +547,6 @@ public static com.google.cloud.vision.v1p2beta1.WebDetection.WebEntity parseFrom
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -566,7 +554,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.WebDetection.WebEntity prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -594,7 +581,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1p2beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p2beta1_WebDetection_WebEntity_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1p2beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p2beta1_WebDetection_WebEntity_fieldAccessorTable
@@ -617,7 +603,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         entityId_ = "";
@@ -629,18 +614,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1p2beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p2beta1_WebDetection_WebEntity_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p2beta1.WebDetection.WebEntity getDefaultInstanceForType() {
         return com.google.cloud.vision.v1p2beta1.WebDetection.WebEntity.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p2beta1.WebDetection.WebEntity build() {
         com.google.cloud.vision.v1p2beta1.WebDetection.WebEntity result = buildPartial();
         if (!result.isInitialized()) {
@@ -649,7 +631,6 @@ public com.google.cloud.vision.v1p2beta1.WebDetection.WebEntity build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p2beta1.WebDetection.WebEntity buildPartial() {
         com.google.cloud.vision.v1p2beta1.WebDetection.WebEntity result = new com.google.cloud.vision.v1p2beta1.WebDetection.WebEntity(this);
         result.entityId_ = entityId_;
@@ -659,39 +640,32 @@ public com.google.cloud.vision.v1p2beta1.WebDetection.WebEntity buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1p2beta1.WebDetection.WebEntity) {
           return mergeFrom((com.google.cloud.vision.v1p2beta1.WebDetection.WebEntity)other);
@@ -719,12 +693,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.WebDetection.WebEntit
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -961,13 +933,11 @@ public Builder setDescriptionBytes(
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -989,12 +959,11 @@ public static com.google.cloud.vision.v1p2beta1.WebDetection.WebEntity getDefaul
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public WebEntity parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new WebEntity(input, extensionRegistry);
+          return new WebEntity(input, extensionRegistry);
       }
     };
 
@@ -1007,7 +976,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.WebDetection.WebEntity getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1076,9 +1044,6 @@ private WebImage(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1090,6 +1055,13 @@ private WebImage(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -1101,13 +1073,6 @@ private WebImage(
               score_ = input.readFloat();
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1125,7 +1090,6 @@ private WebImage(
       return com.google.cloud.vision.v1p2beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p2beta1_WebDetection_WebImage_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p2beta1_WebDetection_WebImage_fieldAccessorTable
@@ -1189,7 +1153,6 @@ public float getScore() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1199,7 +1162,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getUrlBytes().isEmpty()) {
@@ -1211,7 +1173,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -1337,7 +1298,6 @@ public static com.google.cloud.vision.v1p2beta1.WebDetection.WebImage parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -1345,7 +1305,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.WebDetection.WebImage prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -1373,7 +1332,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1p2beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p2beta1_WebDetection_WebImage_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1p2beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p2beta1_WebDetection_WebImage_fieldAccessorTable
@@ -1396,7 +1354,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         url_ = "";
@@ -1406,18 +1363,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1p2beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p2beta1_WebDetection_WebImage_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p2beta1.WebDetection.WebImage getDefaultInstanceForType() {
         return com.google.cloud.vision.v1p2beta1.WebDetection.WebImage.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p2beta1.WebDetection.WebImage build() {
         com.google.cloud.vision.v1p2beta1.WebDetection.WebImage result = buildPartial();
         if (!result.isInitialized()) {
@@ -1426,7 +1380,6 @@ public com.google.cloud.vision.v1p2beta1.WebDetection.WebImage build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p2beta1.WebDetection.WebImage buildPartial() {
         com.google.cloud.vision.v1p2beta1.WebDetection.WebImage result = new com.google.cloud.vision.v1p2beta1.WebDetection.WebImage(this);
         result.url_ = url_;
@@ -1435,39 +1388,32 @@ public com.google.cloud.vision.v1p2beta1.WebDetection.WebImage buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1p2beta1.WebDetection.WebImage) {
           return mergeFrom((com.google.cloud.vision.v1p2beta1.WebDetection.WebImage)other);
@@ -1491,12 +1437,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.WebDetection.WebImage
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1641,13 +1585,11 @@ public Builder clearScore() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1669,12 +1611,11 @@ public static com.google.cloud.vision.v1p2beta1.WebDetection.WebImage getDefault
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public WebImage parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new WebImage(input, extensionRegistry);
+          return new WebImage(input, extensionRegistry);
       }
     };
 
@@ -1687,7 +1628,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.WebDetection.WebImage getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1885,9 +1825,6 @@ private WebPage(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1899,6 +1836,13 @@ private WebPage(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -1934,13 +1878,6 @@ private WebPage(
                   input.readMessage(com.google.cloud.vision.v1p2beta1.WebDetection.WebImage.parser(), extensionRegistry));
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1964,7 +1901,6 @@ private WebPage(
       return com.google.cloud.vision.v1p2beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p2beta1_WebDetection_WebPage_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p2beta1_WebDetection_WebPage_fieldAccessorTable
@@ -2201,7 +2137,6 @@ public com.google.cloud.vision.v1p2beta1.WebDetection.WebImageOrBuilder getParti
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -2211,7 +2146,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getUrlBytes().isEmpty()) {
@@ -2232,7 +2166,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -2385,7 +2318,6 @@ public static com.google.cloud.vision.v1p2beta1.WebDetection.WebPage parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -2393,7 +2325,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.WebDetection.WebPage prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -2421,7 +2352,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1p2beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p2beta1_WebDetection_WebPage_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1p2beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p2beta1_WebDetection_WebPage_fieldAccessorTable
@@ -2446,7 +2376,6 @@ private void maybeForceBuilderInitialization() {
           getPartialMatchingImagesFieldBuilder();
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         url_ = "";
@@ -2470,18 +2399,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1p2beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p2beta1_WebDetection_WebPage_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p2beta1.WebDetection.WebPage getDefaultInstanceForType() {
         return com.google.cloud.vision.v1p2beta1.WebDetection.WebPage.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p2beta1.WebDetection.WebPage build() {
         com.google.cloud.vision.v1p2beta1.WebDetection.WebPage result = buildPartial();
         if (!result.isInitialized()) {
@@ -2490,7 +2416,6 @@ public com.google.cloud.vision.v1p2beta1.WebDetection.WebPage build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p2beta1.WebDetection.WebPage buildPartial() {
         com.google.cloud.vision.v1p2beta1.WebDetection.WebPage result = new com.google.cloud.vision.v1p2beta1.WebDetection.WebPage(this);
         int from_bitField0_ = bitField0_;
@@ -2521,39 +2446,32 @@ public com.google.cloud.vision.v1p2beta1.WebDetection.WebPage buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1p2beta1.WebDetection.WebPage) {
           return mergeFrom((com.google.cloud.vision.v1p2beta1.WebDetection.WebPage)other);
@@ -2633,12 +2551,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.WebDetection.WebPage
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3569,13 +3485,11 @@ public com.google.cloud.vision.v1p2beta1.WebDetection.WebImage.Builder addPartia
         }
         return partialMatchingImagesBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -3597,12 +3511,11 @@ public static com.google.cloud.vision.v1p2beta1.WebDetection.WebPage getDefaultI
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public WebPage parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new WebPage(input, extensionRegistry);
+          return new WebPage(input, extensionRegistry);
       }
     };
 
@@ -3615,7 +3528,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.WebDetection.WebPage getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -3697,9 +3609,6 @@ private WebLabel(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3711,6 +3620,13 @@ private WebLabel(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -3723,13 +3639,6 @@ private WebLabel(
               languageCode_ = s;
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -3747,7 +3656,6 @@ private WebLabel(
       return com.google.cloud.vision.v1p2beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p2beta1_WebDetection_WebLabel_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p2beta1_WebDetection_WebLabel_fieldAccessorTable
@@ -3844,7 +3752,6 @@ public java.lang.String getLanguageCode() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -3854,7 +3761,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getLabelBytes().isEmpty()) {
@@ -3866,7 +3772,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -3988,7 +3893,6 @@ public static com.google.cloud.vision.v1p2beta1.WebDetection.WebLabel parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -3996,7 +3900,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.WebDetection.WebLabel prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -4024,7 +3927,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1p2beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p2beta1_WebDetection_WebLabel_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1p2beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p2beta1_WebDetection_WebLabel_fieldAccessorTable
@@ -4047,7 +3949,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         label_ = "";
@@ -4057,18 +3958,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1p2beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p2beta1_WebDetection_WebLabel_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p2beta1.WebDetection.WebLabel getDefaultInstanceForType() {
         return com.google.cloud.vision.v1p2beta1.WebDetection.WebLabel.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p2beta1.WebDetection.WebLabel build() {
         com.google.cloud.vision.v1p2beta1.WebDetection.WebLabel result = buildPartial();
         if (!result.isInitialized()) {
@@ -4077,7 +3975,6 @@ public com.google.cloud.vision.v1p2beta1.WebDetection.WebLabel build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p2beta1.WebDetection.WebLabel buildPartial() {
         com.google.cloud.vision.v1p2beta1.WebDetection.WebLabel result = new com.google.cloud.vision.v1p2beta1.WebDetection.WebLabel(this);
         result.label_ = label_;
@@ -4086,39 +3983,32 @@ public com.google.cloud.vision.v1p2beta1.WebDetection.WebLabel buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1p2beta1.WebDetection.WebLabel) {
           return mergeFrom((com.google.cloud.vision.v1p2beta1.WebDetection.WebLabel)other);
@@ -4143,12 +4033,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.WebDetection.WebLabel
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4354,13 +4242,11 @@ public Builder setLanguageCodeBytes(
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -4382,12 +4268,11 @@ public static com.google.cloud.vision.v1p2beta1.WebDetection.WebLabel getDefault
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public WebLabel parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new WebLabel(input, extensionRegistry);
+          return new WebLabel(input, extensionRegistry);
       }
     };
 
@@ -4400,7 +4285,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.WebDetection.WebLabel getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -4753,7 +4637,6 @@ public com.google.cloud.vision.v1p2beta1.WebDetection.WebLabelOrBuilder getBestG
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -4763,7 +4646,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < webEntities_.size(); i++) {
@@ -4787,7 +4669,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -4955,7 +4836,6 @@ public static com.google.cloud.vision.v1p2beta1.WebDetection parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -4963,7 +4843,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.WebDetection prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -4991,7 +4870,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p2beta1_WebDetection_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p2beta1_WebDetection_fieldAccessorTable
@@ -5020,7 +4898,6 @@ private void maybeForceBuilderInitialization() {
         getBestGuessLabelsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (webEntitiesBuilder_ == null) {
@@ -5062,18 +4939,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p2beta1_WebDetection_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.WebDetection getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.WebDetection.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.WebDetection build() {
       com.google.cloud.vision.v1p2beta1.WebDetection result = buildPartial();
       if (!result.isInitialized()) {
@@ -5082,7 +4956,6 @@ public com.google.cloud.vision.v1p2beta1.WebDetection build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.WebDetection buildPartial() {
       com.google.cloud.vision.v1p2beta1.WebDetection result = new com.google.cloud.vision.v1p2beta1.WebDetection(this);
       int from_bitField0_ = bitField0_;
@@ -5144,39 +5017,32 @@ public com.google.cloud.vision.v1p2beta1.WebDetection buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.WebDetection) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.WebDetection)other);
@@ -5349,12 +5215,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.WebDetection other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -7299,13 +7163,11 @@ public com.google.cloud.vision.v1p2beta1.WebDetection.WebLabel.Builder addBestGu
       }
       return bestGuessLabelsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -7327,12 +7189,11 @@ public static com.google.cloud.vision.v1p2beta1.WebDetection getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public WebDetection parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WebDetection(input, extensionRegistry);
+        return new WebDetection(input, extensionRegistry);
     }
   };
 
@@ -7345,7 +7206,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.WebDetection getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/WebDetectionParams.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/WebDetectionParams.java
index fa3c45faa8b1..0e3b3188afd0 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/WebDetectionParams.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/WebDetectionParams.java
@@ -33,9 +33,6 @@ private WebDetectionParams(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,11 +44,6 @@ private WebDetectionParams(
           case 0:
             done = true;
             break;
-          case 16: {
-
-            includeGeoResults_ = input.readBool();
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -59,6 +51,11 @@ private WebDetectionParams(
             }
             break;
           }
+          case 16: {
+
+            includeGeoResults_ = input.readBool();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -76,7 +73,6 @@ private WebDetectionParams(
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_WebDetectionParams_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_WebDetectionParams_fieldAccessorTable
@@ -98,7 +94,6 @@ public boolean getIncludeGeoResults() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -108,7 +103,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (includeGeoResults_ != false) {
@@ -117,7 +111,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -234,7 +227,6 @@ public static com.google.cloud.vision.v1p2beta1.WebDetectionParams parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -242,7 +234,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.WebDetectionParams prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -270,7 +261,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_WebDetectionParams_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_WebDetectionParams_fieldAccessorTable
@@ -293,7 +283,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       includeGeoResults_ = false;
@@ -301,18 +290,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p2beta1_WebDetectionParams_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.WebDetectionParams getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.WebDetectionParams.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.WebDetectionParams build() {
       com.google.cloud.vision.v1p2beta1.WebDetectionParams result = buildPartial();
       if (!result.isInitialized()) {
@@ -321,7 +307,6 @@ public com.google.cloud.vision.v1p2beta1.WebDetectionParams build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.WebDetectionParams buildPartial() {
       com.google.cloud.vision.v1p2beta1.WebDetectionParams result = new com.google.cloud.vision.v1p2beta1.WebDetectionParams(this);
       result.includeGeoResults_ = includeGeoResults_;
@@ -329,39 +314,32 @@ public com.google.cloud.vision.v1p2beta1.WebDetectionParams buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.WebDetectionParams) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.WebDetectionParams)other);
@@ -381,12 +359,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.WebDetectionParams ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -442,13 +418,11 @@ public Builder clearIncludeGeoResults() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -470,12 +444,11 @@ public static com.google.cloud.vision.v1p2beta1.WebDetectionParams getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public WebDetectionParams parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WebDetectionParams(input, extensionRegistry);
+        return new WebDetectionParams(input, extensionRegistry);
     }
   };
 
@@ -488,7 +461,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.WebDetectionParams getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/WebDetectionProto.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/WebDetectionProto.java
index 69b531681fcd..c247c4852afb 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/WebDetectionProto.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/WebDetectionProto.java
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "oogle.cloud.vision.v1p2beta1.WebDetectio" +
       "n.WebImage\022U\n\027partial_matching_images\030\003 " +
       "\003(\01324.google.cloud.vision.v1p2beta1.WebD" +
-      "etection.WebImage\022W\n\032pages_with_matching" +
+      "etection.WebImage\022W\n\032pages_with_matching",
       "_images\030\004 \003(\01323.google.cloud.vision.v1p2" +
       "beta1.WebDetection.WebPage\022U\n\027visually_s" +
       "imilar_images\030\006 \003(\01324.google.cloud.visio" +
@@ -67,7 +67,7 @@ public static void registerAllExtensions(
       "bEntity\022\021\n\tentity_id\030\001 \001(\t\022\r\n\005score\030\002 \001(" +
       "\002\022\023\n\013description\030\003 \001(\t\032&\n\010WebImage\022\013\n\003ur" +
       "l\030\001 \001(\t\022\r\n\005score\030\002 \001(\002\032\344\001\n\007WebPage\022\013\n\003ur" +
-      "l\030\001 \001(\t\022\r\n\005score\030\002 \001(\002\022\022\n\npage_title\030\003 \001" +
+      "l\030\001 \001(\t\022\r\n\005score\030\002 \001(\002\022\022\n\npage_title\030\003 \001",
       "(\t\022R\n\024full_matching_images\030\004 \003(\01324.googl" +
       "e.cloud.vision.v1p2beta1.WebDetection.We" +
       "bImage\022U\n\027partial_matching_images\030\005 \003(\0132" +
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Word.java b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Word.java
index 52a4612749a6..c9c63076475c 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Word.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p2beta1/src/main/java/com/google/cloud/vision/v1p2beta1/Word.java
@@ -34,9 +34,6 @@ private Word(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private Word(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p2beta1.TextAnnotation.TextProperty.Builder subBuilder = null;
             if (property_ != null) {
@@ -88,13 +92,6 @@ private Word(
             confidence_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -115,7 +112,6 @@ private Word(
     return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_Word_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_Word_fieldAccessorTable
@@ -306,7 +302,6 @@ public float getConfidence() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -316,7 +311,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (property_ != null) {
@@ -334,7 +328,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -489,7 +482,6 @@ public static com.google.cloud.vision.v1p2beta1.Word parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -497,7 +489,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p2beta1.Word prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -525,7 +516,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_Word_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_Word_fieldAccessorTable
@@ -549,7 +539,6 @@ private void maybeForceBuilderInitialization() {
         getSymbolsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (propertyBuilder_ == null) {
@@ -575,18 +564,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p2beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p2beta1_Word_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.Word getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p2beta1.Word.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.Word build() {
       com.google.cloud.vision.v1p2beta1.Word result = buildPartial();
       if (!result.isInitialized()) {
@@ -595,7 +581,6 @@ public com.google.cloud.vision.v1p2beta1.Word build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p2beta1.Word buildPartial() {
       com.google.cloud.vision.v1p2beta1.Word result = new com.google.cloud.vision.v1p2beta1.Word(this);
       int from_bitField0_ = bitField0_;
@@ -625,39 +610,32 @@ public com.google.cloud.vision.v1p2beta1.Word buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p2beta1.Word) {
         return mergeFrom((com.google.cloud.vision.v1p2beta1.Word)other);
@@ -709,12 +687,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p2beta1.Word other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1533,13 +1509,11 @@ public Builder clearConfidence() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1561,12 +1535,11 @@ public static com.google.cloud.vision.v1p2beta1.Word getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Word parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Word(input, extensionRegistry);
+        return new Word(input, extensionRegistry);
     }
   };
 
@@ -1579,7 +1552,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p2beta1.Word getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AddProductToProductSetRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AddProductToProductSetRequest.java
index db3ba207b6d5..27135e1b32c9 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AddProductToProductSetRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AddProductToProductSetRequest.java
@@ -34,9 +34,6 @@ private AddProductToProductSetRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private AddProductToProductSetRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private AddProductToProductSetRequest(
             product_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private AddProductToProductSetRequest(
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_AddProductToProductSetRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_AddProductToProductSetRequest_fieldAccessorTable
@@ -185,7 +181,6 @@ public java.lang.String getProduct() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -195,7 +190,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -207,7 +201,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -329,7 +322,6 @@ public static com.google.cloud.vision.v1p3beta1.AddProductToProductSetRequest pa
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -337,7 +329,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.AddProductToProductSetRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -365,7 +356,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_AddProductToProductSetRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_AddProductToProductSetRequest_fieldAccessorTable
@@ -388,7 +378,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -398,18 +387,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_AddProductToProductSetRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.AddProductToProductSetRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.AddProductToProductSetRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.AddProductToProductSetRequest build() {
       com.google.cloud.vision.v1p3beta1.AddProductToProductSetRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -418,7 +404,6 @@ public com.google.cloud.vision.v1p3beta1.AddProductToProductSetRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.AddProductToProductSetRequest buildPartial() {
       com.google.cloud.vision.v1p3beta1.AddProductToProductSetRequest result = new com.google.cloud.vision.v1p3beta1.AddProductToProductSetRequest(this);
       result.name_ = name_;
@@ -427,39 +412,32 @@ public com.google.cloud.vision.v1p3beta1.AddProductToProductSetRequest buildPart
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.AddProductToProductSetRequest) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.AddProductToProductSetRequest)other);
@@ -484,12 +462,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.AddProductToProductSe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -705,13 +681,11 @@ public Builder setProductBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -733,12 +707,11 @@ public static com.google.cloud.vision.v1p3beta1.AddProductToProductSetRequest ge
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AddProductToProductSetRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AddProductToProductSetRequest(input, extensionRegistry);
+        return new AddProductToProductSetRequest(input, extensionRegistry);
     }
   };
 
@@ -751,7 +724,6 @@ public com.google.protobuf.Parser getParserForTyp
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.AddProductToProductSetRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AnnotateFileResponse.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AnnotateFileResponse.java
index cef799d066d1..2ce2e5a84545 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AnnotateFileResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AnnotateFileResponse.java
@@ -34,9 +34,6 @@ private AnnotateFileResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private AnnotateFileResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p3beta1.InputConfig.Builder subBuilder = null;
             if (inputConfig_ != null) {
@@ -70,13 +74,6 @@ private AnnotateFileResponse(
                 input.readMessage(com.google.cloud.vision.v1p3beta1.AnnotateImageResponse.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private AnnotateFileResponse(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AnnotateFileResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AnnotateFileResponse_fieldAccessorTable
@@ -195,7 +191,6 @@ public com.google.cloud.vision.v1p3beta1.AnnotateImageResponseOrBuilder getRespo
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -205,7 +200,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (inputConfig_ != null) {
@@ -217,7 +211,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -348,7 +341,6 @@ public static com.google.cloud.vision.v1p3beta1.AnnotateFileResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -356,7 +348,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.AnnotateFileResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -385,7 +376,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AnnotateFileResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AnnotateFileResponse_fieldAccessorTable
@@ -409,7 +399,6 @@ private void maybeForceBuilderInitialization() {
         getResponsesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (inputConfigBuilder_ == null) {
@@ -427,18 +416,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AnnotateFileResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.AnnotateFileResponse getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.AnnotateFileResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.AnnotateFileResponse build() {
       com.google.cloud.vision.v1p3beta1.AnnotateFileResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -447,7 +433,6 @@ public com.google.cloud.vision.v1p3beta1.AnnotateFileResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.AnnotateFileResponse buildPartial() {
       com.google.cloud.vision.v1p3beta1.AnnotateFileResponse result = new com.google.cloud.vision.v1p3beta1.AnnotateFileResponse(this);
       int from_bitField0_ = bitField0_;
@@ -471,39 +456,32 @@ public com.google.cloud.vision.v1p3beta1.AnnotateFileResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.AnnotateFileResponse) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.AnnotateFileResponse)other);
@@ -549,12 +527,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.AnnotateFileResponse
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1038,13 +1014,11 @@ public com.google.cloud.vision.v1p3beta1.AnnotateImageResponse.Builder addRespon
       }
       return responsesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1066,12 +1040,11 @@ public static com.google.cloud.vision.v1p3beta1.AnnotateFileResponse getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnnotateFileResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateFileResponse(input, extensionRegistry);
+        return new AnnotateFileResponse(input, extensionRegistry);
     }
   };
 
@@ -1084,7 +1057,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.AnnotateFileResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AnnotateImageRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AnnotateImageRequest.java
index b70298d35d0b..193bdc19428d 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AnnotateImageRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AnnotateImageRequest.java
@@ -34,9 +34,6 @@ private AnnotateImageRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private AnnotateImageRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p3beta1.Image.Builder subBuilder = null;
             if (image_ != null) {
@@ -83,13 +87,6 @@ private AnnotateImageRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -110,7 +107,6 @@ private AnnotateImageRequest(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AnnotateImageRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AnnotateImageRequest_fieldAccessorTable
@@ -241,7 +237,6 @@ public com.google.cloud.vision.v1p3beta1.ImageContextOrBuilder getImageContextOr
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -251,7 +246,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (image_ != null) {
@@ -266,7 +260,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -410,7 +403,6 @@ public static com.google.cloud.vision.v1p3beta1.AnnotateImageRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -418,7 +410,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.AnnotateImageRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -447,7 +438,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AnnotateImageRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AnnotateImageRequest_fieldAccessorTable
@@ -471,7 +461,6 @@ private void maybeForceBuilderInitialization() {
         getFeaturesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (imageBuilder_ == null) {
@@ -495,18 +484,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AnnotateImageRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.AnnotateImageRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.AnnotateImageRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.AnnotateImageRequest build() {
       com.google.cloud.vision.v1p3beta1.AnnotateImageRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -515,7 +501,6 @@ public com.google.cloud.vision.v1p3beta1.AnnotateImageRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.AnnotateImageRequest buildPartial() {
       com.google.cloud.vision.v1p3beta1.AnnotateImageRequest result = new com.google.cloud.vision.v1p3beta1.AnnotateImageRequest(this);
       int from_bitField0_ = bitField0_;
@@ -544,39 +529,32 @@ public com.google.cloud.vision.v1p3beta1.AnnotateImageRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.AnnotateImageRequest) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.AnnotateImageRequest)other);
@@ -625,12 +603,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.AnnotateImageRequest
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1267,13 +1243,11 @@ public com.google.cloud.vision.v1p3beta1.ImageContextOrBuilder getImageContextOr
       }
       return imageContextBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1295,12 +1269,11 @@ public static com.google.cloud.vision.v1p3beta1.AnnotateImageRequest getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnnotateImageRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateImageRequest(input, extensionRegistry);
+        return new AnnotateImageRequest(input, extensionRegistry);
     }
   };
 
@@ -1313,7 +1286,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.AnnotateImageRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AnnotateImageResponse.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AnnotateImageResponse.java
index fe4869456eed..7889d3b5b2c6 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AnnotateImageResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AnnotateImageResponse.java
@@ -38,9 +38,6 @@ private AnnotateImageResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private AnnotateImageResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               faceAnnotations_ = new java.util.ArrayList();
@@ -210,13 +214,6 @@ private AnnotateImageResponse(
                 input.readMessage(com.google.cloud.vision.v1p3beta1.LocalizedObjectAnnotation.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -252,7 +249,6 @@ private AnnotateImageResponse(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AnnotateImageResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AnnotateImageResponse_fieldAccessorTable
@@ -879,7 +875,6 @@ public com.google.cloud.vision.v1p3beta1.ImageAnnotationContextOrBuilder getCont
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -889,7 +884,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < faceAnnotations_.size(); i++) {
@@ -937,7 +931,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1209,7 +1202,6 @@ public static com.google.cloud.vision.v1p3beta1.AnnotateImageResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1217,7 +1209,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.AnnotateImageResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1245,7 +1236,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AnnotateImageResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AnnotateImageResponse_fieldAccessorTable
@@ -1274,7 +1264,6 @@ private void maybeForceBuilderInitialization() {
         getTextAnnotationsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (faceAnnotationsBuilder_ == null) {
@@ -1364,18 +1353,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AnnotateImageResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.AnnotateImageResponse getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.AnnotateImageResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.AnnotateImageResponse build() {
       com.google.cloud.vision.v1p3beta1.AnnotateImageResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -1384,7 +1370,6 @@ public com.google.cloud.vision.v1p3beta1.AnnotateImageResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.AnnotateImageResponse buildPartial() {
       com.google.cloud.vision.v1p3beta1.AnnotateImageResponse result = new com.google.cloud.vision.v1p3beta1.AnnotateImageResponse(this);
       int from_bitField0_ = bitField0_;
@@ -1488,39 +1473,32 @@ public com.google.cloud.vision.v1p3beta1.AnnotateImageResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.AnnotateImageResponse) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.AnnotateImageResponse)other);
@@ -1717,12 +1695,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.AnnotateImageResponse
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4909,13 +4885,11 @@ public com.google.cloud.vision.v1p3beta1.ImageAnnotationContextOrBuilder getCont
       }
       return contextBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -4937,12 +4911,11 @@ public static com.google.cloud.vision.v1p3beta1.AnnotateImageResponse getDefault
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AnnotateImageResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AnnotateImageResponse(input, extensionRegistry);
+        return new AnnotateImageResponse(input, extensionRegistry);
     }
   };
 
@@ -4955,7 +4928,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.AnnotateImageResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AsyncAnnotateFileRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AsyncAnnotateFileRequest.java
index aa47a83554d8..db626fc092af 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AsyncAnnotateFileRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AsyncAnnotateFileRequest.java
@@ -33,9 +33,6 @@ private AsyncAnnotateFileRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private AsyncAnnotateFileRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p3beta1.InputConfig.Builder subBuilder = null;
             if (inputConfig_ != null) {
@@ -95,13 +99,6 @@ private AsyncAnnotateFileRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -122,7 +119,6 @@ private AsyncAnnotateFileRequest(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AsyncAnnotateFileRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AsyncAnnotateFileRequest_fieldAccessorTable
@@ -286,7 +282,6 @@ public com.google.cloud.vision.v1p3beta1.OutputConfigOrBuilder getOutputConfigOr
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -296,7 +291,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (inputConfig_ != null) {
@@ -314,7 +308,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -471,7 +464,6 @@ public static com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileRequest parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -479,7 +471,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -507,7 +498,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AsyncAnnotateFileRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AsyncAnnotateFileRequest_fieldAccessorTable
@@ -531,7 +521,6 @@ private void maybeForceBuilderInitialization() {
         getFeaturesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (inputConfigBuilder_ == null) {
@@ -561,18 +550,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AsyncAnnotateFileRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileRequest build() {
       com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -581,7 +567,6 @@ public com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileRequest buildPartial() {
       com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileRequest result = new com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileRequest(this);
       int from_bitField0_ = bitField0_;
@@ -615,39 +600,32 @@ public com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileRequest buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileRequest) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileRequest)other);
@@ -699,12 +677,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileRequ
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1494,13 +1470,11 @@ public com.google.cloud.vision.v1p3beta1.OutputConfigOrBuilder getOutputConfigOr
       }
       return outputConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1522,12 +1496,11 @@ public static com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileRequest getDefa
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AsyncAnnotateFileRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AsyncAnnotateFileRequest(input, extensionRegistry);
+        return new AsyncAnnotateFileRequest(input, extensionRegistry);
     }
   };
 
@@ -1540,7 +1513,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AsyncAnnotateFileResponse.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AsyncAnnotateFileResponse.java
index 308c6086fdc0..dcd55af8e277 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AsyncAnnotateFileResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AsyncAnnotateFileResponse.java
@@ -32,9 +32,6 @@ private AsyncAnnotateFileResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private AsyncAnnotateFileResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p3beta1.OutputConfig.Builder subBuilder = null;
             if (outputConfig_ != null) {
@@ -59,13 +63,6 @@ private AsyncAnnotateFileResponse(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private AsyncAnnotateFileResponse(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AsyncAnnotateFileResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AsyncAnnotateFileResponse_fieldAccessorTable
@@ -125,7 +121,6 @@ public com.google.cloud.vision.v1p3beta1.OutputConfigOrBuilder getOutputConfigOr
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -135,7 +130,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (outputConfig_ != null) {
@@ -144,7 +138,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileResponse parseF
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AsyncAnnotateFileResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AsyncAnnotateFileResponse_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (outputConfigBuilder_ == null) {
@@ -336,18 +325,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AsyncAnnotateFileResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileResponse getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileResponse build() {
       com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -356,7 +342,6 @@ public com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileResponse buildPartial() {
       com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileResponse result = new com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileResponse(this);
       if (outputConfigBuilder_ == null) {
@@ -368,39 +353,32 @@ public com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileResponse buildPartial(
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileResponse) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileResponse)other);
@@ -420,12 +398,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileResp
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -596,13 +572,11 @@ public com.google.cloud.vision.v1p3beta1.OutputConfigOrBuilder getOutputConfigOr
       }
       return outputConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -624,12 +598,11 @@ public static com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileResponse getDef
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AsyncAnnotateFileResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AsyncAnnotateFileResponse(input, extensionRegistry);
+        return new AsyncAnnotateFileResponse(input, extensionRegistry);
     }
   };
 
@@ -642,7 +615,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AsyncBatchAnnotateFilesRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AsyncBatchAnnotateFilesRequest.java
index a412189558e0..ce39f8ff3dec 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AsyncBatchAnnotateFilesRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AsyncBatchAnnotateFilesRequest.java
@@ -34,9 +34,6 @@ private AsyncBatchAnnotateFilesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private AsyncBatchAnnotateFilesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               requests_ = new java.util.ArrayList();
@@ -57,13 +61,6 @@ private AsyncBatchAnnotateFilesRequest(
                 input.readMessage(com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileRequest.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private AsyncBatchAnnotateFilesRequest(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AsyncBatchAnnotateFilesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AsyncBatchAnnotateFilesRequest_fieldAccessorTable
@@ -148,7 +144,6 @@ public com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileRequestOrBuilder getRe
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -158,7 +153,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < requests_.size(); i++) {
@@ -167,7 +161,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -285,7 +278,6 @@ public static com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesRequest p
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -293,7 +285,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -322,7 +313,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AsyncBatchAnnotateFilesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AsyncBatchAnnotateFilesRequest_fieldAccessorTable
@@ -346,7 +336,6 @@ private void maybeForceBuilderInitialization() {
         getRequestsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (requestsBuilder_ == null) {
@@ -358,18 +347,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AsyncBatchAnnotateFilesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesRequest build() {
       com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -378,7 +364,6 @@ public com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesRequest build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesRequest buildPartial() {
       com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesRequest result = new com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesRequest(this);
       int from_bitField0_ = bitField0_;
@@ -395,39 +380,32 @@ public com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesRequest buildPar
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesRequest) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesRequest)other);
@@ -470,12 +448,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFil
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -806,13 +782,11 @@ public com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileRequest.Builder addReq
       }
       return requestsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -834,12 +808,11 @@ public static com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesRequest g
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AsyncBatchAnnotateFilesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AsyncBatchAnnotateFilesRequest(input, extensionRegistry);
+        return new AsyncBatchAnnotateFilesRequest(input, extensionRegistry);
     }
   };
 
@@ -852,7 +825,6 @@ public com.google.protobuf.Parser getParserForTy
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AsyncBatchAnnotateFilesResponse.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AsyncBatchAnnotateFilesResponse.java
index d729c87a2453..5d1de33307ad 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AsyncBatchAnnotateFilesResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/AsyncBatchAnnotateFilesResponse.java
@@ -33,9 +33,6 @@ private AsyncBatchAnnotateFilesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private AsyncBatchAnnotateFilesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               responses_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private AsyncBatchAnnotateFilesResponse(
                 input.readMessage(com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileResponse.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private AsyncBatchAnnotateFilesResponse(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AsyncBatchAnnotateFilesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AsyncBatchAnnotateFilesResponse_fieldAccessorTable
@@ -152,7 +148,6 @@ public com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileResponseOrBuilder getR
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -162,7 +157,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < responses_.size(); i++) {
@@ -171,7 +165,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -289,7 +282,6 @@ public static com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesResponse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -297,7 +289,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -325,7 +316,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AsyncBatchAnnotateFilesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AsyncBatchAnnotateFilesResponse_fieldAccessorTable
@@ -349,7 +339,6 @@ private void maybeForceBuilderInitialization() {
         getResponsesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (responsesBuilder_ == null) {
@@ -361,18 +350,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_AsyncBatchAnnotateFilesResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesResponse getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesResponse build() {
       com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -381,7 +367,6 @@ public com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesResponse build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesResponse buildPartial() {
       com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesResponse result = new com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -398,39 +383,32 @@ public com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesResponse buildPa
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesResponse) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesResponse)other);
@@ -473,12 +451,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFil
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -827,13 +803,11 @@ public com.google.cloud.vision.v1p3beta1.AsyncAnnotateFileResponse.Builder addRe
       }
       return responsesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -855,12 +829,11 @@ public static com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesResponse
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public AsyncBatchAnnotateFilesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new AsyncBatchAnnotateFilesResponse(input, extensionRegistry);
+        return new AsyncBatchAnnotateFilesResponse(input, extensionRegistry);
     }
   };
 
@@ -873,7 +846,6 @@ public com.google.protobuf.Parser getParserForT
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.AsyncBatchAnnotateFilesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/BatchAnnotateImagesRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/BatchAnnotateImagesRequest.java
index 3c19cdc608a8..071582876744 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/BatchAnnotateImagesRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/BatchAnnotateImagesRequest.java
@@ -33,9 +33,6 @@ private BatchAnnotateImagesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private BatchAnnotateImagesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               requests_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private BatchAnnotateImagesRequest(
                 input.readMessage(com.google.cloud.vision.v1p3beta1.AnnotateImageRequest.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private BatchAnnotateImagesRequest(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_BatchAnnotateImagesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_BatchAnnotateImagesRequest_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.cloud.vision.v1p3beta1.AnnotateImageRequestOrBuilder getReques
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < requests_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesRequest parse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_BatchAnnotateImagesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_BatchAnnotateImagesRequest_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getRequestsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (requestsBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_BatchAnnotateImagesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesRequest build() {
       com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesRequest buildPartial() {
       com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesRequest result = new com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesRequest(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesRequest buildPartial
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesRequest) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesRequest)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesRe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.cloud.vision.v1p3beta1.AnnotateImageRequest.Builder addRequest
       }
       return requestsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesRequest getDe
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BatchAnnotateImagesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchAnnotateImagesRequest(input, extensionRegistry);
+        return new BatchAnnotateImagesRequest(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/BatchAnnotateImagesResponse.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/BatchAnnotateImagesResponse.java
index f20066307034..217e6b2e65d0 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/BatchAnnotateImagesResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/BatchAnnotateImagesResponse.java
@@ -33,9 +33,6 @@ private BatchAnnotateImagesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private BatchAnnotateImagesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               responses_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private BatchAnnotateImagesResponse(
                 input.readMessage(com.google.cloud.vision.v1p3beta1.AnnotateImageResponse.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private BatchAnnotateImagesResponse(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_BatchAnnotateImagesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_BatchAnnotateImagesResponse_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.cloud.vision.v1p3beta1.AnnotateImageResponseOrBuilder getRespo
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < responses_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesResponse pars
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_BatchAnnotateImagesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_BatchAnnotateImagesResponse_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getResponsesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (responsesBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_BatchAnnotateImagesResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesResponse getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesResponse build() {
       com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesResponse buildPartial() {
       com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesResponse result = new com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesResponse buildPartia
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesResponse) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesResponse)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesRe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.cloud.vision.v1p3beta1.AnnotateImageResponse.Builder addRespon
       }
       return responsesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesResponse getD
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BatchAnnotateImagesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchAnnotateImagesResponse(input, extensionRegistry);
+        return new BatchAnnotateImagesResponse(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType(
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.BatchAnnotateImagesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/BatchOperationMetadata.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/BatchOperationMetadata.java
index b87c662f0a94..da1008f4c892 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/BatchOperationMetadata.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/BatchOperationMetadata.java
@@ -35,9 +35,6 @@ private BatchOperationMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private BatchOperationMetadata(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -81,13 +85,6 @@ private BatchOperationMetadata(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -105,7 +102,6 @@ private BatchOperationMetadata(
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_BatchOperationMetadata_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_BatchOperationMetadata_fieldAccessorTable
@@ -308,7 +304,6 @@ public int getStateValue() {
    * .google.cloud.vision.v1p3beta1.BatchOperationMetadata.State state = 1;
    */
   public com.google.cloud.vision.v1p3beta1.BatchOperationMetadata.State getState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p3beta1.BatchOperationMetadata.State result = com.google.cloud.vision.v1p3beta1.BatchOperationMetadata.State.valueOf(state_);
     return result == null ? com.google.cloud.vision.v1p3beta1.BatchOperationMetadata.State.UNRECOGNIZED : result;
   }
@@ -383,7 +378,6 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -393,7 +387,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (state_ != com.google.cloud.vision.v1p3beta1.BatchOperationMetadata.State.STATE_UNSPECIFIED.getNumber()) {
@@ -408,7 +401,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -549,7 +541,6 @@ public static com.google.cloud.vision.v1p3beta1.BatchOperationMetadata parseFrom
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -557,7 +548,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.BatchOperationMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -587,7 +577,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_BatchOperationMetadata_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_BatchOperationMetadata_fieldAccessorTable
@@ -610,7 +599,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       state_ = 0;
@@ -630,18 +618,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_BatchOperationMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.BatchOperationMetadata getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.BatchOperationMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.BatchOperationMetadata build() {
       com.google.cloud.vision.v1p3beta1.BatchOperationMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -650,7 +635,6 @@ public com.google.cloud.vision.v1p3beta1.BatchOperationMetadata build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.BatchOperationMetadata buildPartial() {
       com.google.cloud.vision.v1p3beta1.BatchOperationMetadata result = new com.google.cloud.vision.v1p3beta1.BatchOperationMetadata(this);
       result.state_ = state_;
@@ -668,39 +652,32 @@ public com.google.cloud.vision.v1p3beta1.BatchOperationMetadata buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.BatchOperationMetadata) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.BatchOperationMetadata)other);
@@ -726,12 +703,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.BatchOperationMetadat
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -781,7 +756,6 @@ public Builder setStateValue(int value) {
      * .google.cloud.vision.v1p3beta1.BatchOperationMetadata.State state = 1;
      */
     public com.google.cloud.vision.v1p3beta1.BatchOperationMetadata.State getState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p3beta1.BatchOperationMetadata.State result = com.google.cloud.vision.v1p3beta1.BatchOperationMetadata.State.valueOf(state_);
       return result == null ? com.google.cloud.vision.v1p3beta1.BatchOperationMetadata.State.UNRECOGNIZED : result;
     }
@@ -1129,13 +1103,11 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() {
       }
       return endTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1157,12 +1129,11 @@ public static com.google.cloud.vision.v1p3beta1.BatchOperationMetadata getDefaul
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BatchOperationMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BatchOperationMetadata(input, extensionRegistry);
+        return new BatchOperationMetadata(input, extensionRegistry);
     }
   };
 
@@ -1175,7 +1146,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.BatchOperationMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Block.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Block.java
index 6384d701a2a5..dff228acf8a9 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Block.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Block.java
@@ -35,9 +35,6 @@ private Block(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private Block(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p3beta1.TextAnnotation.TextProperty.Builder subBuilder = null;
             if (property_ != null) {
@@ -95,13 +99,6 @@ private Block(
             confidence_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -122,7 +119,6 @@ private Block(
     return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_Block_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_Block_fieldAccessorTable
@@ -500,7 +496,6 @@ public int getBlockTypeValue() {
    * .google.cloud.vision.v1p3beta1.Block.BlockType block_type = 4;
    */
   public com.google.cloud.vision.v1p3beta1.Block.BlockType getBlockType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p3beta1.Block.BlockType result = com.google.cloud.vision.v1p3beta1.Block.BlockType.valueOf(blockType_);
     return result == null ? com.google.cloud.vision.v1p3beta1.Block.BlockType.UNRECOGNIZED : result;
   }
@@ -519,7 +514,6 @@ public float getConfidence() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -529,7 +523,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (property_ != null) {
@@ -550,7 +543,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -712,7 +704,6 @@ public static com.google.cloud.vision.v1p3beta1.Block parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -720,7 +711,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.Block prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -748,7 +738,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_Block_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_Block_fieldAccessorTable
@@ -772,7 +761,6 @@ private void maybeForceBuilderInitialization() {
         getParagraphsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (propertyBuilder_ == null) {
@@ -800,18 +788,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_Block_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Block getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.Block.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Block build() {
       com.google.cloud.vision.v1p3beta1.Block result = buildPartial();
       if (!result.isInitialized()) {
@@ -820,7 +805,6 @@ public com.google.cloud.vision.v1p3beta1.Block build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Block buildPartial() {
       com.google.cloud.vision.v1p3beta1.Block result = new com.google.cloud.vision.v1p3beta1.Block(this);
       int from_bitField0_ = bitField0_;
@@ -851,39 +835,32 @@ public com.google.cloud.vision.v1p3beta1.Block buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.Block) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.Block)other);
@@ -938,12 +915,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.Block other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1738,7 +1713,6 @@ public Builder setBlockTypeValue(int value) {
      * .google.cloud.vision.v1p3beta1.Block.BlockType block_type = 4;
      */
     public com.google.cloud.vision.v1p3beta1.Block.BlockType getBlockType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p3beta1.Block.BlockType result = com.google.cloud.vision.v1p3beta1.Block.BlockType.valueOf(blockType_);
       return result == null ? com.google.cloud.vision.v1p3beta1.Block.BlockType.UNRECOGNIZED : result;
     }
@@ -1809,13 +1783,11 @@ public Builder clearConfidence() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1837,12 +1809,11 @@ public static com.google.cloud.vision.v1p3beta1.Block getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Block parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Block(input, extensionRegistry);
+        return new Block(input, extensionRegistry);
     }
   };
 
@@ -1855,7 +1826,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.Block getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/BoundingPoly.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/BoundingPoly.java
index cf2c49fba89f..22e591ae0247 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/BoundingPoly.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/BoundingPoly.java
@@ -34,9 +34,6 @@ private BoundingPoly(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private BoundingPoly(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               vertices_ = new java.util.ArrayList();
@@ -66,13 +70,6 @@ private BoundingPoly(
                 input.readMessage(com.google.cloud.vision.v1p3beta1.NormalizedVertex.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private BoundingPoly(
     return com.google.cloud.vision.v1p3beta1.GeometryProto.internal_static_google_cloud_vision_v1p3beta1_BoundingPoly_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.GeometryProto.internal_static_google_cloud_vision_v1p3beta1_BoundingPoly_fieldAccessorTable
@@ -215,7 +211,6 @@ public com.google.cloud.vision.v1p3beta1.NormalizedVertexOrBuilder getNormalized
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -225,7 +220,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < vertices_.size(); i++) {
@@ -237,7 +231,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -365,7 +358,6 @@ public static com.google.cloud.vision.v1p3beta1.BoundingPoly parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -373,7 +365,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.BoundingPoly prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -401,7 +392,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.GeometryProto.internal_static_google_cloud_vision_v1p3beta1_BoundingPoly_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.GeometryProto.internal_static_google_cloud_vision_v1p3beta1_BoundingPoly_fieldAccessorTable
@@ -426,7 +416,6 @@ private void maybeForceBuilderInitialization() {
         getNormalizedVerticesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (verticesBuilder_ == null) {
@@ -444,18 +433,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.GeometryProto.internal_static_google_cloud_vision_v1p3beta1_BoundingPoly_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.BoundingPoly getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.BoundingPoly.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.BoundingPoly build() {
       com.google.cloud.vision.v1p3beta1.BoundingPoly result = buildPartial();
       if (!result.isInitialized()) {
@@ -464,7 +450,6 @@ public com.google.cloud.vision.v1p3beta1.BoundingPoly build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.BoundingPoly buildPartial() {
       com.google.cloud.vision.v1p3beta1.BoundingPoly result = new com.google.cloud.vision.v1p3beta1.BoundingPoly(this);
       int from_bitField0_ = bitField0_;
@@ -490,39 +475,32 @@ public com.google.cloud.vision.v1p3beta1.BoundingPoly buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.BoundingPoly) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.BoundingPoly)other);
@@ -591,12 +569,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.BoundingPoly other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1239,13 +1215,11 @@ public com.google.cloud.vision.v1p3beta1.NormalizedVertex.Builder addNormalizedV
       }
       return normalizedVerticesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1267,12 +1241,11 @@ public static com.google.cloud.vision.v1p3beta1.BoundingPoly getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public BoundingPoly parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new BoundingPoly(input, extensionRegistry);
+        return new BoundingPoly(input, extensionRegistry);
     }
   };
 
@@ -1285,7 +1258,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.BoundingPoly getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ColorInfo.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ColorInfo.java
index c2a4bb0ffa5e..09dcf7213643 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ColorInfo.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ColorInfo.java
@@ -35,9 +35,6 @@ private ColorInfo(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ColorInfo(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.type.Color.Builder subBuilder = null;
             if (color_ != null) {
@@ -72,13 +76,6 @@ private ColorInfo(
             pixelFraction_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private ColorInfo(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_ColorInfo_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_ColorInfo_fieldAccessorTable
@@ -165,7 +161,6 @@ public float getPixelFraction() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -175,7 +170,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (color_ != null) {
@@ -190,7 +184,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -333,7 +326,6 @@ public static com.google.cloud.vision.v1p3beta1.ColorInfo parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -341,7 +333,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.ColorInfo prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -370,7 +361,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_ColorInfo_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_ColorInfo_fieldAccessorTable
@@ -393,7 +383,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (colorBuilder_ == null) {
@@ -409,18 +398,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_ColorInfo_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ColorInfo getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.ColorInfo.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ColorInfo build() {
       com.google.cloud.vision.v1p3beta1.ColorInfo result = buildPartial();
       if (!result.isInitialized()) {
@@ -429,7 +415,6 @@ public com.google.cloud.vision.v1p3beta1.ColorInfo build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ColorInfo buildPartial() {
       com.google.cloud.vision.v1p3beta1.ColorInfo result = new com.google.cloud.vision.v1p3beta1.ColorInfo(this);
       if (colorBuilder_ == null) {
@@ -443,39 +428,32 @@ public com.google.cloud.vision.v1p3beta1.ColorInfo buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.ColorInfo) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.ColorInfo)other);
@@ -501,12 +479,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.ColorInfo other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -756,13 +732,11 @@ public Builder clearPixelFraction() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -784,12 +758,11 @@ public static com.google.cloud.vision.v1p3beta1.ColorInfo getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ColorInfo parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ColorInfo(input, extensionRegistry);
+        return new ColorInfo(input, extensionRegistry);
     }
   };
 
@@ -802,7 +775,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.ColorInfo getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/CreateProductRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/CreateProductRequest.java
index 7b686112b30c..a6455f622e28 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/CreateProductRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/CreateProductRequest.java
@@ -34,9 +34,6 @@ private CreateProductRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private CreateProductRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private CreateProductRequest(
             productId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private CreateProductRequest(
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_CreateProductRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_CreateProductRequest_fieldAccessorTable
@@ -233,7 +229,6 @@ public java.lang.String getProductId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -243,7 +238,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -258,7 +252,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -393,7 +386,6 @@ public static com.google.cloud.vision.v1p3beta1.CreateProductRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -401,7 +393,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.CreateProductRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -429,7 +420,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_CreateProductRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_CreateProductRequest_fieldAccessorTable
@@ -452,7 +442,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -468,18 +457,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_CreateProductRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.CreateProductRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.CreateProductRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.CreateProductRequest build() {
       com.google.cloud.vision.v1p3beta1.CreateProductRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -488,7 +474,6 @@ public com.google.cloud.vision.v1p3beta1.CreateProductRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.CreateProductRequest buildPartial() {
       com.google.cloud.vision.v1p3beta1.CreateProductRequest result = new com.google.cloud.vision.v1p3beta1.CreateProductRequest(this);
       result.parent_ = parent_;
@@ -502,39 +487,32 @@ public com.google.cloud.vision.v1p3beta1.CreateProductRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.CreateProductRequest) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.CreateProductRequest)other);
@@ -562,12 +540,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.CreateProductRequest
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -941,13 +917,11 @@ public Builder setProductIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -969,12 +943,11 @@ public static com.google.cloud.vision.v1p3beta1.CreateProductRequest getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateProductRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateProductRequest(input, extensionRegistry);
+        return new CreateProductRequest(input, extensionRegistry);
     }
   };
 
@@ -987,7 +960,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.CreateProductRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/CreateProductSetRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/CreateProductSetRequest.java
index 6a083538ba15..c35422ef8043 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/CreateProductSetRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/CreateProductSetRequest.java
@@ -34,9 +34,6 @@ private CreateProductSetRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private CreateProductSetRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private CreateProductSetRequest(
             productSetId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private CreateProductSetRequest(
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_CreateProductSetRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_CreateProductSetRequest_fieldAccessorTable
@@ -231,7 +227,6 @@ public java.lang.String getProductSetId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -241,7 +236,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -256,7 +250,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -391,7 +384,6 @@ public static com.google.cloud.vision.v1p3beta1.CreateProductSetRequest parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -399,7 +391,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.CreateProductSetRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -427,7 +418,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_CreateProductSetRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_CreateProductSetRequest_fieldAccessorTable
@@ -450,7 +440,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -466,18 +455,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_CreateProductSetRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.CreateProductSetRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.CreateProductSetRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.CreateProductSetRequest build() {
       com.google.cloud.vision.v1p3beta1.CreateProductSetRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -486,7 +472,6 @@ public com.google.cloud.vision.v1p3beta1.CreateProductSetRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.CreateProductSetRequest buildPartial() {
       com.google.cloud.vision.v1p3beta1.CreateProductSetRequest result = new com.google.cloud.vision.v1p3beta1.CreateProductSetRequest(this);
       result.parent_ = parent_;
@@ -500,39 +485,32 @@ public com.google.cloud.vision.v1p3beta1.CreateProductSetRequest buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.CreateProductSetRequest) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.CreateProductSetRequest)other);
@@ -560,12 +538,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.CreateProductSetReque
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -934,13 +910,11 @@ public Builder setProductSetIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -962,12 +936,11 @@ public static com.google.cloud.vision.v1p3beta1.CreateProductSetRequest getDefau
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateProductSetRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateProductSetRequest(input, extensionRegistry);
+        return new CreateProductSetRequest(input, extensionRegistry);
     }
   };
 
@@ -980,7 +953,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.CreateProductSetRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/CreateReferenceImageRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/CreateReferenceImageRequest.java
index b52c8ee13eb0..85bd702d2870 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/CreateReferenceImageRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/CreateReferenceImageRequest.java
@@ -34,9 +34,6 @@ private CreateReferenceImageRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private CreateReferenceImageRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private CreateReferenceImageRequest(
             referenceImageId_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private CreateReferenceImageRequest(
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_CreateReferenceImageRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_CreateReferenceImageRequest_fieldAccessorTable
@@ -236,7 +232,6 @@ public java.lang.String getReferenceImageId() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -246,7 +241,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -261,7 +255,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -396,7 +389,6 @@ public static com.google.cloud.vision.v1p3beta1.CreateReferenceImageRequest pars
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -404,7 +396,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.CreateReferenceImageRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -432,7 +423,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_CreateReferenceImageRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_CreateReferenceImageRequest_fieldAccessorTable
@@ -455,7 +445,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -471,18 +460,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_CreateReferenceImageRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.CreateReferenceImageRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.CreateReferenceImageRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.CreateReferenceImageRequest build() {
       com.google.cloud.vision.v1p3beta1.CreateReferenceImageRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -491,7 +477,6 @@ public com.google.cloud.vision.v1p3beta1.CreateReferenceImageRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.CreateReferenceImageRequest buildPartial() {
       com.google.cloud.vision.v1p3beta1.CreateReferenceImageRequest result = new com.google.cloud.vision.v1p3beta1.CreateReferenceImageRequest(this);
       result.parent_ = parent_;
@@ -505,39 +490,32 @@ public com.google.cloud.vision.v1p3beta1.CreateReferenceImageRequest buildPartia
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.CreateReferenceImageRequest) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.CreateReferenceImageRequest)other);
@@ -565,12 +543,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.CreateReferenceImageR
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -953,13 +929,11 @@ public Builder setReferenceImageIdBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -981,12 +955,11 @@ public static com.google.cloud.vision.v1p3beta1.CreateReferenceImageRequest getD
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateReferenceImageRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateReferenceImageRequest(input, extensionRegistry);
+        return new CreateReferenceImageRequest(input, extensionRegistry);
     }
   };
 
@@ -999,7 +972,6 @@ public com.google.protobuf.Parser getParserForType(
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.CreateReferenceImageRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/CropHint.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/CropHint.java
index 96a04741a48a..b0e041cfdf1c 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/CropHint.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/CropHint.java
@@ -34,9 +34,6 @@ private CropHint(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private CropHint(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p3beta1.BoundingPoly.Builder subBuilder = null;
             if (boundingPoly_ != null) {
@@ -71,13 +75,6 @@ private CropHint(
             importanceFraction_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -95,7 +92,6 @@ private CropHint(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_CropHint_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_CropHint_fieldAccessorTable
@@ -167,7 +163,6 @@ public float getImportanceFraction() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -177,7 +172,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (boundingPoly_ != null) {
@@ -192,7 +186,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -335,7 +328,6 @@ public static com.google.cloud.vision.v1p3beta1.CropHint parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -343,7 +335,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.CropHint prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -371,7 +362,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_CropHint_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_CropHint_fieldAccessorTable
@@ -394,7 +384,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (boundingPolyBuilder_ == null) {
@@ -410,18 +399,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_CropHint_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.CropHint getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.CropHint.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.CropHint build() {
       com.google.cloud.vision.v1p3beta1.CropHint result = buildPartial();
       if (!result.isInitialized()) {
@@ -430,7 +416,6 @@ public com.google.cloud.vision.v1p3beta1.CropHint build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.CropHint buildPartial() {
       com.google.cloud.vision.v1p3beta1.CropHint result = new com.google.cloud.vision.v1p3beta1.CropHint(this);
       if (boundingPolyBuilder_ == null) {
@@ -444,39 +429,32 @@ public com.google.cloud.vision.v1p3beta1.CropHint buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.CropHint) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.CropHint)other);
@@ -502,12 +480,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.CropHint other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -766,13 +742,11 @@ public Builder clearImportanceFraction() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -794,12 +768,11 @@ public static com.google.cloud.vision.v1p3beta1.CropHint getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CropHint parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CropHint(input, extensionRegistry);
+        return new CropHint(input, extensionRegistry);
     }
   };
 
@@ -812,7 +785,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.CropHint getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/CropHintsAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/CropHintsAnnotation.java
index cc5e55e93d08..9fd120856220 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/CropHintsAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/CropHintsAnnotation.java
@@ -33,9 +33,6 @@ private CropHintsAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private CropHintsAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               cropHints_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private CropHintsAnnotation(
                 input.readMessage(com.google.cloud.vision.v1p3beta1.CropHint.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private CropHintsAnnotation(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_CropHintsAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_CropHintsAnnotation_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.cloud.vision.v1p3beta1.CropHintOrBuilder getCropHintsOrBuilder
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < cropHints_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.vision.v1p3beta1.CropHintsAnnotation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.CropHintsAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_CropHintsAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_CropHintsAnnotation_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getCropHintsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (cropHintsBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_CropHintsAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.CropHintsAnnotation getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.CropHintsAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.CropHintsAnnotation build() {
       com.google.cloud.vision.v1p3beta1.CropHintsAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.cloud.vision.v1p3beta1.CropHintsAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.CropHintsAnnotation buildPartial() {
       com.google.cloud.vision.v1p3beta1.CropHintsAnnotation result = new com.google.cloud.vision.v1p3beta1.CropHintsAnnotation(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.cloud.vision.v1p3beta1.CropHintsAnnotation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.CropHintsAnnotation) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.CropHintsAnnotation)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.CropHintsAnnotation o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.cloud.vision.v1p3beta1.CropHint.Builder addCropHintsBuilder(
       }
       return cropHintsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.cloud.vision.v1p3beta1.CropHintsAnnotation getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CropHintsAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CropHintsAnnotation(input, extensionRegistry);
+        return new CropHintsAnnotation(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.CropHintsAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/CropHintsParams.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/CropHintsParams.java
index b0cbbbada699..a6c19d818da3 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/CropHintsParams.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/CropHintsParams.java
@@ -33,9 +33,6 @@ private CropHintsParams(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private CropHintsParams(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 13: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               aspectRatios_ = new java.util.ArrayList();
@@ -68,13 +72,6 @@ private CropHintsParams(
             input.popLimit(limit);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -95,7 +92,6 @@ private CropHintsParams(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_CropHintsParams_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_CropHintsParams_fieldAccessorTable
@@ -154,7 +150,6 @@ public float getAspectRatios(int index) {
   private int aspectRatiosMemoizedSerializedSize = -1;
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -164,7 +159,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     getSerializedSize();
@@ -178,7 +172,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -303,7 +296,6 @@ public static com.google.cloud.vision.v1p3beta1.CropHintsParams parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -311,7 +303,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.CropHintsParams prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -339,7 +330,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_CropHintsParams_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_CropHintsParams_fieldAccessorTable
@@ -362,7 +352,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       aspectRatios_ = java.util.Collections.emptyList();
@@ -370,18 +359,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_CropHintsParams_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.CropHintsParams getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.CropHintsParams.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.CropHintsParams build() {
       com.google.cloud.vision.v1p3beta1.CropHintsParams result = buildPartial();
       if (!result.isInitialized()) {
@@ -390,7 +376,6 @@ public com.google.cloud.vision.v1p3beta1.CropHintsParams build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.CropHintsParams buildPartial() {
       com.google.cloud.vision.v1p3beta1.CropHintsParams result = new com.google.cloud.vision.v1p3beta1.CropHintsParams(this);
       int from_bitField0_ = bitField0_;
@@ -403,39 +388,32 @@ public com.google.cloud.vision.v1p3beta1.CropHintsParams buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.CropHintsParams) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.CropHintsParams)other);
@@ -462,12 +440,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.CropHintsParams other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -615,13 +591,11 @@ public Builder clearAspectRatios() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -643,12 +617,11 @@ public static com.google.cloud.vision.v1p3beta1.CropHintsParams getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CropHintsParams parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CropHintsParams(input, extensionRegistry);
+        return new CropHintsParams(input, extensionRegistry);
     }
   };
 
@@ -661,7 +634,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.CropHintsParams getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/DeleteProductRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/DeleteProductRequest.java
index e34d5f1119d1..58a59d4925ba 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/DeleteProductRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/DeleteProductRequest.java
@@ -33,9 +33,6 @@ private DeleteProductRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteProductRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteProductRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteProductRequest(
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_DeleteProductRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_DeleteProductRequest_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.vision.v1p3beta1.DeleteProductRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.DeleteProductRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_DeleteProductRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_DeleteProductRequest_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_DeleteProductRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.DeleteProductRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.DeleteProductRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.DeleteProductRequest build() {
       com.google.cloud.vision.v1p3beta1.DeleteProductRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.vision.v1p3beta1.DeleteProductRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.DeleteProductRequest buildPartial() {
       com.google.cloud.vision.v1p3beta1.DeleteProductRequest result = new com.google.cloud.vision.v1p3beta1.DeleteProductRequest(this);
       result.name_ = name_;
@@ -361,39 +346,32 @@ public com.google.cloud.vision.v1p3beta1.DeleteProductRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.DeleteProductRequest) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.DeleteProductRequest)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.DeleteProductRequest
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.vision.v1p3beta1.DeleteProductRequest getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteProductRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteProductRequest(input, extensionRegistry);
+        return new DeleteProductRequest(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.DeleteProductRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/DeleteProductSetRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/DeleteProductSetRequest.java
index 22d05bb66bcb..79e7ce8301ac 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/DeleteProductSetRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/DeleteProductSetRequest.java
@@ -33,9 +33,6 @@ private DeleteProductSetRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteProductSetRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteProductSetRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteProductSetRequest(
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_DeleteProductSetRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_DeleteProductSetRequest_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.vision.v1p3beta1.DeleteProductSetRequest parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.DeleteProductSetRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_DeleteProductSetRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_DeleteProductSetRequest_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_DeleteProductSetRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.DeleteProductSetRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.DeleteProductSetRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.DeleteProductSetRequest build() {
       com.google.cloud.vision.v1p3beta1.DeleteProductSetRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.vision.v1p3beta1.DeleteProductSetRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.DeleteProductSetRequest buildPartial() {
       com.google.cloud.vision.v1p3beta1.DeleteProductSetRequest result = new com.google.cloud.vision.v1p3beta1.DeleteProductSetRequest(this);
       result.name_ = name_;
@@ -361,39 +346,32 @@ public com.google.cloud.vision.v1p3beta1.DeleteProductSetRequest buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.DeleteProductSetRequest) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.DeleteProductSetRequest)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.DeleteProductSetReque
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.vision.v1p3beta1.DeleteProductSetRequest getDefau
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteProductSetRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteProductSetRequest(input, extensionRegistry);
+        return new DeleteProductSetRequest(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.DeleteProductSetRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/DeleteReferenceImageRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/DeleteReferenceImageRequest.java
index d4bdf71173e6..1a5c98a5fd1c 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/DeleteReferenceImageRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/DeleteReferenceImageRequest.java
@@ -33,9 +33,6 @@ private DeleteReferenceImageRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteReferenceImageRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteReferenceImageRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteReferenceImageRequest(
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_DeleteReferenceImageRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_DeleteReferenceImageRequest_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.vision.v1p3beta1.DeleteReferenceImageRequest pars
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.DeleteReferenceImageRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_DeleteReferenceImageRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_DeleteReferenceImageRequest_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_DeleteReferenceImageRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.DeleteReferenceImageRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.DeleteReferenceImageRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.DeleteReferenceImageRequest build() {
       com.google.cloud.vision.v1p3beta1.DeleteReferenceImageRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.vision.v1p3beta1.DeleteReferenceImageRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.DeleteReferenceImageRequest buildPartial() {
       com.google.cloud.vision.v1p3beta1.DeleteReferenceImageRequest result = new com.google.cloud.vision.v1p3beta1.DeleteReferenceImageRequest(this);
       result.name_ = name_;
@@ -361,39 +346,32 @@ public com.google.cloud.vision.v1p3beta1.DeleteReferenceImageRequest buildPartia
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.DeleteReferenceImageRequest) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.DeleteReferenceImageRequest)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.DeleteReferenceImageR
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.vision.v1p3beta1.DeleteReferenceImageRequest getD
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteReferenceImageRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteReferenceImageRequest(input, extensionRegistry);
+        return new DeleteReferenceImageRequest(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType(
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.DeleteReferenceImageRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/DominantColorsAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/DominantColorsAnnotation.java
index 8fd50214527d..cc4ca20a5ad0 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/DominantColorsAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/DominantColorsAnnotation.java
@@ -33,9 +33,6 @@ private DominantColorsAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private DominantColorsAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               colors_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private DominantColorsAnnotation(
                 input.readMessage(com.google.cloud.vision.v1p3beta1.ColorInfo.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private DominantColorsAnnotation(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_DominantColorsAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_DominantColorsAnnotation_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.cloud.vision.v1p3beta1.ColorInfoOrBuilder getColorsOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < colors_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.vision.v1p3beta1.DominantColorsAnnotation parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.DominantColorsAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_DominantColorsAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_DominantColorsAnnotation_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getColorsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (colorsBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_DominantColorsAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.DominantColorsAnnotation getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.DominantColorsAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.DominantColorsAnnotation build() {
       com.google.cloud.vision.v1p3beta1.DominantColorsAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.cloud.vision.v1p3beta1.DominantColorsAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.DominantColorsAnnotation buildPartial() {
       com.google.cloud.vision.v1p3beta1.DominantColorsAnnotation result = new com.google.cloud.vision.v1p3beta1.DominantColorsAnnotation(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.cloud.vision.v1p3beta1.DominantColorsAnnotation buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.DominantColorsAnnotation) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.DominantColorsAnnotation)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.DominantColorsAnnotat
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.cloud.vision.v1p3beta1.ColorInfo.Builder addColorsBuilder(
       }
       return colorsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.cloud.vision.v1p3beta1.DominantColorsAnnotation getDefa
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DominantColorsAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DominantColorsAnnotation(input, extensionRegistry);
+        return new DominantColorsAnnotation(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.DominantColorsAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/EntityAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/EntityAnnotation.java
index b3bd713dabce..f5ee5f01c4c9 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/EntityAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/EntityAnnotation.java
@@ -40,9 +40,6 @@ private EntityAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -54,6 +51,13 @@ private EntityAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -118,13 +122,6 @@ private EntityAnnotation(
                 input.readMessage(com.google.cloud.vision.v1p3beta1.Property.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -148,7 +145,6 @@ private EntityAnnotation(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_EntityAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_EntityAnnotation_fieldAccessorTable
@@ -508,7 +504,6 @@ public com.google.cloud.vision.v1p3beta1.PropertyOrBuilder getPropertiesOrBuilde
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -518,7 +513,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getMidBytes().isEmpty()) {
@@ -551,7 +545,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -746,7 +739,6 @@ public static com.google.cloud.vision.v1p3beta1.EntityAnnotation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -754,7 +746,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.EntityAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -782,7 +773,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_EntityAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_EntityAnnotation_fieldAccessorTable
@@ -807,7 +797,6 @@ private void maybeForceBuilderInitialization() {
         getPropertiesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       mid_ = "";
@@ -843,18 +832,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_EntityAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.EntityAnnotation getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.EntityAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.EntityAnnotation build() {
       com.google.cloud.vision.v1p3beta1.EntityAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -863,7 +849,6 @@ public com.google.cloud.vision.v1p3beta1.EntityAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.EntityAnnotation buildPartial() {
       com.google.cloud.vision.v1p3beta1.EntityAnnotation result = new com.google.cloud.vision.v1p3beta1.EntityAnnotation(this);
       int from_bitField0_ = bitField0_;
@@ -902,39 +887,32 @@ public com.google.cloud.vision.v1p3beta1.EntityAnnotation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.EntityAnnotation) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.EntityAnnotation)other);
@@ -1027,12 +1005,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.EntityAnnotation othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2347,13 +2323,11 @@ public com.google.cloud.vision.v1p3beta1.Property.Builder addPropertiesBuilder(
       }
       return propertiesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2375,12 +2349,11 @@ public static com.google.cloud.vision.v1p3beta1.EntityAnnotation getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public EntityAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new EntityAnnotation(input, extensionRegistry);
+        return new EntityAnnotation(input, extensionRegistry);
     }
   };
 
@@ -2393,7 +2366,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.EntityAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/FaceAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/FaceAnnotation.java
index bb392442e1ff..4802e3d2f16a 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/FaceAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/FaceAnnotation.java
@@ -45,9 +45,6 @@ private FaceAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -59,6 +56,13 @@ private FaceAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p3beta1.BoundingPoly.Builder subBuilder = null;
             if (boundingPoly_ != null) {
@@ -161,13 +165,6 @@ private FaceAnnotation(
             headwearLikelihood_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -188,7 +185,6 @@ private FaceAnnotation(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_FaceAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_FaceAnnotation_fieldAccessorTable
@@ -272,9 +268,6 @@ private Landmark(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -286,6 +279,13 @@ private Landmark(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 24: {
               int rawValue = input.readEnum();
 
@@ -305,13 +305,6 @@ private Landmark(
 
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -329,7 +322,6 @@ private Landmark(
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_FaceAnnotation_Landmark_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_FaceAnnotation_Landmark_fieldAccessorTable
@@ -1039,7 +1031,6 @@ public int getTypeValue() {
      * .google.cloud.vision.v1p3beta1.FaceAnnotation.Landmark.Type type = 3;
      */
     public com.google.cloud.vision.v1p3beta1.FaceAnnotation.Landmark.Type getType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p3beta1.FaceAnnotation.Landmark.Type result = com.google.cloud.vision.v1p3beta1.FaceAnnotation.Landmark.Type.valueOf(type_);
       return result == null ? com.google.cloud.vision.v1p3beta1.FaceAnnotation.Landmark.Type.UNRECOGNIZED : result;
     }
@@ -1078,7 +1069,6 @@ public com.google.cloud.vision.v1p3beta1.PositionOrBuilder getPositionOrBuilder(
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1088,7 +1078,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (type_ != com.google.cloud.vision.v1p3beta1.FaceAnnotation.Landmark.Type.UNKNOWN_LANDMARK.getNumber()) {
@@ -1100,7 +1089,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -1228,7 +1216,6 @@ public static com.google.cloud.vision.v1p3beta1.FaceAnnotation.Landmark parseFro
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -1236,7 +1223,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.FaceAnnotation.Landmark prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -1264,7 +1250,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_FaceAnnotation_Landmark_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_FaceAnnotation_Landmark_fieldAccessorTable
@@ -1287,7 +1272,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         type_ = 0;
@@ -1301,18 +1285,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_FaceAnnotation_Landmark_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.FaceAnnotation.Landmark getDefaultInstanceForType() {
         return com.google.cloud.vision.v1p3beta1.FaceAnnotation.Landmark.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.FaceAnnotation.Landmark build() {
         com.google.cloud.vision.v1p3beta1.FaceAnnotation.Landmark result = buildPartial();
         if (!result.isInitialized()) {
@@ -1321,7 +1302,6 @@ public com.google.cloud.vision.v1p3beta1.FaceAnnotation.Landmark build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.FaceAnnotation.Landmark buildPartial() {
         com.google.cloud.vision.v1p3beta1.FaceAnnotation.Landmark result = new com.google.cloud.vision.v1p3beta1.FaceAnnotation.Landmark(this);
         result.type_ = type_;
@@ -1334,39 +1314,32 @@ public com.google.cloud.vision.v1p3beta1.FaceAnnotation.Landmark buildPartial()
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1p3beta1.FaceAnnotation.Landmark) {
           return mergeFrom((com.google.cloud.vision.v1p3beta1.FaceAnnotation.Landmark)other);
@@ -1389,12 +1362,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.FaceAnnotation.Landma
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1444,7 +1415,6 @@ public Builder setTypeValue(int value) {
        * .google.cloud.vision.v1p3beta1.FaceAnnotation.Landmark.Type type = 3;
        */
       public com.google.cloud.vision.v1p3beta1.FaceAnnotation.Landmark.Type getType() {
-        @SuppressWarnings("deprecation")
         com.google.cloud.vision.v1p3beta1.FaceAnnotation.Landmark.Type result = com.google.cloud.vision.v1p3beta1.FaceAnnotation.Landmark.Type.valueOf(type_);
         return result == null ? com.google.cloud.vision.v1p3beta1.FaceAnnotation.Landmark.Type.UNRECOGNIZED : result;
       }
@@ -1630,13 +1600,11 @@ public com.google.cloud.vision.v1p3beta1.PositionOrBuilder getPositionOrBuilder(
         }
         return positionBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1658,12 +1626,11 @@ public static com.google.cloud.vision.v1p3beta1.FaceAnnotation.Landmark getDefau
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Landmark parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Landmark(input, extensionRegistry);
+          return new Landmark(input, extensionRegistry);
       }
     };
 
@@ -1676,7 +1643,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.FaceAnnotation.Landmark getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1928,7 +1894,6 @@ public int getJoyLikelihoodValue() {
    * .google.cloud.vision.v1p3beta1.Likelihood joy_likelihood = 9;
    */
   public com.google.cloud.vision.v1p3beta1.Likelihood getJoyLikelihood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p3beta1.Likelihood result = com.google.cloud.vision.v1p3beta1.Likelihood.valueOf(joyLikelihood_);
     return result == null ? com.google.cloud.vision.v1p3beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -1953,7 +1918,6 @@ public int getSorrowLikelihoodValue() {
    * .google.cloud.vision.v1p3beta1.Likelihood sorrow_likelihood = 10;
    */
   public com.google.cloud.vision.v1p3beta1.Likelihood getSorrowLikelihood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p3beta1.Likelihood result = com.google.cloud.vision.v1p3beta1.Likelihood.valueOf(sorrowLikelihood_);
     return result == null ? com.google.cloud.vision.v1p3beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -1978,7 +1942,6 @@ public int getAngerLikelihoodValue() {
    * .google.cloud.vision.v1p3beta1.Likelihood anger_likelihood = 11;
    */
   public com.google.cloud.vision.v1p3beta1.Likelihood getAngerLikelihood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p3beta1.Likelihood result = com.google.cloud.vision.v1p3beta1.Likelihood.valueOf(angerLikelihood_);
     return result == null ? com.google.cloud.vision.v1p3beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -2003,7 +1966,6 @@ public int getSurpriseLikelihoodValue() {
    * .google.cloud.vision.v1p3beta1.Likelihood surprise_likelihood = 12;
    */
   public com.google.cloud.vision.v1p3beta1.Likelihood getSurpriseLikelihood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p3beta1.Likelihood result = com.google.cloud.vision.v1p3beta1.Likelihood.valueOf(surpriseLikelihood_);
     return result == null ? com.google.cloud.vision.v1p3beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -2028,7 +1990,6 @@ public int getUnderExposedLikelihoodValue() {
    * .google.cloud.vision.v1p3beta1.Likelihood under_exposed_likelihood = 13;
    */
   public com.google.cloud.vision.v1p3beta1.Likelihood getUnderExposedLikelihood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p3beta1.Likelihood result = com.google.cloud.vision.v1p3beta1.Likelihood.valueOf(underExposedLikelihood_);
     return result == null ? com.google.cloud.vision.v1p3beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -2053,7 +2014,6 @@ public int getBlurredLikelihoodValue() {
    * .google.cloud.vision.v1p3beta1.Likelihood blurred_likelihood = 14;
    */
   public com.google.cloud.vision.v1p3beta1.Likelihood getBlurredLikelihood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p3beta1.Likelihood result = com.google.cloud.vision.v1p3beta1.Likelihood.valueOf(blurredLikelihood_);
     return result == null ? com.google.cloud.vision.v1p3beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -2078,13 +2038,11 @@ public int getHeadwearLikelihoodValue() {
    * .google.cloud.vision.v1p3beta1.Likelihood headwear_likelihood = 15;
    */
   public com.google.cloud.vision.v1p3beta1.Likelihood getHeadwearLikelihood() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p3beta1.Likelihood result = com.google.cloud.vision.v1p3beta1.Likelihood.valueOf(headwearLikelihood_);
     return result == null ? com.google.cloud.vision.v1p3beta1.Likelihood.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -2094,7 +2052,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (boundingPoly_ != null) {
@@ -2145,7 +2102,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -2393,7 +2349,6 @@ public static com.google.cloud.vision.v1p3beta1.FaceAnnotation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -2401,7 +2356,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.FaceAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -2429,7 +2383,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_FaceAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_FaceAnnotation_fieldAccessorTable
@@ -2453,7 +2406,6 @@ private void maybeForceBuilderInitialization() {
         getLandmarksFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (boundingPolyBuilder_ == null) {
@@ -2501,18 +2453,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_FaceAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.FaceAnnotation getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.FaceAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.FaceAnnotation build() {
       com.google.cloud.vision.v1p3beta1.FaceAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -2521,7 +2470,6 @@ public com.google.cloud.vision.v1p3beta1.FaceAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.FaceAnnotation buildPartial() {
       com.google.cloud.vision.v1p3beta1.FaceAnnotation result = new com.google.cloud.vision.v1p3beta1.FaceAnnotation(this);
       int from_bitField0_ = bitField0_;
@@ -2562,39 +2510,32 @@ public com.google.cloud.vision.v1p3beta1.FaceAnnotation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.FaceAnnotation) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.FaceAnnotation)other);
@@ -2679,12 +2620,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.FaceAnnotation other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3657,7 +3596,6 @@ public Builder setJoyLikelihoodValue(int value) {
      * .google.cloud.vision.v1p3beta1.Likelihood joy_likelihood = 9;
      */
     public com.google.cloud.vision.v1p3beta1.Likelihood getJoyLikelihood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p3beta1.Likelihood result = com.google.cloud.vision.v1p3beta1.Likelihood.valueOf(joyLikelihood_);
       return result == null ? com.google.cloud.vision.v1p3beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -3722,7 +3660,6 @@ public Builder setSorrowLikelihoodValue(int value) {
      * .google.cloud.vision.v1p3beta1.Likelihood sorrow_likelihood = 10;
      */
     public com.google.cloud.vision.v1p3beta1.Likelihood getSorrowLikelihood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p3beta1.Likelihood result = com.google.cloud.vision.v1p3beta1.Likelihood.valueOf(sorrowLikelihood_);
       return result == null ? com.google.cloud.vision.v1p3beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -3787,7 +3724,6 @@ public Builder setAngerLikelihoodValue(int value) {
      * .google.cloud.vision.v1p3beta1.Likelihood anger_likelihood = 11;
      */
     public com.google.cloud.vision.v1p3beta1.Likelihood getAngerLikelihood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p3beta1.Likelihood result = com.google.cloud.vision.v1p3beta1.Likelihood.valueOf(angerLikelihood_);
       return result == null ? com.google.cloud.vision.v1p3beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -3852,7 +3788,6 @@ public Builder setSurpriseLikelihoodValue(int value) {
      * .google.cloud.vision.v1p3beta1.Likelihood surprise_likelihood = 12;
      */
     public com.google.cloud.vision.v1p3beta1.Likelihood getSurpriseLikelihood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p3beta1.Likelihood result = com.google.cloud.vision.v1p3beta1.Likelihood.valueOf(surpriseLikelihood_);
       return result == null ? com.google.cloud.vision.v1p3beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -3917,7 +3852,6 @@ public Builder setUnderExposedLikelihoodValue(int value) {
      * .google.cloud.vision.v1p3beta1.Likelihood under_exposed_likelihood = 13;
      */
     public com.google.cloud.vision.v1p3beta1.Likelihood getUnderExposedLikelihood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p3beta1.Likelihood result = com.google.cloud.vision.v1p3beta1.Likelihood.valueOf(underExposedLikelihood_);
       return result == null ? com.google.cloud.vision.v1p3beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -3982,7 +3916,6 @@ public Builder setBlurredLikelihoodValue(int value) {
      * .google.cloud.vision.v1p3beta1.Likelihood blurred_likelihood = 14;
      */
     public com.google.cloud.vision.v1p3beta1.Likelihood getBlurredLikelihood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p3beta1.Likelihood result = com.google.cloud.vision.v1p3beta1.Likelihood.valueOf(blurredLikelihood_);
       return result == null ? com.google.cloud.vision.v1p3beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -4047,7 +3980,6 @@ public Builder setHeadwearLikelihoodValue(int value) {
      * .google.cloud.vision.v1p3beta1.Likelihood headwear_likelihood = 15;
      */
     public com.google.cloud.vision.v1p3beta1.Likelihood getHeadwearLikelihood() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p3beta1.Likelihood result = com.google.cloud.vision.v1p3beta1.Likelihood.valueOf(headwearLikelihood_);
       return result == null ? com.google.cloud.vision.v1p3beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -4080,13 +4012,11 @@ public Builder clearHeadwearLikelihood() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -4108,12 +4038,11 @@ public static com.google.cloud.vision.v1p3beta1.FaceAnnotation getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public FaceAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FaceAnnotation(input, extensionRegistry);
+        return new FaceAnnotation(input, extensionRegistry);
     }
   };
 
@@ -4126,7 +4055,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.FaceAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Feature.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Feature.java
index 3adf22b93d80..115a4b755d9b 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Feature.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Feature.java
@@ -37,9 +37,6 @@ private Feature(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private Feature(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -68,13 +72,6 @@ private Feature(
             model_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -92,7 +89,6 @@ private Feature(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_Feature_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_Feature_fieldAccessorTable
@@ -435,7 +431,6 @@ public int getTypeValue() {
    * .google.cloud.vision.v1p3beta1.Feature.Type type = 1;
    */
   public com.google.cloud.vision.v1p3beta1.Feature.Type getType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p3beta1.Feature.Type result = com.google.cloud.vision.v1p3beta1.Feature.Type.valueOf(type_);
     return result == null ? com.google.cloud.vision.v1p3beta1.Feature.Type.UNRECOGNIZED : result;
   }
@@ -501,7 +496,6 @@ public java.lang.String getModel() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -511,7 +505,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (type_ != com.google.cloud.vision.v1p3beta1.Feature.Type.TYPE_UNSPECIFIED.getNumber()) {
@@ -526,7 +519,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -656,7 +648,6 @@ public static com.google.cloud.vision.v1p3beta1.Feature parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -664,7 +655,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.Feature prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -694,7 +684,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_Feature_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_Feature_fieldAccessorTable
@@ -717,7 +706,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       type_ = 0;
@@ -729,18 +717,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_Feature_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Feature getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.Feature.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Feature build() {
       com.google.cloud.vision.v1p3beta1.Feature result = buildPartial();
       if (!result.isInitialized()) {
@@ -749,7 +734,6 @@ public com.google.cloud.vision.v1p3beta1.Feature build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Feature buildPartial() {
       com.google.cloud.vision.v1p3beta1.Feature result = new com.google.cloud.vision.v1p3beta1.Feature(this);
       result.type_ = type_;
@@ -759,39 +743,32 @@ public com.google.cloud.vision.v1p3beta1.Feature buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.Feature) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.Feature)other);
@@ -818,12 +795,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.Feature other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -873,7 +848,6 @@ public Builder setTypeValue(int value) {
      * .google.cloud.vision.v1p3beta1.Feature.Type type = 1;
      */
     public com.google.cloud.vision.v1p3beta1.Feature.Type getType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p3beta1.Feature.Type result = com.google.cloud.vision.v1p3beta1.Feature.Type.valueOf(type_);
       return result == null ? com.google.cloud.vision.v1p3beta1.Feature.Type.UNRECOGNIZED : result;
     }
@@ -1046,13 +1020,11 @@ public Builder setModelBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1074,12 +1046,11 @@ public static com.google.cloud.vision.v1p3beta1.Feature getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Feature parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Feature(input, extensionRegistry);
+        return new Feature(input, extensionRegistry);
     }
   };
 
@@ -1092,7 +1063,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.Feature getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/GcsDestination.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/GcsDestination.java
index 17d2969b5df0..431048878034 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/GcsDestination.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/GcsDestination.java
@@ -33,9 +33,6 @@ private GcsDestination(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GcsDestination(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            uri_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GcsDestination(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            uri_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GcsDestination(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_GcsDestination_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_GcsDestination_fieldAccessorTable
@@ -150,7 +146,6 @@ public java.lang.String getUri() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -160,7 +155,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getUriBytes().isEmpty()) {
@@ -169,7 +163,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.vision.v1p3beta1.GcsDestination parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.GcsDestination prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_GcsDestination_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_GcsDestination_fieldAccessorTable
@@ -343,7 +333,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       uri_ = "";
@@ -351,18 +340,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_GcsDestination_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.GcsDestination getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.GcsDestination.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.GcsDestination build() {
       com.google.cloud.vision.v1p3beta1.GcsDestination result = buildPartial();
       if (!result.isInitialized()) {
@@ -371,7 +357,6 @@ public com.google.cloud.vision.v1p3beta1.GcsDestination build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.GcsDestination buildPartial() {
       com.google.cloud.vision.v1p3beta1.GcsDestination result = new com.google.cloud.vision.v1p3beta1.GcsDestination(this);
       result.uri_ = uri_;
@@ -379,39 +364,32 @@ public com.google.cloud.vision.v1p3beta1.GcsDestination buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.GcsDestination) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.GcsDestination)other);
@@ -432,12 +410,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.GcsDestination other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -599,13 +575,11 @@ public Builder setUriBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -627,12 +601,11 @@ public static com.google.cloud.vision.v1p3beta1.GcsDestination getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GcsDestination parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GcsDestination(input, extensionRegistry);
+        return new GcsDestination(input, extensionRegistry);
     }
   };
 
@@ -645,7 +618,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.GcsDestination getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/GcsSource.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/GcsSource.java
index f746ddc928e7..64681d4606d8 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/GcsSource.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/GcsSource.java
@@ -33,9 +33,6 @@ private GcsSource(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GcsSource(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            uri_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GcsSource(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            uri_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GcsSource(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_GcsSource_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_GcsSource_fieldAccessorTable
@@ -130,7 +126,6 @@ public java.lang.String getUri() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -140,7 +135,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getUriBytes().isEmpty()) {
@@ -149,7 +143,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.cloud.vision.v1p3beta1.GcsSource parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.GcsSource prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -300,7 +291,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_GcsSource_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_GcsSource_fieldAccessorTable
@@ -323,7 +313,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       uri_ = "";
@@ -331,18 +320,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_GcsSource_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.GcsSource getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.GcsSource.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.GcsSource build() {
       com.google.cloud.vision.v1p3beta1.GcsSource result = buildPartial();
       if (!result.isInitialized()) {
@@ -351,7 +337,6 @@ public com.google.cloud.vision.v1p3beta1.GcsSource build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.GcsSource buildPartial() {
       com.google.cloud.vision.v1p3beta1.GcsSource result = new com.google.cloud.vision.v1p3beta1.GcsSource(this);
       result.uri_ = uri_;
@@ -359,39 +344,32 @@ public com.google.cloud.vision.v1p3beta1.GcsSource buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.GcsSource) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.GcsSource)other);
@@ -412,12 +390,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.GcsSource other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -529,13 +505,11 @@ public Builder setUriBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -557,12 +531,11 @@ public static com.google.cloud.vision.v1p3beta1.GcsSource getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GcsSource parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GcsSource(input, extensionRegistry);
+        return new GcsSource(input, extensionRegistry);
     }
   };
 
@@ -575,7 +548,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.GcsSource getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/GeometryProto.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/GeometryProto.java
index 84827e1624a8..633aca0b40e7 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/GeometryProto.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/GeometryProto.java
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "1p3beta1.Vertex\022L\n\023normalized_vertices\030\002" +
       " \003(\0132/.google.cloud.vision.v1p3beta1.Nor" +
       "malizedVertex\"[\n\026NormalizedBoundingPoly\022" +
-      "A\n\010vertices\030\001 \003(\0132/.google.cloud.vision." +
+      "A\n\010vertices\030\001 \003(\0132/.google.cloud.vision.",
       "v1p3beta1.NormalizedVertex\"+\n\010Position\022\t" +
       "\n\001x\030\001 \001(\002\022\t\n\001y\030\002 \001(\002\022\t\n\001z\030\003 \001(\002B|\n!com.g" +
       "oogle.cloud.vision.v1p3beta1B\rGeometryPr" +
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/GetProductRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/GetProductRequest.java
index 7f43b6af4691..d48943e54cb6 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/GetProductRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/GetProductRequest.java
@@ -33,9 +33,6 @@ private GetProductRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetProductRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetProductRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetProductRequest(
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_GetProductRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_GetProductRequest_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.vision.v1p3beta1.GetProductRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.GetProductRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_GetProductRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_GetProductRequest_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_GetProductRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.GetProductRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.GetProductRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.GetProductRequest build() {
       com.google.cloud.vision.v1p3beta1.GetProductRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.vision.v1p3beta1.GetProductRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.GetProductRequest buildPartial() {
       com.google.cloud.vision.v1p3beta1.GetProductRequest result = new com.google.cloud.vision.v1p3beta1.GetProductRequest(this);
       result.name_ = name_;
@@ -361,39 +346,32 @@ public com.google.cloud.vision.v1p3beta1.GetProductRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.GetProductRequest) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.GetProductRequest)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.GetProductRequest oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.vision.v1p3beta1.GetProductRequest getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetProductRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetProductRequest(input, extensionRegistry);
+        return new GetProductRequest(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.GetProductRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/GetProductSetRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/GetProductSetRequest.java
index ac75bbc1415c..cfc2c7185779 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/GetProductSetRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/GetProductSetRequest.java
@@ -33,9 +33,6 @@ private GetProductSetRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetProductSetRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetProductSetRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetProductSetRequest(
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_GetProductSetRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_GetProductSetRequest_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.vision.v1p3beta1.GetProductSetRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.GetProductSetRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_GetProductSetRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_GetProductSetRequest_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_GetProductSetRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.GetProductSetRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.GetProductSetRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.GetProductSetRequest build() {
       com.google.cloud.vision.v1p3beta1.GetProductSetRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.vision.v1p3beta1.GetProductSetRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.GetProductSetRequest buildPartial() {
       com.google.cloud.vision.v1p3beta1.GetProductSetRequest result = new com.google.cloud.vision.v1p3beta1.GetProductSetRequest(this);
       result.name_ = name_;
@@ -361,39 +346,32 @@ public com.google.cloud.vision.v1p3beta1.GetProductSetRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.GetProductSetRequest) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.GetProductSetRequest)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.GetProductSetRequest
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.vision.v1p3beta1.GetProductSetRequest getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetProductSetRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetProductSetRequest(input, extensionRegistry);
+        return new GetProductSetRequest(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.GetProductSetRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/GetReferenceImageRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/GetReferenceImageRequest.java
index acc22309a062..a317d59df169 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/GetReferenceImageRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/GetReferenceImageRequest.java
@@ -33,9 +33,6 @@ private GetReferenceImageRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetReferenceImageRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetReferenceImageRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetReferenceImageRequest(
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_GetReferenceImageRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_GetReferenceImageRequest_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.vision.v1p3beta1.GetReferenceImageRequest parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.GetReferenceImageRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_GetReferenceImageRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_GetReferenceImageRequest_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_GetReferenceImageRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.GetReferenceImageRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.GetReferenceImageRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.GetReferenceImageRequest build() {
       com.google.cloud.vision.v1p3beta1.GetReferenceImageRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.vision.v1p3beta1.GetReferenceImageRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.GetReferenceImageRequest buildPartial() {
       com.google.cloud.vision.v1p3beta1.GetReferenceImageRequest result = new com.google.cloud.vision.v1p3beta1.GetReferenceImageRequest(this);
       result.name_ = name_;
@@ -361,39 +346,32 @@ public com.google.cloud.vision.v1p3beta1.GetReferenceImageRequest buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.GetReferenceImageRequest) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.GetReferenceImageRequest)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.GetReferenceImageRequ
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.vision.v1p3beta1.GetReferenceImageRequest getDefa
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetReferenceImageRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetReferenceImageRequest(input, extensionRegistry);
+        return new GetReferenceImageRequest(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.GetReferenceImageRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Image.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Image.java
index c4acb9abf8c5..4cead735985e 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Image.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Image.java
@@ -33,9 +33,6 @@ private Image(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private Image(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
 
             content_ = input.readBytes();
@@ -65,13 +69,6 @@ private Image(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -89,7 +86,6 @@ private Image(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_Image_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_Image_fieldAccessorTable
@@ -152,7 +148,6 @@ public com.google.cloud.vision.v1p3beta1.ImageSourceOrBuilder getSourceOrBuilder
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -162,7 +157,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!content_.isEmpty()) {
@@ -174,7 +168,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -303,7 +296,6 @@ public static com.google.cloud.vision.v1p3beta1.Image parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -311,7 +303,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.Image prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -339,7 +330,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_Image_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_Image_fieldAccessorTable
@@ -362,7 +352,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       content_ = com.google.protobuf.ByteString.EMPTY;
@@ -376,18 +365,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_Image_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Image getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.Image.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Image build() {
       com.google.cloud.vision.v1p3beta1.Image result = buildPartial();
       if (!result.isInitialized()) {
@@ -396,7 +382,6 @@ public com.google.cloud.vision.v1p3beta1.Image build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Image buildPartial() {
       com.google.cloud.vision.v1p3beta1.Image result = new com.google.cloud.vision.v1p3beta1.Image(this);
       result.content_ = content_;
@@ -409,39 +394,32 @@ public com.google.cloud.vision.v1p3beta1.Image buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.Image) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.Image)other);
@@ -464,12 +442,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.Image other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -705,13 +681,11 @@ public com.google.cloud.vision.v1p3beta1.ImageSourceOrBuilder getSourceOrBuilder
       }
       return sourceBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -733,12 +707,11 @@ public static com.google.cloud.vision.v1p3beta1.Image getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Image parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Image(input, extensionRegistry);
+        return new Image(input, extensionRegistry);
     }
   };
 
@@ -751,7 +724,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.Image getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImageAnnotationContext.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImageAnnotationContext.java
index 9a589f412dfc..e543ccaec2f1 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImageAnnotationContext.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImageAnnotationContext.java
@@ -35,9 +35,6 @@ private ImageAnnotationContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ImageAnnotationContext(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private ImageAnnotationContext(
             pageNumber_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private ImageAnnotationContext(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_ImageAnnotationContext_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_ImageAnnotationContext_fieldAccessorTable
@@ -149,7 +145,6 @@ public int getPageNumber() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -159,7 +154,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getUriBytes().isEmpty()) {
@@ -171,7 +165,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -294,7 +287,6 @@ public static com.google.cloud.vision.v1p3beta1.ImageAnnotationContext parseFrom
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -302,7 +294,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.ImageAnnotationContext prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -331,7 +322,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_ImageAnnotationContext_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_ImageAnnotationContext_fieldAccessorTable
@@ -354,7 +344,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       uri_ = "";
@@ -364,18 +353,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_ImageAnnotationContext_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ImageAnnotationContext getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotationContext.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ImageAnnotationContext build() {
       com.google.cloud.vision.v1p3beta1.ImageAnnotationContext result = buildPartial();
       if (!result.isInitialized()) {
@@ -384,7 +370,6 @@ public com.google.cloud.vision.v1p3beta1.ImageAnnotationContext build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ImageAnnotationContext buildPartial() {
       com.google.cloud.vision.v1p3beta1.ImageAnnotationContext result = new com.google.cloud.vision.v1p3beta1.ImageAnnotationContext(this);
       result.uri_ = uri_;
@@ -393,39 +378,32 @@ public com.google.cloud.vision.v1p3beta1.ImageAnnotationContext buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.ImageAnnotationContext) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.ImageAnnotationContext)other);
@@ -449,12 +427,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.ImageAnnotationContex
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -602,13 +578,11 @@ public Builder clearPageNumber() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -630,12 +604,11 @@ public static com.google.cloud.vision.v1p3beta1.ImageAnnotationContext getDefaul
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ImageAnnotationContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImageAnnotationContext(input, extensionRegistry);
+        return new ImageAnnotationContext(input, extensionRegistry);
     }
   };
 
@@ -648,7 +621,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.ImageAnnotationContext getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImageAnnotatorProto.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImageAnnotatorProto.java
index 6b6fd2536fa3..b527f7783424 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImageAnnotatorProto.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImageAnnotatorProto.java
@@ -202,7 +202,7 @@ public static void registerAllExtensions(
       "ta1/text_annotation.proto\0321google/cloud/" +
       "vision/v1p3beta1/web_detection.proto\032#go" +
       "ogle/longrunning/operations.proto\032\037googl" +
-      "e/protobuf/timestamp.proto\032\027google/rpc/s" +
+      "e/protobuf/timestamp.proto\032\027google/rpc/s",
       "tatus.proto\032\027google/type/color.proto\032\030go" +
       "ogle/type/latlng.proto\"\216\003\n\007Feature\0229\n\004ty" +
       "pe\030\001 \001(\0162+.google.cloud.vision.v1p3beta1" +
@@ -212,7 +212,7 @@ public static void registerAllExtensions(
       "ON\020\002\022\022\n\016LOGO_DETECTION\020\003\022\023\n\017LABEL_DETECT" +
       "ION\020\004\022\022\n\016TEXT_DETECTION\020\005\022\033\n\027DOCUMENT_TE" +
       "XT_DETECTION\020\013\022\031\n\025SAFE_SEARCH_DETECTION\020" +
-      "\006\022\024\n\020IMAGE_PROPERTIES\020\007\022\016\n\nCROP_HINTS\020\t\022" +
+      "\006\022\024\n\020IMAGE_PROPERTIES\020\007\022\016\n\nCROP_HINTS\020\t\022",
       "\021\n\rWEB_DETECTION\020\n\022\022\n\016PRODUCT_SEARCH\020\014\022\027" +
       "\n\023OBJECT_LOCALIZATION\020\023\"7\n\013ImageSource\022\025" +
       "\n\rgcs_image_uri\030\001 \001(\t\022\021\n\timage_uri\030\002 \001(\t" +
@@ -222,7 +222,7 @@ public static void registerAllExtensions(
       "ly\030\001 \001(\0132+.google.cloud.vision.v1p3beta1" +
       ".BoundingPoly\022E\n\020fd_bounding_poly\030\002 \001(\0132" +
       "+.google.cloud.vision.v1p3beta1.Bounding" +
-      "Poly\022I\n\tlandmarks\030\003 \003(\01326.google.cloud.v" +
+      "Poly\022I\n\tlandmarks\030\003 \003(\01326.google.cloud.v",
       "ision.v1p3beta1.FaceAnnotation.Landmark\022" +
       "\022\n\nroll_angle\030\004 \001(\002\022\021\n\tpan_angle\030\005 \001(\002\022\022" +
       "\n\ntilt_angle\030\006 \001(\002\022\034\n\024detection_confiden" +
@@ -232,7 +232,7 @@ public static void registerAllExtensions(
       "kelihood\030\n \001(\0162).google.cloud.vision.v1p" +
       "3beta1.Likelihood\022C\n\020anger_likelihood\030\013 " +
       "\001(\0162).google.cloud.vision.v1p3beta1.Like" +
-      "lihood\022F\n\023surprise_likelihood\030\014 \001(\0162).go" +
+      "lihood\022F\n\023surprise_likelihood\030\014 \001(\0162).go",
       "ogle.cloud.vision.v1p3beta1.Likelihood\022K" +
       "\n\030under_exposed_likelihood\030\r \001(\0162).googl" +
       "e.cloud.vision.v1p3beta1.Likelihood\022E\n\022b" +
@@ -242,7 +242,7 @@ public static void registerAllExtensions(
       "p3beta1.Likelihood\032\307\007\n\010Landmark\022I\n\004type\030" +
       "\003 \001(\0162;.google.cloud.vision.v1p3beta1.Fa" +
       "ceAnnotation.Landmark.Type\0229\n\010position\030\004" +
-      " \001(\0132\'.google.cloud.vision.v1p3beta1.Pos" +
+      " \001(\0132\'.google.cloud.vision.v1p3beta1.Pos",
       "ition\"\264\006\n\004Type\022\024\n\020UNKNOWN_LANDMARK\020\000\022\014\n\010" +
       "LEFT_EYE\020\001\022\r\n\tRIGHT_EYE\020\002\022\030\n\024LEFT_OF_LEF" +
       "T_EYEBROW\020\003\022\031\n\025RIGHT_OF_LEFT_EYEBROW\020\004\022\031" +
@@ -252,7 +252,7 @@ public static void registerAllExtensions(
       "IP\020\n\022\016\n\nMOUTH_LEFT\020\013\022\017\n\013MOUTH_RIGHT\020\014\022\020\n" +
       "\014MOUTH_CENTER\020\r\022\025\n\021NOSE_BOTTOM_RIGHT\020\016\022\024" +
       "\n\020NOSE_BOTTOM_LEFT\020\017\022\026\n\022NOSE_BOTTOM_CENT" +
-      "ER\020\020\022\031\n\025LEFT_EYE_TOP_BOUNDARY\020\021\022\031\n\025LEFT_" +
+      "ER\020\020\022\031\n\025LEFT_EYE_TOP_BOUNDARY\020\021\022\031\n\025LEFT_",
       "EYE_RIGHT_CORNER\020\022\022\034\n\030LEFT_EYE_BOTTOM_BO" +
       "UNDARY\020\023\022\030\n\024LEFT_EYE_LEFT_CORNER\020\024\022\032\n\026RI" +
       "GHT_EYE_TOP_BOUNDARY\020\025\022\032\n\026RIGHT_EYE_RIGH" +
@@ -262,7 +262,7 @@ public static void registerAllExtensions(
       "PPER_MIDPOINT\020\032\022\024\n\020LEFT_EAR_TRAGION\020\033\022\025\n" +
       "\021RIGHT_EAR_TRAGION\020\034\022\022\n\016LEFT_EYE_PUPIL\020\035" +
       "\022\023\n\017RIGHT_EYE_PUPIL\020\036\022\025\n\021FOREHEAD_GLABEL" +
-      "LA\020\037\022\021\n\rCHIN_GNATHION\020 \022\024\n\020CHIN_LEFT_GON" +
+      "LA\020\037\022\021\n\rCHIN_GNATHION\020 \022\024\n\020CHIN_LEFT_GON",
       "ION\020!\022\025\n\021CHIN_RIGHT_GONION\020\"\"4\n\014Location" +
       "Info\022$\n\007lat_lng\030\001 \001(\0132\023.google.type.LatL" +
       "ng\"=\n\010Property\022\014\n\004name\030\001 \001(\t\022\r\n\005value\030\002 " +
@@ -272,7 +272,7 @@ public static void registerAllExtensions(
       "dence\030\005 \001(\002\022\022\n\ntopicality\030\006 \001(\002\022B\n\rbound" +
       "ing_poly\030\007 \001(\0132+.google.cloud.vision.v1p" +
       "3beta1.BoundingPoly\022>\n\tlocations\030\010 \003(\0132+" +
-      ".google.cloud.vision.v1p3beta1.LocationI" +
+      ".google.cloud.vision.v1p3beta1.LocationI",
       "nfo\022;\n\nproperties\030\t \003(\0132\'.google.cloud.v" +
       "ision.v1p3beta1.Property\"\240\001\n\031LocalizedOb" +
       "jectAnnotation\022\013\n\003mid\030\001 \001(\t\022\025\n\rlanguage_" +
@@ -282,7 +282,7 @@ public static void registerAllExtensions(
       "chAnnotation\0228\n\005adult\030\001 \001(\0162).google.clo" +
       "ud.vision.v1p3beta1.Likelihood\0228\n\005spoof\030" +
       "\002 \001(\0162).google.cloud.vision.v1p3beta1.Li" +
-      "kelihood\022:\n\007medical\030\003 \001(\0162).google.cloud" +
+      "kelihood\022:\n\007medical\030\003 \001(\0162).google.cloud",
       ".vision.v1p3beta1.Likelihood\022;\n\010violence" +
       "\030\004 \001(\0162).google.cloud.vision.v1p3beta1.L" +
       "ikelihood\0227\n\004racy\030\t \001(\0162).google.cloud.v" +
@@ -292,7 +292,7 @@ public static void registerAllExtensions(
       "atLng\"U\n\tColorInfo\022!\n\005color\030\001 \001(\0132\022.goog" +
       "le.type.Color\022\r\n\005score\030\002 \001(\002\022\026\n\016pixel_fr" +
       "action\030\003 \001(\002\"T\n\030DominantColorsAnnotation" +
-      "\0228\n\006colors\030\001 \003(\0132(.google.cloud.vision.v" +
+      "\0228\n\006colors\030\001 \003(\0132(.google.cloud.vision.v",
       "1p3beta1.ColorInfo\"c\n\017ImageProperties\022P\n" +
       "\017dominant_colors\030\001 \001(\01327.google.cloud.vi" +
       "sion.v1p3beta1.DominantColorsAnnotation\"" +
@@ -302,7 +302,7 @@ public static void registerAllExtensions(
       "on\030\003 \001(\002\"R\n\023CropHintsAnnotation\022;\n\ncrop_" +
       "hints\030\001 \003(\0132\'.google.cloud.vision.v1p3be" +
       "ta1.CropHint\"(\n\017CropHintsParams\022\025\n\raspec" +
-      "t_ratios\030\001 \003(\002\"1\n\022WebDetectionParams\022\033\n\023" +
+      "t_ratios\030\001 \003(\002\"1\n\022WebDetectionParams\022\033\n\023",
       "include_geo_results\030\002 \001(\010\"\330\002\n\014ImageConte" +
       "xt\022A\n\rlat_long_rect\030\001 \001(\0132*.google.cloud" +
       ".vision.v1p3beta1.LatLongRect\022\026\n\016languag" +
@@ -312,7 +312,7 @@ public static void registerAllExtensions(
       "2.google.cloud.vision.v1p3beta1.ProductS" +
       "earchParams\022O\n\024web_detection_params\030\006 \001(" +
       "\01321.google.cloud.vision.v1p3beta1.WebDet" +
-      "ectionParams\"\311\001\n\024AnnotateImageRequest\0223\n" +
+      "ectionParams\"\311\001\n\024AnnotateImageRequest\0223\n",
       "\005image\030\001 \001(\0132$.google.cloud.vision.v1p3b" +
       "eta1.Image\0228\n\010features\030\002 \003(\0132&.google.cl" +
       "oud.vision.v1p3beta1.Feature\022B\n\rimage_co" +
@@ -322,7 +322,7 @@ public static void registerAllExtensions(
       "\025AnnotateImageResponse\022G\n\020face_annotatio" +
       "ns\030\001 \003(\0132-.google.cloud.vision.v1p3beta1" +
       ".FaceAnnotation\022M\n\024landmark_annotations\030" +
-      "\002 \003(\0132/.google.cloud.vision.v1p3beta1.En" +
+      "\002 \003(\0132/.google.cloud.vision.v1p3beta1.En",
       "tityAnnotation\022I\n\020logo_annotations\030\003 \003(\013" +
       "2/.google.cloud.vision.v1p3beta1.EntityA" +
       "nnotation\022J\n\021label_annotations\030\004 \003(\0132/.g" +
@@ -332,7 +332,7 @@ public static void registerAllExtensions(
       "lizedObjectAnnotation\022I\n\020text_annotation" +
       "s\030\005 \003(\0132/.google.cloud.vision.v1p3beta1." +
       "EntityAnnotation\022K\n\024full_text_annotation" +
-      "\030\014 \001(\0132-.google.cloud.vision.v1p3beta1.T" +
+      "\030\014 \001(\0132-.google.cloud.vision.v1p3beta1.T",
       "extAnnotation\022S\n\026safe_search_annotation\030" +
       "\006 \001(\01323.google.cloud.vision.v1p3beta1.Sa" +
       "feSearchAnnotation\022S\n\033image_properties_a" +
@@ -342,7 +342,7 @@ public static void registerAllExtensions(
       "3beta1.CropHintsAnnotation\022B\n\rweb_detect" +
       "ion\030\r \001(\0132+.google.cloud.vision.v1p3beta" +
       "1.WebDetection\022S\n\026product_search_results" +
-      "\030\016 \001(\01323.google.cloud.vision.v1p3beta1.P" +
+      "\030\016 \001(\01323.google.cloud.vision.v1p3beta1.P",
       "roductSearchResults\022!\n\005error\030\t \001(\0132\022.goo" +
       "gle.rpc.Status\022F\n\007context\030\025 \001(\01325.google" +
       ".cloud.vision.v1p3beta1.ImageAnnotationC" +
@@ -352,7 +352,7 @@ public static void registerAllExtensions(
       "oogle.cloud.vision.v1p3beta1.AnnotateIma" +
       "geResponse\"c\n\032BatchAnnotateImagesRequest" +
       "\022E\n\010requests\030\001 \003(\01323.google.cloud.vision" +
-      ".v1p3beta1.AnnotateImageRequest\"f\n\033Batch" +
+      ".v1p3beta1.AnnotateImageRequest\"f\n\033Batch",
       "AnnotateImagesResponse\022G\n\tresponses\030\001 \003(" +
       "\01324.google.cloud.vision.v1p3beta1.Annota" +
       "teImageResponse\"\236\002\n\030AsyncAnnotateFileReq" +
@@ -362,7 +362,7 @@ public static void registerAllExtensions(
       ".Feature\022B\n\rimage_context\030\003 \001(\0132+.google" +
       ".cloud.vision.v1p3beta1.ImageContext\022B\n\r" +
       "output_config\030\004 \001(\0132+.google.cloud.visio" +
-      "n.v1p3beta1.OutputConfig\"_\n\031AsyncAnnotat" +
+      "n.v1p3beta1.OutputConfig\"_\n\031AsyncAnnotat",
       "eFileResponse\022B\n\routput_config\030\001 \001(\0132+.g" +
       "oogle.cloud.vision.v1p3beta1.OutputConfi" +
       "g\"k\n\036AsyncBatchAnnotateFilesRequest\022I\n\010r" +
@@ -372,7 +372,7 @@ public static void registerAllExtensions(
       " \003(\01328.google.cloud.vision.v1p3beta1.Asy" +
       "ncAnnotateFileResponse\"^\n\013InputConfig\022<\n" +
       "\ngcs_source\030\001 \001(\0132(.google.cloud.vision." +
-      "v1p3beta1.GcsSource\022\021\n\tmime_type\030\002 \001(\t\"j" +
+      "v1p3beta1.GcsSource\022\021\n\tmime_type\030\002 \001(\t\"j",
       "\n\014OutputConfig\022F\n\017gcs_destination\030\001 \001(\0132" +
       "-.google.cloud.vision.v1p3beta1.GcsDesti" +
       "nation\022\022\n\nbatch_size\030\002 \001(\005\"\030\n\tGcsSource\022" +
@@ -382,7 +382,7 @@ public static void registerAllExtensions(
       "onMetadata.State\022/\n\013create_time\030\005 \001(\0132\032." +
       "google.protobuf.Timestamp\022/\n\013update_time" +
       "\030\006 \001(\0132\032.google.protobuf.Timestamp\"Q\n\005St" +
-      "ate\022\025\n\021STATE_UNSPECIFIED\020\000\022\013\n\007CREATED\020\001\022" +
+      "ate\022\025\n\021STATE_UNSPECIFIED\020\000\022\013\n\007CREATED\020\001\022",
       "\013\n\007RUNNING\020\002\022\010\n\004DONE\020\003\022\r\n\tCANCELLED\020\004*e\n" +
       "\nLikelihood\022\013\n\007UNKNOWN\020\000\022\021\n\rVERY_UNLIKEL" +
       "Y\020\001\022\014\n\010UNLIKELY\020\002\022\014\n\010POSSIBLE\020\003\022\n\n\006LIKEL" +
@@ -392,7 +392,7 @@ public static void registerAllExtensions(
       "st\032:.google.cloud.vision.v1p3beta1.Batch" +
       "AnnotateImagesResponse\"%\202\323\344\223\002\037\"\032/v1p3bet" +
       "a1/images:annotate:\001*\022\247\001\n\027AsyncBatchAnno" +
-      "tateFiles\022=.google.cloud.vision.v1p3beta" +
+      "tateFiles\022=.google.cloud.vision.v1p3beta",
       "1.AsyncBatchAnnotateFilesRequest\032\035.googl" +
       "e.longrunning.Operation\".\202\323\344\223\002(\"#/v1p3be" +
       "ta1/files:asyncBatchAnnotate:\001*B\202\001\n!com." +
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImageContext.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImageContext.java
index 9a23597d77cf..70e9f60e7fd7 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImageContext.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImageContext.java
@@ -33,9 +33,6 @@ private ImageContext(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ImageContext(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p3beta1.LatLongRect.Builder subBuilder = null;
             if (latLongRect_ != null) {
@@ -108,13 +112,6 @@ private ImageContext(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -135,7 +132,6 @@ private ImageContext(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_ImageContext_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_ImageContext_fieldAccessorTable
@@ -350,7 +346,6 @@ public com.google.cloud.vision.v1p3beta1.WebDetectionParamsOrBuilder getWebDetec
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -360,7 +355,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (latLongRect_ != null) {
@@ -381,7 +375,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -555,7 +548,6 @@ public static com.google.cloud.vision.v1p3beta1.ImageContext parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -563,7 +555,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.ImageContext prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -591,7 +582,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_ImageContext_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_ImageContext_fieldAccessorTable
@@ -614,7 +604,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (latLongRectBuilder_ == null) {
@@ -646,18 +635,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_ImageContext_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ImageContext getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.ImageContext.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ImageContext build() {
       com.google.cloud.vision.v1p3beta1.ImageContext result = buildPartial();
       if (!result.isInitialized()) {
@@ -666,7 +652,6 @@ public com.google.cloud.vision.v1p3beta1.ImageContext build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ImageContext buildPartial() {
       com.google.cloud.vision.v1p3beta1.ImageContext result = new com.google.cloud.vision.v1p3beta1.ImageContext(this);
       int from_bitField0_ = bitField0_;
@@ -701,39 +686,32 @@ public com.google.cloud.vision.v1p3beta1.ImageContext buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.ImageContext) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.ImageContext)other);
@@ -772,12 +750,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.ImageContext other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1601,13 +1577,11 @@ public com.google.cloud.vision.v1p3beta1.WebDetectionParamsOrBuilder getWebDetec
       }
       return webDetectionParamsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1629,12 +1603,11 @@ public static com.google.cloud.vision.v1p3beta1.ImageContext getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ImageContext parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImageContext(input, extensionRegistry);
+        return new ImageContext(input, extensionRegistry);
     }
   };
 
@@ -1647,7 +1620,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.ImageContext getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImageProperties.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImageProperties.java
index 0ec464542848..68397979b6d6 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImageProperties.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImageProperties.java
@@ -32,9 +32,6 @@ private ImageProperties(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private ImageProperties(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p3beta1.DominantColorsAnnotation.Builder subBuilder = null;
             if (dominantColors_ != null) {
@@ -59,13 +63,6 @@ private ImageProperties(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private ImageProperties(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_ImageProperties_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_ImageProperties_fieldAccessorTable
@@ -125,7 +121,6 @@ public com.google.cloud.vision.v1p3beta1.DominantColorsAnnotationOrBuilder getDo
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -135,7 +130,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (dominantColors_ != null) {
@@ -144,7 +138,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static com.google.cloud.vision.v1p3beta1.ImageProperties parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.ImageProperties prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_ImageProperties_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_ImageProperties_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (dominantColorsBuilder_ == null) {
@@ -336,18 +325,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_ImageProperties_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ImageProperties getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.ImageProperties.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ImageProperties build() {
       com.google.cloud.vision.v1p3beta1.ImageProperties result = buildPartial();
       if (!result.isInitialized()) {
@@ -356,7 +342,6 @@ public com.google.cloud.vision.v1p3beta1.ImageProperties build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ImageProperties buildPartial() {
       com.google.cloud.vision.v1p3beta1.ImageProperties result = new com.google.cloud.vision.v1p3beta1.ImageProperties(this);
       if (dominantColorsBuilder_ == null) {
@@ -368,39 +353,32 @@ public com.google.cloud.vision.v1p3beta1.ImageProperties buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.ImageProperties) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.ImageProperties)other);
@@ -420,12 +398,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.ImageProperties other
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -596,13 +572,11 @@ public com.google.cloud.vision.v1p3beta1.DominantColorsAnnotationOrBuilder getDo
       }
       return dominantColorsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -624,12 +598,11 @@ public static com.google.cloud.vision.v1p3beta1.ImageProperties getDefaultInstan
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ImageProperties parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImageProperties(input, extensionRegistry);
+        return new ImageProperties(input, extensionRegistry);
     }
   };
 
@@ -642,7 +615,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.ImageProperties getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImageSource.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImageSource.java
index 2975edbfc1e8..70b6ba57aec2 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImageSource.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImageSource.java
@@ -34,9 +34,6 @@ private ImageSource(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ImageSource(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private ImageSource(
             imageUri_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private ImageSource(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_ImageSource_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_ImageSource_fieldAccessorTable
@@ -211,7 +207,6 @@ public java.lang.String getImageUri() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -221,7 +216,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getGcsImageUriBytes().isEmpty()) {
@@ -233,7 +227,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -355,7 +348,6 @@ public static com.google.cloud.vision.v1p3beta1.ImageSource parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -363,7 +355,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.ImageSource prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -391,7 +382,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_ImageSource_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_ImageSource_fieldAccessorTable
@@ -414,7 +404,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       gcsImageUri_ = "";
@@ -424,18 +413,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_ImageSource_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ImageSource getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.ImageSource.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ImageSource build() {
       com.google.cloud.vision.v1p3beta1.ImageSource result = buildPartial();
       if (!result.isInitialized()) {
@@ -444,7 +430,6 @@ public com.google.cloud.vision.v1p3beta1.ImageSource build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ImageSource buildPartial() {
       com.google.cloud.vision.v1p3beta1.ImageSource result = new com.google.cloud.vision.v1p3beta1.ImageSource(this);
       result.gcsImageUri_ = gcsImageUri_;
@@ -453,39 +438,32 @@ public com.google.cloud.vision.v1p3beta1.ImageSource buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.ImageSource) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.ImageSource)other);
@@ -510,12 +488,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.ImageSource other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -796,13 +772,11 @@ public Builder setImageUriBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -824,12 +798,11 @@ public static com.google.cloud.vision.v1p3beta1.ImageSource getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ImageSource parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImageSource(input, extensionRegistry);
+        return new ImageSource(input, extensionRegistry);
     }
   };
 
@@ -842,7 +815,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.ImageSource getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImportProductSetsGcsSource.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImportProductSetsGcsSource.java
index ef3d90b1d83d..7d6d24d80808 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImportProductSetsGcsSource.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImportProductSetsGcsSource.java
@@ -34,9 +34,6 @@ private ImportProductSetsGcsSource(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,12 +45,6 @@ private ImportProductSetsGcsSource(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            csvFileUri_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -61,6 +52,12 @@ private ImportProductSetsGcsSource(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            csvFileUri_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -78,7 +75,6 @@ private ImportProductSetsGcsSource(
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ImportProductSetsGcsSource_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ImportProductSetsGcsSource_fieldAccessorTable
@@ -213,7 +209,6 @@ public java.lang.String getCsvFileUri() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -223,7 +218,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getCsvFileUriBytes().isEmpty()) {
@@ -232,7 +226,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -347,7 +340,6 @@ public static com.google.cloud.vision.v1p3beta1.ImportProductSetsGcsSource parse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -355,7 +347,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.ImportProductSetsGcsSource prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -384,7 +375,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ImportProductSetsGcsSource_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ImportProductSetsGcsSource_fieldAccessorTable
@@ -407,7 +397,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       csvFileUri_ = "";
@@ -415,18 +404,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ImportProductSetsGcsSource_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ImportProductSetsGcsSource getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.ImportProductSetsGcsSource.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ImportProductSetsGcsSource build() {
       com.google.cloud.vision.v1p3beta1.ImportProductSetsGcsSource result = buildPartial();
       if (!result.isInitialized()) {
@@ -435,7 +421,6 @@ public com.google.cloud.vision.v1p3beta1.ImportProductSetsGcsSource build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ImportProductSetsGcsSource buildPartial() {
       com.google.cloud.vision.v1p3beta1.ImportProductSetsGcsSource result = new com.google.cloud.vision.v1p3beta1.ImportProductSetsGcsSource(this);
       result.csvFileUri_ = csvFileUri_;
@@ -443,39 +428,32 @@ public com.google.cloud.vision.v1p3beta1.ImportProductSetsGcsSource buildPartial
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.ImportProductSetsGcsSource) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.ImportProductSetsGcsSource)other);
@@ -496,12 +474,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.ImportProductSetsGcsS
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -818,13 +794,11 @@ public Builder setCsvFileUriBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -846,12 +820,11 @@ public static com.google.cloud.vision.v1p3beta1.ImportProductSetsGcsSource getDe
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ImportProductSetsGcsSource parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImportProductSetsGcsSource(input, extensionRegistry);
+        return new ImportProductSetsGcsSource(input, extensionRegistry);
     }
   };
 
@@ -864,7 +837,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.ImportProductSetsGcsSource getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImportProductSetsInputConfig.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImportProductSetsInputConfig.java
index f44c1b79ab51..8fb2eab69519 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImportProductSetsInputConfig.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImportProductSetsInputConfig.java
@@ -32,9 +32,6 @@ private ImportProductSetsInputConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private ImportProductSetsInputConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p3beta1.ImportProductSetsGcsSource.Builder subBuilder = null;
             if (sourceCase_ == 1) {
@@ -60,13 +64,6 @@ private ImportProductSetsInputConfig(
             sourceCase_ = 1;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private ImportProductSetsInputConfig(
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ImportProductSetsInputConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ImportProductSetsInputConfig_fieldAccessorTable
@@ -170,7 +166,6 @@ public com.google.cloud.vision.v1p3beta1.ImportProductSetsGcsSourceOrBuilder get
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -180,7 +175,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (sourceCase_ == 1) {
@@ -189,7 +183,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -320,7 +313,6 @@ public static com.google.cloud.vision.v1p3beta1.ImportProductSetsInputConfig par
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -328,7 +320,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.ImportProductSetsInputConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -356,7 +347,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ImportProductSetsInputConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ImportProductSetsInputConfig_fieldAccessorTable
@@ -379,7 +369,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       sourceCase_ = 0;
@@ -387,18 +376,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ImportProductSetsInputConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ImportProductSetsInputConfig getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.ImportProductSetsInputConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ImportProductSetsInputConfig build() {
       com.google.cloud.vision.v1p3beta1.ImportProductSetsInputConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -407,7 +393,6 @@ public com.google.cloud.vision.v1p3beta1.ImportProductSetsInputConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ImportProductSetsInputConfig buildPartial() {
       com.google.cloud.vision.v1p3beta1.ImportProductSetsInputConfig result = new com.google.cloud.vision.v1p3beta1.ImportProductSetsInputConfig(this);
       if (sourceCase_ == 1) {
@@ -422,39 +407,32 @@ public com.google.cloud.vision.v1p3beta1.ImportProductSetsInputConfig buildParti
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.ImportProductSetsInputConfig) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.ImportProductSetsInputConfig)other);
@@ -480,12 +458,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.ImportProductSetsInpu
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -699,13 +675,11 @@ public com.google.cloud.vision.v1p3beta1.ImportProductSetsGcsSourceOrBuilder get
       onChanged();;
       return gcsSourceBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -727,12 +701,11 @@ public static com.google.cloud.vision.v1p3beta1.ImportProductSetsInputConfig get
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ImportProductSetsInputConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImportProductSetsInputConfig(input, extensionRegistry);
+        return new ImportProductSetsInputConfig(input, extensionRegistry);
     }
   };
 
@@ -745,7 +718,6 @@ public com.google.protobuf.Parser getParserForType
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.ImportProductSetsInputConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImportProductSetsRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImportProductSetsRequest.java
index f5ae1be72831..89724405ef59 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImportProductSetsRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImportProductSetsRequest.java
@@ -33,9 +33,6 @@ private ImportProductSetsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ImportProductSetsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ImportProductSetsRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ImportProductSetsRequest(
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ImportProductSetsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ImportProductSetsRequest_fieldAccessorTable
@@ -176,7 +172,6 @@ public com.google.cloud.vision.v1p3beta1.ImportProductSetsInputConfigOrBuilder g
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -186,7 +181,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -198,7 +192,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -326,7 +319,6 @@ public static com.google.cloud.vision.v1p3beta1.ImportProductSetsRequest parseFr
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -334,7 +326,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.ImportProductSetsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -362,7 +353,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ImportProductSetsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ImportProductSetsRequest_fieldAccessorTable
@@ -385,7 +375,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -399,18 +388,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ImportProductSetsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ImportProductSetsRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.ImportProductSetsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ImportProductSetsRequest build() {
       com.google.cloud.vision.v1p3beta1.ImportProductSetsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -419,7 +405,6 @@ public com.google.cloud.vision.v1p3beta1.ImportProductSetsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ImportProductSetsRequest buildPartial() {
       com.google.cloud.vision.v1p3beta1.ImportProductSetsRequest result = new com.google.cloud.vision.v1p3beta1.ImportProductSetsRequest(this);
       result.parent_ = parent_;
@@ -432,39 +417,32 @@ public com.google.cloud.vision.v1p3beta1.ImportProductSetsRequest buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.ImportProductSetsRequest) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.ImportProductSetsRequest)other);
@@ -488,12 +466,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.ImportProductSetsRequ
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -758,13 +734,11 @@ public com.google.cloud.vision.v1p3beta1.ImportProductSetsInputConfigOrBuilder g
       }
       return inputConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -786,12 +760,11 @@ public static com.google.cloud.vision.v1p3beta1.ImportProductSetsRequest getDefa
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ImportProductSetsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImportProductSetsRequest(input, extensionRegistry);
+        return new ImportProductSetsRequest(input, extensionRegistry);
     }
   };
 
@@ -804,7 +777,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.ImportProductSetsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImportProductSetsResponse.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImportProductSetsResponse.java
index 2ab5b5383ddc..0c44c290df35 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImportProductSetsResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ImportProductSetsResponse.java
@@ -37,9 +37,6 @@ private ImportProductSetsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private ImportProductSetsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               referenceImages_ = new java.util.ArrayList();
@@ -69,13 +73,6 @@ private ImportProductSetsResponse(
                 input.readMessage(com.google.rpc.Status.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -99,7 +96,6 @@ private ImportProductSetsResponse(
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ImportProductSetsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ImportProductSetsResponse_fieldAccessorTable
@@ -238,7 +234,6 @@ public com.google.rpc.StatusOrBuilder getStatusesOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -248,7 +243,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < referenceImages_.size(); i++) {
@@ -260,7 +254,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -388,7 +381,6 @@ public static com.google.cloud.vision.v1p3beta1.ImportProductSetsResponse parseF
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -396,7 +388,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.ImportProductSetsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -427,7 +418,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ImportProductSetsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ImportProductSetsResponse_fieldAccessorTable
@@ -452,7 +442,6 @@ private void maybeForceBuilderInitialization() {
         getStatusesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (referenceImagesBuilder_ == null) {
@@ -470,18 +459,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ImportProductSetsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ImportProductSetsResponse getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.ImportProductSetsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ImportProductSetsResponse build() {
       com.google.cloud.vision.v1p3beta1.ImportProductSetsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -490,7 +476,6 @@ public com.google.cloud.vision.v1p3beta1.ImportProductSetsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ImportProductSetsResponse buildPartial() {
       com.google.cloud.vision.v1p3beta1.ImportProductSetsResponse result = new com.google.cloud.vision.v1p3beta1.ImportProductSetsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -516,39 +501,32 @@ public com.google.cloud.vision.v1p3beta1.ImportProductSetsResponse buildPartial(
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.ImportProductSetsResponse) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.ImportProductSetsResponse)other);
@@ -617,12 +595,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.ImportProductSetsResp
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1337,13 +1313,11 @@ public com.google.rpc.Status.Builder addStatusesBuilder(
       }
       return statusesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1365,12 +1339,11 @@ public static com.google.cloud.vision.v1p3beta1.ImportProductSetsResponse getDef
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ImportProductSetsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ImportProductSetsResponse(input, extensionRegistry);
+        return new ImportProductSetsResponse(input, extensionRegistry);
     }
   };
 
@@ -1383,7 +1356,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.ImportProductSetsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/InputConfig.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/InputConfig.java
index d856f19af091..9ae4140f274c 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/InputConfig.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/InputConfig.java
@@ -33,9 +33,6 @@ private InputConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private InputConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p3beta1.GcsSource.Builder subBuilder = null;
             if (gcsSource_ != null) {
@@ -66,13 +70,6 @@ private InputConfig(
             mimeType_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private InputConfig(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_InputConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_InputConfig_fieldAccessorTable
@@ -176,7 +172,6 @@ public java.lang.String getMimeType() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -186,7 +181,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (gcsSource_ != null) {
@@ -198,7 +192,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -326,7 +319,6 @@ public static com.google.cloud.vision.v1p3beta1.InputConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -334,7 +326,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.InputConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -362,7 +353,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_InputConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_InputConfig_fieldAccessorTable
@@ -385,7 +375,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (gcsSourceBuilder_ == null) {
@@ -399,18 +388,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_InputConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.InputConfig getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.InputConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.InputConfig build() {
       com.google.cloud.vision.v1p3beta1.InputConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -419,7 +405,6 @@ public com.google.cloud.vision.v1p3beta1.InputConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.InputConfig buildPartial() {
       com.google.cloud.vision.v1p3beta1.InputConfig result = new com.google.cloud.vision.v1p3beta1.InputConfig(this);
       if (gcsSourceBuilder_ == null) {
@@ -432,39 +417,32 @@ public com.google.cloud.vision.v1p3beta1.InputConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.InputConfig) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.InputConfig)other);
@@ -488,12 +466,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.InputConfig other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -758,13 +734,11 @@ public Builder setMimeTypeBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -786,12 +760,11 @@ public static com.google.cloud.vision.v1p3beta1.InputConfig getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public InputConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new InputConfig(input, extensionRegistry);
+        return new InputConfig(input, extensionRegistry);
     }
   };
 
@@ -804,7 +777,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.InputConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/LatLongRect.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/LatLongRect.java
index 71564fb33575..eb18b2b4837d 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/LatLongRect.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/LatLongRect.java
@@ -32,9 +32,6 @@ private LatLongRect(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private LatLongRect(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.type.LatLng.Builder subBuilder = null;
             if (minLatLng_ != null) {
@@ -72,13 +76,6 @@ private LatLongRect(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private LatLongRect(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_LatLongRect_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_LatLongRect_fieldAccessorTable
@@ -171,7 +167,6 @@ public com.google.type.LatLngOrBuilder getMaxLatLngOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -181,7 +176,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (minLatLng_ != null) {
@@ -193,7 +187,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -327,7 +320,6 @@ public static com.google.cloud.vision.v1p3beta1.LatLongRect parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -335,7 +327,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.LatLongRect prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -363,7 +354,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_LatLongRect_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_LatLongRect_fieldAccessorTable
@@ -386,7 +376,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (minLatLngBuilder_ == null) {
@@ -404,18 +393,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_LatLongRect_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.LatLongRect getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.LatLongRect.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.LatLongRect build() {
       com.google.cloud.vision.v1p3beta1.LatLongRect result = buildPartial();
       if (!result.isInitialized()) {
@@ -424,7 +410,6 @@ public com.google.cloud.vision.v1p3beta1.LatLongRect build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.LatLongRect buildPartial() {
       com.google.cloud.vision.v1p3beta1.LatLongRect result = new com.google.cloud.vision.v1p3beta1.LatLongRect(this);
       if (minLatLngBuilder_ == null) {
@@ -441,39 +426,32 @@ public com.google.cloud.vision.v1p3beta1.LatLongRect buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.LatLongRect) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.LatLongRect)other);
@@ -496,12 +474,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.LatLongRect other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -825,13 +801,11 @@ public com.google.type.LatLngOrBuilder getMaxLatLngOrBuilder() {
       }
       return maxLatLngBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -853,12 +827,11 @@ public static com.google.cloud.vision.v1p3beta1.LatLongRect getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LatLongRect parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LatLongRect(input, extensionRegistry);
+        return new LatLongRect(input, extensionRegistry);
     }
   };
 
@@ -871,7 +844,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.LatLongRect getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListProductSetsRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListProductSetsRequest.java
index c49c72fb6bf3..f8cc11f01105 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListProductSetsRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListProductSetsRequest.java
@@ -35,9 +35,6 @@ private ListProductSetsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListProductSetsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ListProductSetsRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListProductSetsRequest(
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListProductSetsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListProductSetsRequest_fieldAccessorTable
@@ -198,7 +194,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -208,7 +203,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -223,7 +217,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -353,7 +346,6 @@ public static com.google.cloud.vision.v1p3beta1.ListProductSetsRequest parseFrom
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -361,7 +353,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.ListProductSetsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -389,7 +380,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListProductSetsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListProductSetsRequest_fieldAccessorTable
@@ -412,7 +402,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -424,18 +413,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListProductSetsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ListProductSetsRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.ListProductSetsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ListProductSetsRequest build() {
       com.google.cloud.vision.v1p3beta1.ListProductSetsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -444,7 +430,6 @@ public com.google.cloud.vision.v1p3beta1.ListProductSetsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ListProductSetsRequest buildPartial() {
       com.google.cloud.vision.v1p3beta1.ListProductSetsRequest result = new com.google.cloud.vision.v1p3beta1.ListProductSetsRequest(this);
       result.parent_ = parent_;
@@ -454,39 +439,32 @@ public com.google.cloud.vision.v1p3beta1.ListProductSetsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.ListProductSetsRequest) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.ListProductSetsRequest)other);
@@ -514,12 +492,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.ListProductSetsReques
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -758,13 +734,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -786,12 +760,11 @@ public static com.google.cloud.vision.v1p3beta1.ListProductSetsRequest getDefaul
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListProductSetsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListProductSetsRequest(input, extensionRegistry);
+        return new ListProductSetsRequest(input, extensionRegistry);
     }
   };
 
@@ -804,7 +777,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.ListProductSetsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListProductSetsResponse.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListProductSetsResponse.java
index ef96364d0ebf..4b7e37f62699 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListProductSetsResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListProductSetsResponse.java
@@ -34,9 +34,6 @@ private ListProductSetsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListProductSetsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               productSets_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListProductSetsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListProductSetsResponse(
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListProductSetsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListProductSetsResponse_fieldAccessorTable
@@ -199,7 +195,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -209,7 +204,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < productSets_.size(); i++) {
@@ -221,7 +215,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -346,7 +339,6 @@ public static com.google.cloud.vision.v1p3beta1.ListProductSetsResponse parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -354,7 +346,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.ListProductSetsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -382,7 +373,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListProductSetsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListProductSetsResponse_fieldAccessorTable
@@ -406,7 +396,6 @@ private void maybeForceBuilderInitialization() {
         getProductSetsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (productSetsBuilder_ == null) {
@@ -420,18 +409,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListProductSetsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ListProductSetsResponse getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.ListProductSetsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ListProductSetsResponse build() {
       com.google.cloud.vision.v1p3beta1.ListProductSetsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -440,7 +426,6 @@ public com.google.cloud.vision.v1p3beta1.ListProductSetsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ListProductSetsResponse buildPartial() {
       com.google.cloud.vision.v1p3beta1.ListProductSetsResponse result = new com.google.cloud.vision.v1p3beta1.ListProductSetsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -460,39 +445,32 @@ public com.google.cloud.vision.v1p3beta1.ListProductSetsResponse buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.ListProductSetsResponse) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.ListProductSetsResponse)other);
@@ -539,12 +517,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.ListProductSetsRespon
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -969,13 +945,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -997,12 +971,11 @@ public static com.google.cloud.vision.v1p3beta1.ListProductSetsResponse getDefau
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListProductSetsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListProductSetsResponse(input, extensionRegistry);
+        return new ListProductSetsResponse(input, extensionRegistry);
     }
   };
 
@@ -1015,7 +988,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.ListProductSetsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListProductsInProductSetRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListProductsInProductSetRequest.java
index 69f6ea410695..c4aa79adc823 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListProductsInProductSetRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListProductsInProductSetRequest.java
@@ -35,9 +35,6 @@ private ListProductsInProductSetRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListProductsInProductSetRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ListProductsInProductSetRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListProductsInProductSetRequest(
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListProductsInProductSetRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListProductsInProductSetRequest_fieldAccessorTable
@@ -200,7 +196,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -210,7 +205,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -225,7 +219,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -355,7 +348,6 @@ public static com.google.cloud.vision.v1p3beta1.ListProductsInProductSetRequest
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -363,7 +355,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.ListProductsInProductSetRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -391,7 +382,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListProductsInProductSetRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListProductsInProductSetRequest_fieldAccessorTable
@@ -414,7 +404,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -426,18 +415,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListProductsInProductSetRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ListProductsInProductSetRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.ListProductsInProductSetRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ListProductsInProductSetRequest build() {
       com.google.cloud.vision.v1p3beta1.ListProductsInProductSetRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -446,7 +432,6 @@ public com.google.cloud.vision.v1p3beta1.ListProductsInProductSetRequest build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ListProductsInProductSetRequest buildPartial() {
       com.google.cloud.vision.v1p3beta1.ListProductsInProductSetRequest result = new com.google.cloud.vision.v1p3beta1.ListProductsInProductSetRequest(this);
       result.name_ = name_;
@@ -456,39 +441,32 @@ public com.google.cloud.vision.v1p3beta1.ListProductsInProductSetRequest buildPa
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.ListProductsInProductSetRequest) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.ListProductsInProductSetRequest)other);
@@ -516,12 +494,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.ListProductsInProduct
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -765,13 +741,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -793,12 +767,11 @@ public static com.google.cloud.vision.v1p3beta1.ListProductsInProductSetRequest
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListProductsInProductSetRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListProductsInProductSetRequest(input, extensionRegistry);
+        return new ListProductsInProductSetRequest(input, extensionRegistry);
     }
   };
 
@@ -811,7 +784,6 @@ public com.google.protobuf.Parser getParserForT
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.ListProductsInProductSetRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListProductsInProductSetResponse.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListProductsInProductSetResponse.java
index 2f1d0d6c47fd..dae4470a3e1f 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListProductsInProductSetResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListProductsInProductSetResponse.java
@@ -34,9 +34,6 @@ private ListProductsInProductSetResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListProductsInProductSetResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               products_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListProductsInProductSetResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListProductsInProductSetResponse(
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListProductsInProductSetResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListProductsInProductSetResponse_fieldAccessorTable
@@ -199,7 +195,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -209,7 +204,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < products_.size(); i++) {
@@ -221,7 +215,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -346,7 +339,6 @@ public static com.google.cloud.vision.v1p3beta1.ListProductsInProductSetResponse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -354,7 +346,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.ListProductsInProductSetResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -382,7 +373,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListProductsInProductSetResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListProductsInProductSetResponse_fieldAccessorTable
@@ -406,7 +396,6 @@ private void maybeForceBuilderInitialization() {
         getProductsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (productsBuilder_ == null) {
@@ -420,18 +409,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListProductsInProductSetResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ListProductsInProductSetResponse getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.ListProductsInProductSetResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ListProductsInProductSetResponse build() {
       com.google.cloud.vision.v1p3beta1.ListProductsInProductSetResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -440,7 +426,6 @@ public com.google.cloud.vision.v1p3beta1.ListProductsInProductSetResponse build(
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ListProductsInProductSetResponse buildPartial() {
       com.google.cloud.vision.v1p3beta1.ListProductsInProductSetResponse result = new com.google.cloud.vision.v1p3beta1.ListProductsInProductSetResponse(this);
       int from_bitField0_ = bitField0_;
@@ -460,39 +445,32 @@ public com.google.cloud.vision.v1p3beta1.ListProductsInProductSetResponse buildP
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.ListProductsInProductSetResponse) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.ListProductsInProductSetResponse)other);
@@ -539,12 +517,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.ListProductsInProduct
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -969,13 +945,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -997,12 +971,11 @@ public static com.google.cloud.vision.v1p3beta1.ListProductsInProductSetResponse
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListProductsInProductSetResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListProductsInProductSetResponse(input, extensionRegistry);
+        return new ListProductsInProductSetResponse(input, extensionRegistry);
     }
   };
 
@@ -1015,7 +988,6 @@ public com.google.protobuf.Parser getParserFor
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.ListProductsInProductSetResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListProductsRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListProductsRequest.java
index 77be8bbd55c4..eb8c1279fa7f 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListProductsRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListProductsRequest.java
@@ -35,9 +35,6 @@ private ListProductsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListProductsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ListProductsRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListProductsRequest(
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListProductsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListProductsRequest_fieldAccessorTable
@@ -200,7 +196,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -210,7 +205,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -225,7 +219,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -355,7 +348,6 @@ public static com.google.cloud.vision.v1p3beta1.ListProductsRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -363,7 +355,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.ListProductsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -391,7 +382,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListProductsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListProductsRequest_fieldAccessorTable
@@ -414,7 +404,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -426,18 +415,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListProductsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ListProductsRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.ListProductsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ListProductsRequest build() {
       com.google.cloud.vision.v1p3beta1.ListProductsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -446,7 +432,6 @@ public com.google.cloud.vision.v1p3beta1.ListProductsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ListProductsRequest buildPartial() {
       com.google.cloud.vision.v1p3beta1.ListProductsRequest result = new com.google.cloud.vision.v1p3beta1.ListProductsRequest(this);
       result.parent_ = parent_;
@@ -456,39 +441,32 @@ public com.google.cloud.vision.v1p3beta1.ListProductsRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.ListProductsRequest) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.ListProductsRequest)other);
@@ -516,12 +494,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.ListProductsRequest o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -765,13 +741,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -793,12 +767,11 @@ public static com.google.cloud.vision.v1p3beta1.ListProductsRequest getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListProductsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListProductsRequest(input, extensionRegistry);
+        return new ListProductsRequest(input, extensionRegistry);
     }
   };
 
@@ -811,7 +784,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.ListProductsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListProductsResponse.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListProductsResponse.java
index 9bcfbf596922..ac3cf13b9105 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListProductsResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListProductsResponse.java
@@ -34,9 +34,6 @@ private ListProductsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListProductsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               products_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListProductsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListProductsResponse(
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListProductsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListProductsResponse_fieldAccessorTable
@@ -199,7 +195,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -209,7 +204,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < products_.size(); i++) {
@@ -221,7 +215,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -346,7 +339,6 @@ public static com.google.cloud.vision.v1p3beta1.ListProductsResponse parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -354,7 +346,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.ListProductsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -382,7 +373,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListProductsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListProductsResponse_fieldAccessorTable
@@ -406,7 +396,6 @@ private void maybeForceBuilderInitialization() {
         getProductsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (productsBuilder_ == null) {
@@ -420,18 +409,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListProductsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ListProductsResponse getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.ListProductsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ListProductsResponse build() {
       com.google.cloud.vision.v1p3beta1.ListProductsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -440,7 +426,6 @@ public com.google.cloud.vision.v1p3beta1.ListProductsResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ListProductsResponse buildPartial() {
       com.google.cloud.vision.v1p3beta1.ListProductsResponse result = new com.google.cloud.vision.v1p3beta1.ListProductsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -460,39 +445,32 @@ public com.google.cloud.vision.v1p3beta1.ListProductsResponse buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.ListProductsResponse) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.ListProductsResponse)other);
@@ -539,12 +517,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.ListProductsResponse
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -969,13 +945,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -997,12 +971,11 @@ public static com.google.cloud.vision.v1p3beta1.ListProductsResponse getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListProductsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListProductsResponse(input, extensionRegistry);
+        return new ListProductsResponse(input, extensionRegistry);
     }
   };
 
@@ -1015,7 +988,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.ListProductsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListReferenceImagesRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListReferenceImagesRequest.java
index ba53576e861e..586c3a854996 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListReferenceImagesRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListReferenceImagesRequest.java
@@ -35,9 +35,6 @@ private ListReferenceImagesRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListReferenceImagesRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ListReferenceImagesRequest(
             pageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListReferenceImagesRequest(
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListReferenceImagesRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListReferenceImagesRequest_fieldAccessorTable
@@ -204,7 +200,6 @@ public java.lang.String getPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -214,7 +209,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -229,7 +223,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -359,7 +352,6 @@ public static com.google.cloud.vision.v1p3beta1.ListReferenceImagesRequest parse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -367,7 +359,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.ListReferenceImagesRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -395,7 +386,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListReferenceImagesRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListReferenceImagesRequest_fieldAccessorTable
@@ -418,7 +408,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -430,18 +419,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListReferenceImagesRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ListReferenceImagesRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.ListReferenceImagesRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ListReferenceImagesRequest build() {
       com.google.cloud.vision.v1p3beta1.ListReferenceImagesRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -450,7 +436,6 @@ public com.google.cloud.vision.v1p3beta1.ListReferenceImagesRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ListReferenceImagesRequest buildPartial() {
       com.google.cloud.vision.v1p3beta1.ListReferenceImagesRequest result = new com.google.cloud.vision.v1p3beta1.ListReferenceImagesRequest(this);
       result.parent_ = parent_;
@@ -460,39 +445,32 @@ public com.google.cloud.vision.v1p3beta1.ListReferenceImagesRequest buildPartial
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.ListReferenceImagesRequest) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.ListReferenceImagesRequest)other);
@@ -520,12 +498,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.ListReferenceImagesRe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -779,13 +755,11 @@ public Builder setPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -807,12 +781,11 @@ public static com.google.cloud.vision.v1p3beta1.ListReferenceImagesRequest getDe
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListReferenceImagesRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListReferenceImagesRequest(input, extensionRegistry);
+        return new ListReferenceImagesRequest(input, extensionRegistry);
     }
   };
 
@@ -825,7 +798,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.ListReferenceImagesRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListReferenceImagesResponse.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListReferenceImagesResponse.java
index dc407e4f7305..e34b4cfb0d7b 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListReferenceImagesResponse.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ListReferenceImagesResponse.java
@@ -35,9 +35,6 @@ private ListReferenceImagesResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListReferenceImagesResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               referenceImages_ = new java.util.ArrayList();
@@ -69,13 +73,6 @@ private ListReferenceImagesResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private ListReferenceImagesResponse(
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListReferenceImagesResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListReferenceImagesResponse_fieldAccessorTable
@@ -216,7 +212,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -226,7 +221,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < referenceImages_.size(); i++) {
@@ -241,7 +235,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -374,7 +367,6 @@ public static com.google.cloud.vision.v1p3beta1.ListReferenceImagesResponse pars
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -382,7 +374,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.ListReferenceImagesResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -410,7 +401,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListReferenceImagesResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListReferenceImagesResponse_fieldAccessorTable
@@ -434,7 +424,6 @@ private void maybeForceBuilderInitialization() {
         getReferenceImagesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (referenceImagesBuilder_ == null) {
@@ -450,18 +439,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ListReferenceImagesResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ListReferenceImagesResponse getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.ListReferenceImagesResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ListReferenceImagesResponse build() {
       com.google.cloud.vision.v1p3beta1.ListReferenceImagesResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -470,7 +456,6 @@ public com.google.cloud.vision.v1p3beta1.ListReferenceImagesResponse build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ListReferenceImagesResponse buildPartial() {
       com.google.cloud.vision.v1p3beta1.ListReferenceImagesResponse result = new com.google.cloud.vision.v1p3beta1.ListReferenceImagesResponse(this);
       int from_bitField0_ = bitField0_;
@@ -491,39 +476,32 @@ public com.google.cloud.vision.v1p3beta1.ListReferenceImagesResponse buildPartia
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.ListReferenceImagesResponse) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.ListReferenceImagesResponse)other);
@@ -573,12 +551,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.ListReferenceImagesRe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1036,13 +1012,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1064,12 +1038,11 @@ public static com.google.cloud.vision.v1p3beta1.ListReferenceImagesResponse getD
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListReferenceImagesResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListReferenceImagesResponse(input, extensionRegistry);
+        return new ListReferenceImagesResponse(input, extensionRegistry);
     }
   };
 
@@ -1082,7 +1055,6 @@ public com.google.protobuf.Parser getParserForType(
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.ListReferenceImagesResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/LocalizedObjectAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/LocalizedObjectAnnotation.java
index 471639f2d7fb..d8014a67eb03 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/LocalizedObjectAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/LocalizedObjectAnnotation.java
@@ -36,9 +36,6 @@ private LocalizedObjectAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private LocalizedObjectAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -86,13 +90,6 @@ private LocalizedObjectAnnotation(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -110,7 +107,6 @@ private LocalizedObjectAnnotation(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_LocalizedObjectAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_LocalizedObjectAnnotation_fieldAccessorTable
@@ -295,7 +291,6 @@ public com.google.cloud.vision.v1p3beta1.BoundingPolyOrBuilder getBoundingPolyOr
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -305,7 +300,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getMidBytes().isEmpty()) {
@@ -326,7 +320,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -479,7 +472,6 @@ public static com.google.cloud.vision.v1p3beta1.LocalizedObjectAnnotation parseF
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -487,7 +479,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.LocalizedObjectAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -515,7 +506,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_LocalizedObjectAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_LocalizedObjectAnnotation_fieldAccessorTable
@@ -538,7 +528,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       mid_ = "";
@@ -558,18 +547,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_LocalizedObjectAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.LocalizedObjectAnnotation getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.LocalizedObjectAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.LocalizedObjectAnnotation build() {
       com.google.cloud.vision.v1p3beta1.LocalizedObjectAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -578,7 +564,6 @@ public com.google.cloud.vision.v1p3beta1.LocalizedObjectAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.LocalizedObjectAnnotation buildPartial() {
       com.google.cloud.vision.v1p3beta1.LocalizedObjectAnnotation result = new com.google.cloud.vision.v1p3beta1.LocalizedObjectAnnotation(this);
       result.mid_ = mid_;
@@ -594,39 +579,32 @@ public com.google.cloud.vision.v1p3beta1.LocalizedObjectAnnotation buildPartial(
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.LocalizedObjectAnnotation) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.LocalizedObjectAnnotation)other);
@@ -661,12 +639,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.LocalizedObjectAnnota
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1152,13 +1128,11 @@ public com.google.cloud.vision.v1p3beta1.BoundingPolyOrBuilder getBoundingPolyOr
       }
       return boundingPolyBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1180,12 +1154,11 @@ public static com.google.cloud.vision.v1p3beta1.LocalizedObjectAnnotation getDef
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LocalizedObjectAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LocalizedObjectAnnotation(input, extensionRegistry);
+        return new LocalizedObjectAnnotation(input, extensionRegistry);
     }
   };
 
@@ -1198,7 +1171,6 @@ public com.google.protobuf.Parser getParserForType()
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.LocalizedObjectAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/LocationInfo.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/LocationInfo.java
index 10c1e96425a1..5655d950bf08 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/LocationInfo.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/LocationInfo.java
@@ -32,9 +32,6 @@ private LocationInfo(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private LocationInfo(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.type.LatLng.Builder subBuilder = null;
             if (latLng_ != null) {
@@ -59,13 +63,6 @@ private LocationInfo(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private LocationInfo(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_LocationInfo_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_LocationInfo_fieldAccessorTable
@@ -125,7 +121,6 @@ public com.google.type.LatLngOrBuilder getLatLngOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -135,7 +130,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (latLng_ != null) {
@@ -144,7 +138,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -265,7 +258,6 @@ public static com.google.cloud.vision.v1p3beta1.LocationInfo parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -273,7 +265,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.LocationInfo prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_LocationInfo_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_LocationInfo_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (latLngBuilder_ == null) {
@@ -336,18 +325,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_LocationInfo_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.LocationInfo getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.LocationInfo.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.LocationInfo build() {
       com.google.cloud.vision.v1p3beta1.LocationInfo result = buildPartial();
       if (!result.isInitialized()) {
@@ -356,7 +342,6 @@ public com.google.cloud.vision.v1p3beta1.LocationInfo build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.LocationInfo buildPartial() {
       com.google.cloud.vision.v1p3beta1.LocationInfo result = new com.google.cloud.vision.v1p3beta1.LocationInfo(this);
       if (latLngBuilder_ == null) {
@@ -368,39 +353,32 @@ public com.google.cloud.vision.v1p3beta1.LocationInfo buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.LocationInfo) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.LocationInfo)other);
@@ -420,12 +398,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.LocationInfo other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -596,13 +572,11 @@ public com.google.type.LatLngOrBuilder getLatLngOrBuilder() {
       }
       return latLngBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -624,12 +598,11 @@ public static com.google.cloud.vision.v1p3beta1.LocationInfo getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public LocationInfo parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new LocationInfo(input, extensionRegistry);
+        return new LocationInfo(input, extensionRegistry);
     }
   };
 
@@ -642,7 +615,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.LocationInfo getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/NormalizedBoundingPoly.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/NormalizedBoundingPoly.java
index ba98c5b37304..445a6df78df2 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/NormalizedBoundingPoly.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/NormalizedBoundingPoly.java
@@ -33,9 +33,6 @@ private NormalizedBoundingPoly(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private NormalizedBoundingPoly(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               vertices_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private NormalizedBoundingPoly(
                 input.readMessage(com.google.cloud.vision.v1p3beta1.NormalizedVertex.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private NormalizedBoundingPoly(
     return com.google.cloud.vision.v1p3beta1.GeometryProto.internal_static_google_cloud_vision_v1p3beta1_NormalizedBoundingPoly_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.GeometryProto.internal_static_google_cloud_vision_v1p3beta1_NormalizedBoundingPoly_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.cloud.vision.v1p3beta1.NormalizedVertexOrBuilder getVerticesOr
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < vertices_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.vision.v1p3beta1.NormalizedBoundingPoly parseFrom
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.NormalizedBoundingPoly prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.GeometryProto.internal_static_google_cloud_vision_v1p3beta1_NormalizedBoundingPoly_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.GeometryProto.internal_static_google_cloud_vision_v1p3beta1_NormalizedBoundingPoly_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getVerticesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (verticesBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.GeometryProto.internal_static_google_cloud_vision_v1p3beta1_NormalizedBoundingPoly_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.NormalizedBoundingPoly getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.NormalizedBoundingPoly.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.NormalizedBoundingPoly build() {
       com.google.cloud.vision.v1p3beta1.NormalizedBoundingPoly result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.cloud.vision.v1p3beta1.NormalizedBoundingPoly build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.NormalizedBoundingPoly buildPartial() {
       com.google.cloud.vision.v1p3beta1.NormalizedBoundingPoly result = new com.google.cloud.vision.v1p3beta1.NormalizedBoundingPoly(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.cloud.vision.v1p3beta1.NormalizedBoundingPoly buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.NormalizedBoundingPoly) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.NormalizedBoundingPoly)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.NormalizedBoundingPol
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.cloud.vision.v1p3beta1.NormalizedVertex.Builder addVerticesBui
       }
       return verticesBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.cloud.vision.v1p3beta1.NormalizedBoundingPoly getDefaul
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public NormalizedBoundingPoly parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new NormalizedBoundingPoly(input, extensionRegistry);
+        return new NormalizedBoundingPoly(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.NormalizedBoundingPoly getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/NormalizedVertex.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/NormalizedVertex.java
index 7a064ba007bc..4ad92beecc01 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/NormalizedVertex.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/NormalizedVertex.java
@@ -36,9 +36,6 @@ private NormalizedVertex(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private NormalizedVertex(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 13: {
 
             x_ = input.readFloat();
@@ -60,13 +64,6 @@ private NormalizedVertex(
             y_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private NormalizedVertex(
     return com.google.cloud.vision.v1p3beta1.GeometryProto.internal_static_google_cloud_vision_v1p3beta1_NormalizedVertex_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.GeometryProto.internal_static_google_cloud_vision_v1p3beta1_NormalizedVertex_fieldAccessorTable
@@ -119,7 +115,6 @@ public float getY() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -129,7 +124,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (x_ != 0F) {
@@ -141,7 +135,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -271,7 +264,6 @@ public static com.google.cloud.vision.v1p3beta1.NormalizedVertex parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -279,7 +271,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.NormalizedVertex prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -309,7 +300,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.GeometryProto.internal_static_google_cloud_vision_v1p3beta1_NormalizedVertex_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.GeometryProto.internal_static_google_cloud_vision_v1p3beta1_NormalizedVertex_fieldAccessorTable
@@ -332,7 +322,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       x_ = 0F;
@@ -342,18 +331,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.GeometryProto.internal_static_google_cloud_vision_v1p3beta1_NormalizedVertex_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.NormalizedVertex getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.NormalizedVertex.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.NormalizedVertex build() {
       com.google.cloud.vision.v1p3beta1.NormalizedVertex result = buildPartial();
       if (!result.isInitialized()) {
@@ -362,7 +348,6 @@ public com.google.cloud.vision.v1p3beta1.NormalizedVertex build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.NormalizedVertex buildPartial() {
       com.google.cloud.vision.v1p3beta1.NormalizedVertex result = new com.google.cloud.vision.v1p3beta1.NormalizedVertex(this);
       result.x_ = x_;
@@ -371,39 +356,32 @@ public com.google.cloud.vision.v1p3beta1.NormalizedVertex buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.NormalizedVertex) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.NormalizedVertex)other);
@@ -426,12 +404,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.NormalizedVertex othe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -525,13 +501,11 @@ public Builder clearY() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -553,12 +527,11 @@ public static com.google.cloud.vision.v1p3beta1.NormalizedVertex getDefaultInsta
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public NormalizedVertex parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new NormalizedVertex(input, extensionRegistry);
+        return new NormalizedVertex(input, extensionRegistry);
     }
   };
 
@@ -571,7 +544,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.NormalizedVertex getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/OperationMetadata.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/OperationMetadata.java
index a9df01aeaeab..b3daa1d0a899 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/OperationMetadata.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/OperationMetadata.java
@@ -33,9 +33,6 @@ private OperationMetadata(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private OperationMetadata(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -79,13 +83,6 @@ private OperationMetadata(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -103,7 +100,6 @@ private OperationMetadata(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_OperationMetadata_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_OperationMetadata_fieldAccessorTable
@@ -300,7 +296,6 @@ public int getStateValue() {
    * .google.cloud.vision.v1p3beta1.OperationMetadata.State state = 1;
    */
   public com.google.cloud.vision.v1p3beta1.OperationMetadata.State getState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p3beta1.OperationMetadata.State result = com.google.cloud.vision.v1p3beta1.OperationMetadata.State.valueOf(state_);
     return result == null ? com.google.cloud.vision.v1p3beta1.OperationMetadata.State.UNRECOGNIZED : result;
   }
@@ -372,7 +367,6 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -382,7 +376,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (state_ != com.google.cloud.vision.v1p3beta1.OperationMetadata.State.STATE_UNSPECIFIED.getNumber()) {
@@ -397,7 +390,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -538,7 +530,6 @@ public static com.google.cloud.vision.v1p3beta1.OperationMetadata parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -546,7 +537,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.OperationMetadata prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -574,7 +564,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_OperationMetadata_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_OperationMetadata_fieldAccessorTable
@@ -597,7 +586,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       state_ = 0;
@@ -617,18 +605,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_OperationMetadata_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.OperationMetadata getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.OperationMetadata.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.OperationMetadata build() {
       com.google.cloud.vision.v1p3beta1.OperationMetadata result = buildPartial();
       if (!result.isInitialized()) {
@@ -637,7 +622,6 @@ public com.google.cloud.vision.v1p3beta1.OperationMetadata build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.OperationMetadata buildPartial() {
       com.google.cloud.vision.v1p3beta1.OperationMetadata result = new com.google.cloud.vision.v1p3beta1.OperationMetadata(this);
       result.state_ = state_;
@@ -655,39 +639,32 @@ public com.google.cloud.vision.v1p3beta1.OperationMetadata buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.OperationMetadata) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.OperationMetadata)other);
@@ -713,12 +690,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.OperationMetadata oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -768,7 +743,6 @@ public Builder setStateValue(int value) {
      * .google.cloud.vision.v1p3beta1.OperationMetadata.State state = 1;
      */
     public com.google.cloud.vision.v1p3beta1.OperationMetadata.State getState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p3beta1.OperationMetadata.State result = com.google.cloud.vision.v1p3beta1.OperationMetadata.State.valueOf(state_);
       return result == null ? com.google.cloud.vision.v1p3beta1.OperationMetadata.State.UNRECOGNIZED : result;
     }
@@ -1107,13 +1081,11 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() {
       }
       return updateTimeBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1135,12 +1107,11 @@ public static com.google.cloud.vision.v1p3beta1.OperationMetadata getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public OperationMetadata parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new OperationMetadata(input, extensionRegistry);
+        return new OperationMetadata(input, extensionRegistry);
     }
   };
 
@@ -1153,7 +1124,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.OperationMetadata getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/OutputConfig.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/OutputConfig.java
index 2428af2d39c5..a6fecaf13d45 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/OutputConfig.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/OutputConfig.java
@@ -33,9 +33,6 @@ private OutputConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private OutputConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p3beta1.GcsDestination.Builder subBuilder = null;
             if (gcsDestination_ != null) {
@@ -65,13 +69,6 @@ private OutputConfig(
             batchSize_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -89,7 +86,6 @@ private OutputConfig(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_OutputConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_OutputConfig_fieldAccessorTable
@@ -152,7 +148,6 @@ public int getBatchSize() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -162,7 +157,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (gcsDestination_ != null) {
@@ -174,7 +168,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -303,7 +296,6 @@ public static com.google.cloud.vision.v1p3beta1.OutputConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -311,7 +303,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.OutputConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -339,7 +330,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_OutputConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_OutputConfig_fieldAccessorTable
@@ -362,7 +352,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (gcsDestinationBuilder_ == null) {
@@ -376,18 +365,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_OutputConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.OutputConfig getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.OutputConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.OutputConfig build() {
       com.google.cloud.vision.v1p3beta1.OutputConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -396,7 +382,6 @@ public com.google.cloud.vision.v1p3beta1.OutputConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.OutputConfig buildPartial() {
       com.google.cloud.vision.v1p3beta1.OutputConfig result = new com.google.cloud.vision.v1p3beta1.OutputConfig(this);
       if (gcsDestinationBuilder_ == null) {
@@ -409,39 +394,32 @@ public com.google.cloud.vision.v1p3beta1.OutputConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.OutputConfig) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.OutputConfig)other);
@@ -464,12 +442,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.OutputConfig other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -702,13 +678,11 @@ public Builder clearBatchSize() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -730,12 +704,11 @@ public static com.google.cloud.vision.v1p3beta1.OutputConfig getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public OutputConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new OutputConfig(input, extensionRegistry);
+        return new OutputConfig(input, extensionRegistry);
     }
   };
 
@@ -748,7 +721,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.OutputConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Page.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Page.java
index 3bf1acdc3c63..77f6a3ff65de 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Page.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Page.java
@@ -36,9 +36,6 @@ private Page(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private Page(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p3beta1.TextAnnotation.TextProperty.Builder subBuilder = null;
             if (property_ != null) {
@@ -87,13 +91,6 @@ private Page(
             confidence_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -114,7 +111,6 @@ private Page(
     return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_Page_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_Page_fieldAccessorTable
@@ -253,7 +249,6 @@ public float getConfidence() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -263,7 +258,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (property_ != null) {
@@ -284,7 +278,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -442,7 +435,6 @@ public static com.google.cloud.vision.v1p3beta1.Page parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -450,7 +442,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.Page prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -478,7 +469,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_Page_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_Page_fieldAccessorTable
@@ -502,7 +492,6 @@ private void maybeForceBuilderInitialization() {
         getBlocksFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (propertyBuilder_ == null) {
@@ -526,18 +515,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_Page_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Page getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.Page.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Page build() {
       com.google.cloud.vision.v1p3beta1.Page result = buildPartial();
       if (!result.isInitialized()) {
@@ -546,7 +532,6 @@ public com.google.cloud.vision.v1p3beta1.Page build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Page buildPartial() {
       com.google.cloud.vision.v1p3beta1.Page result = new com.google.cloud.vision.v1p3beta1.Page(this);
       int from_bitField0_ = bitField0_;
@@ -573,39 +558,32 @@ public com.google.cloud.vision.v1p3beta1.Page buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.Page) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.Page)other);
@@ -660,12 +638,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.Page other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1269,13 +1245,11 @@ public Builder clearConfidence() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1297,12 +1271,11 @@ public static com.google.cloud.vision.v1p3beta1.Page getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Page parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Page(input, extensionRegistry);
+        return new Page(input, extensionRegistry);
     }
   };
 
@@ -1315,7 +1288,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.Page getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Paragraph.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Paragraph.java
index 07732cc4fd43..639fb8b4c6c8 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Paragraph.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Paragraph.java
@@ -34,9 +34,6 @@ private Paragraph(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private Paragraph(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p3beta1.TextAnnotation.TextProperty.Builder subBuilder = null;
             if (property_ != null) {
@@ -88,13 +92,6 @@ private Paragraph(
             confidence_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -115,7 +112,6 @@ private Paragraph(
     return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_Paragraph_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_Paragraph_fieldAccessorTable
@@ -301,7 +297,6 @@ public float getConfidence() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -311,7 +306,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (property_ != null) {
@@ -329,7 +323,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -484,7 +477,6 @@ public static com.google.cloud.vision.v1p3beta1.Paragraph parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -492,7 +484,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.Paragraph prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -520,7 +511,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_Paragraph_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_Paragraph_fieldAccessorTable
@@ -544,7 +534,6 @@ private void maybeForceBuilderInitialization() {
         getWordsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (propertyBuilder_ == null) {
@@ -570,18 +559,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_Paragraph_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Paragraph getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.Paragraph.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Paragraph build() {
       com.google.cloud.vision.v1p3beta1.Paragraph result = buildPartial();
       if (!result.isInitialized()) {
@@ -590,7 +576,6 @@ public com.google.cloud.vision.v1p3beta1.Paragraph build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Paragraph buildPartial() {
       com.google.cloud.vision.v1p3beta1.Paragraph result = new com.google.cloud.vision.v1p3beta1.Paragraph(this);
       int from_bitField0_ = bitField0_;
@@ -620,39 +605,32 @@ public com.google.cloud.vision.v1p3beta1.Paragraph buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.Paragraph) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.Paragraph)other);
@@ -704,12 +682,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.Paragraph other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1510,13 +1486,11 @@ public Builder clearConfidence() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1538,12 +1512,11 @@ public static com.google.cloud.vision.v1p3beta1.Paragraph getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Paragraph parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Paragraph(input, extensionRegistry);
+        return new Paragraph(input, extensionRegistry);
     }
   };
 
@@ -1556,7 +1529,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.Paragraph getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Position.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Position.java
index 9d8b301184d5..731bb61f6fc1 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Position.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Position.java
@@ -37,9 +37,6 @@ private Position(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private Position(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 13: {
 
             x_ = input.readFloat();
@@ -66,13 +70,6 @@ private Position(
             z_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private Position(
     return com.google.cloud.vision.v1p3beta1.GeometryProto.internal_static_google_cloud_vision_v1p3beta1_Position_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.GeometryProto.internal_static_google_cloud_vision_v1p3beta1_Position_fieldAccessorTable
@@ -138,7 +134,6 @@ public float getZ() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -148,7 +143,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (x_ != 0F) {
@@ -163,7 +157,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -304,7 +297,6 @@ public static com.google.cloud.vision.v1p3beta1.Position parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -312,7 +304,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.Position prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -342,7 +333,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.GeometryProto.internal_static_google_cloud_vision_v1p3beta1_Position_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.GeometryProto.internal_static_google_cloud_vision_v1p3beta1_Position_fieldAccessorTable
@@ -365,7 +355,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       x_ = 0F;
@@ -377,18 +366,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.GeometryProto.internal_static_google_cloud_vision_v1p3beta1_Position_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Position getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.Position.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Position build() {
       com.google.cloud.vision.v1p3beta1.Position result = buildPartial();
       if (!result.isInitialized()) {
@@ -397,7 +383,6 @@ public com.google.cloud.vision.v1p3beta1.Position build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Position buildPartial() {
       com.google.cloud.vision.v1p3beta1.Position result = new com.google.cloud.vision.v1p3beta1.Position(this);
       result.x_ = x_;
@@ -407,39 +392,32 @@ public com.google.cloud.vision.v1p3beta1.Position buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.Position) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.Position)other);
@@ -465,12 +443,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.Position other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -602,13 +578,11 @@ public Builder clearZ() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -630,12 +604,11 @@ public static com.google.cloud.vision.v1p3beta1.Position getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Position parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Position(input, extensionRegistry);
+        return new Position(input, extensionRegistry);
     }
   };
 
@@ -648,7 +621,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.Position getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Product.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Product.java
index 9bcb2553f6c5..df516e47be44 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Product.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Product.java
@@ -37,9 +37,6 @@ private Product(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private Product(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -84,13 +88,6 @@ private Product(
                 input.readMessage(com.google.cloud.vision.v1p3beta1.Product.KeyValue.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -111,7 +108,6 @@ private Product(
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_Product_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_Product_fieldAccessorTable
@@ -194,9 +190,6 @@ private KeyValue(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -208,6 +201,13 @@ private KeyValue(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -220,13 +220,6 @@ private KeyValue(
               value_ = s;
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -244,7 +237,6 @@ private KeyValue(
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_Product_KeyValue_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_Product_KeyValue_fieldAccessorTable
@@ -341,7 +333,6 @@ public java.lang.String getValue() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -351,7 +342,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getKeyBytes().isEmpty()) {
@@ -363,7 +353,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -485,7 +474,6 @@ public static com.google.cloud.vision.v1p3beta1.Product.KeyValue parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -493,7 +481,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.Product.KeyValue prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -521,7 +508,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_Product_KeyValue_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_Product_KeyValue_fieldAccessorTable
@@ -544,7 +530,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         key_ = "";
@@ -554,18 +539,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_Product_KeyValue_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.Product.KeyValue getDefaultInstanceForType() {
         return com.google.cloud.vision.v1p3beta1.Product.KeyValue.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.Product.KeyValue build() {
         com.google.cloud.vision.v1p3beta1.Product.KeyValue result = buildPartial();
         if (!result.isInitialized()) {
@@ -574,7 +556,6 @@ public com.google.cloud.vision.v1p3beta1.Product.KeyValue build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.Product.KeyValue buildPartial() {
         com.google.cloud.vision.v1p3beta1.Product.KeyValue result = new com.google.cloud.vision.v1p3beta1.Product.KeyValue(this);
         result.key_ = key_;
@@ -583,39 +564,32 @@ public com.google.cloud.vision.v1p3beta1.Product.KeyValue buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1p3beta1.Product.KeyValue) {
           return mergeFrom((com.google.cloud.vision.v1p3beta1.Product.KeyValue)other);
@@ -640,12 +614,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.Product.KeyValue othe
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -851,13 +823,11 @@ public Builder setValueBytes(
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -879,12 +849,11 @@ public static com.google.cloud.vision.v1p3beta1.Product.KeyValue getDefaultInsta
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public KeyValue parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new KeyValue(input, extensionRegistry);
+          return new KeyValue(input, extensionRegistry);
       }
     };
 
@@ -897,7 +866,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Product.KeyValue getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1173,7 +1141,6 @@ public com.google.cloud.vision.v1p3beta1.Product.KeyValueOrBuilder getProductLab
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1183,7 +1150,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -1204,7 +1170,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1350,7 +1315,6 @@ public static com.google.cloud.vision.v1p3beta1.Product parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1358,7 +1322,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.Product prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1386,7 +1349,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_Product_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_Product_fieldAccessorTable
@@ -1410,7 +1372,6 @@ private void maybeForceBuilderInitialization() {
         getProductLabelsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -1430,18 +1391,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_Product_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Product getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.Product.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Product build() {
       com.google.cloud.vision.v1p3beta1.Product result = buildPartial();
       if (!result.isInitialized()) {
@@ -1450,7 +1408,6 @@ public com.google.cloud.vision.v1p3beta1.Product build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Product buildPartial() {
       com.google.cloud.vision.v1p3beta1.Product result = new com.google.cloud.vision.v1p3beta1.Product(this);
       int from_bitField0_ = bitField0_;
@@ -1473,39 +1430,32 @@ public com.google.cloud.vision.v1p3beta1.Product buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.Product) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.Product)other);
@@ -1564,12 +1514,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.Product other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2399,13 +2347,11 @@ public com.google.cloud.vision.v1p3beta1.Product.KeyValue.Builder addProductLabe
       }
       return productLabelsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2427,12 +2373,11 @@ public static com.google.cloud.vision.v1p3beta1.Product getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Product parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Product(input, extensionRegistry);
+        return new Product(input, extensionRegistry);
     }
   };
 
@@ -2445,7 +2390,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.Product getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchParams.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchParams.java
index 2c01c42b28a7..33d7a5f95269 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchParams.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchParams.java
@@ -39,9 +39,6 @@ private ProductSearchParams(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private ProductSearchParams(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -124,13 +128,6 @@ private ProductSearchParams(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -151,7 +148,6 @@ private ProductSearchParams(
     return com.google.cloud.vision.v1p3beta1.ProductSearchProto.internal_static_google_cloud_vision_v1p3beta1_ProductSearchParams_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ProductSearchProto.internal_static_google_cloud_vision_v1p3beta1_ProductSearchParams_fieldAccessorTable
@@ -228,7 +224,6 @@ public int getCategoryValue() {
    * .google.cloud.vision.v1p3beta1.ProductSearchCategory category = 2;
    */
   public com.google.cloud.vision.v1p3beta1.ProductSearchCategory getCategory() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p3beta1.ProductSearchCategory result = com.google.cloud.vision.v1p3beta1.ProductSearchCategory.valueOf(category_);
     return result == null ? com.google.cloud.vision.v1p3beta1.ProductSearchCategory.UNRECOGNIZED : result;
   }
@@ -378,7 +373,6 @@ public int getViewValue() {
    * .google.cloud.vision.v1p3beta1.ProductSearchResultsView view = 4;
    */
   public com.google.cloud.vision.v1p3beta1.ProductSearchResultsView getView() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p3beta1.ProductSearchResultsView result = com.google.cloud.vision.v1p3beta1.ProductSearchResultsView.valueOf(view_);
     return result == null ? com.google.cloud.vision.v1p3beta1.ProductSearchResultsView.UNRECOGNIZED : result;
   }
@@ -533,7 +527,6 @@ public java.lang.String getFilter() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -543,7 +536,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getCatalogNameBytes().isEmpty()) {
@@ -576,7 +568,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -766,7 +757,6 @@ public static com.google.cloud.vision.v1p3beta1.ProductSearchParams parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -774,7 +764,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.ProductSearchParams prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -802,7 +791,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ProductSearchProto.internal_static_google_cloud_vision_v1p3beta1_ProductSearchParams_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchProto.internal_static_google_cloud_vision_v1p3beta1_ProductSearchParams_fieldAccessorTable
@@ -825,7 +813,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       catalogName_ = "";
@@ -857,18 +844,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchProto.internal_static_google_cloud_vision_v1p3beta1_ProductSearchParams_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ProductSearchParams getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchParams.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ProductSearchParams build() {
       com.google.cloud.vision.v1p3beta1.ProductSearchParams result = buildPartial();
       if (!result.isInitialized()) {
@@ -877,7 +861,6 @@ public com.google.cloud.vision.v1p3beta1.ProductSearchParams build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ProductSearchParams buildPartial() {
       com.google.cloud.vision.v1p3beta1.ProductSearchParams result = new com.google.cloud.vision.v1p3beta1.ProductSearchParams(this);
       int from_bitField0_ = bitField0_;
@@ -908,39 +891,32 @@ public com.google.cloud.vision.v1p3beta1.ProductSearchParams buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.ProductSearchParams) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.ProductSearchParams)other);
@@ -995,12 +971,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.ProductSearchParams o
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1151,7 +1125,6 @@ public Builder setCategoryValue(int value) {
      * .google.cloud.vision.v1p3beta1.ProductSearchCategory category = 2;
      */
     public com.google.cloud.vision.v1p3beta1.ProductSearchCategory getCategory() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p3beta1.ProductSearchCategory result = com.google.cloud.vision.v1p3beta1.ProductSearchCategory.valueOf(category_);
       return result == null ? com.google.cloud.vision.v1p3beta1.ProductSearchCategory.UNRECOGNIZED : result;
     }
@@ -1660,7 +1633,6 @@ public Builder setViewValue(int value) {
      * .google.cloud.vision.v1p3beta1.ProductSearchResultsView view = 4;
      */
     public com.google.cloud.vision.v1p3beta1.ProductSearchResultsView getView() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p3beta1.ProductSearchResultsView result = com.google.cloud.vision.v1p3beta1.ProductSearchResultsView.valueOf(view_);
       return result == null ? com.google.cloud.vision.v1p3beta1.ProductSearchResultsView.UNRECOGNIZED : result;
     }
@@ -2051,13 +2023,11 @@ public Builder setFilterBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -2079,12 +2049,11 @@ public static com.google.cloud.vision.v1p3beta1.ProductSearchParams getDefaultIn
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ProductSearchParams parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ProductSearchParams(input, extensionRegistry);
+        return new ProductSearchParams(input, extensionRegistry);
     }
   };
 
@@ -2097,7 +2066,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.ProductSearchParams getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchProto.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchProto.java
index 70816d8e1de6..d439ca473211 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchProto.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchProto.java
@@ -52,7 +52,7 @@ public static void registerAllExtensions(
       "estamp.proto\"\262\003\n\023ProductSearchParams\022\024\n\014" +
       "catalog_name\030\001 \001(\t\022F\n\010category\030\002 \001(\01624.g" +
       "oogle.cloud.vision.v1p3beta1.ProductSear" +
-      "chCategory\022\030\n\020product_category\030\005 \001(\t\022W\n\030" +
+      "chCategory\022\030\n\020product_category\030\005 \001(\t\022W\n\030",
       "normalized_bounding_poly\030\003 \001(\01325.google." +
       "cloud.vision.v1p3beta1.NormalizedBoundin" +
       "gPoly\022B\n\rbounding_poly\030\t \001(\0132+.google.cl" +
@@ -62,7 +62,7 @@ public static void registerAllExtensions(
       "\006 \001(\t\022\032\n\022product_categories\030\007 \003(\t\022\016\n\006fil" +
       "ter\030\010 \001(\t\"\356\003\n\024ProductSearchResults\022F\n\010ca" +
       "tegory\030\001 \001(\01624.google.cloud.vision.v1p3b" +
-      "eta1.ProductSearchCategory\022\030\n\020product_ca" +
+      "eta1.ProductSearchCategory\022\030\n\020product_ca",
       "tegory\030\004 \001(\t\022.\n\nindex_time\030\002 \001(\0132\032.googl" +
       "e.protobuf.Timestamp\022Q\n\010products\030\003 \003(\0132?" +
       ".google.cloud.vision.v1p3beta1.ProductSe" +
@@ -72,7 +72,7 @@ public static void registerAllExtensions(
       "roduct_id\030\001 \001(\t\022\021\n\timage_uri\030\002 \001(\t\022\r\n\005sc" +
       "ore\030\003 \001(\002\032_\n\006Result\0227\n\007product\030\001 \001(\0132&.g" +
       "oogle.cloud.vision.v1p3beta1.Product\022\r\n\005" +
-      "score\030\002 \001(\002\022\r\n\005image\030\003 \001(\t*U\n\025ProductSea" +
+      "score\030\002 \001(\002\022\r\n\005image\030\003 \001(\t*U\n\025ProductSea",
       "rchCategory\022\'\n#PRODUCT_SEARCH_CATEGORY_U" +
       "NSPECIFIED\020\000\022\t\n\005SHOES\020\001\022\010\n\004BAGS\020\002*/\n\030Pro" +
       "ductSearchResultsView\022\t\n\005BASIC\020\000\022\010\n\004FULL" +
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchResults.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchResults.java
index 32105c8bc16f..7d5e483214e7 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchResults.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchResults.java
@@ -36,9 +36,6 @@ private ProductSearchResults(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private ProductSearchResults(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -93,13 +97,6 @@ private ProductSearchResults(
                 input.readMessage(com.google.cloud.vision.v1p3beta1.ProductSearchResults.Result.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -123,7 +120,6 @@ private ProductSearchResults(
     return com.google.cloud.vision.v1p3beta1.ProductSearchProto.internal_static_google_cloud_vision_v1p3beta1_ProductSearchResults_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ProductSearchProto.internal_static_google_cloud_vision_v1p3beta1_ProductSearchResults_fieldAccessorTable
@@ -219,9 +215,6 @@ private ProductInfo(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -233,6 +226,13 @@ private ProductInfo(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -250,13 +250,6 @@ private ProductInfo(
               score_ = input.readFloat();
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -274,7 +267,6 @@ private ProductInfo(
       return com.google.cloud.vision.v1p3beta1.ProductSearchProto.internal_static_google_cloud_vision_v1p3beta1_ProductSearchResults_ProductInfo_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchProto.internal_static_google_cloud_vision_v1p3beta1_ProductSearchResults_ProductInfo_fieldAccessorTable
@@ -387,7 +379,6 @@ public float getScore() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -397,7 +388,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getProductIdBytes().isEmpty()) {
@@ -412,7 +402,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -545,7 +534,6 @@ public static com.google.cloud.vision.v1p3beta1.ProductSearchResults.ProductInfo
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -553,7 +541,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.ProductSearchResults.ProductInfo prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -581,7 +568,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1p3beta1.ProductSearchProto.internal_static_google_cloud_vision_v1p3beta1_ProductSearchResults_ProductInfo_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1p3beta1.ProductSearchProto.internal_static_google_cloud_vision_v1p3beta1_ProductSearchResults_ProductInfo_fieldAccessorTable
@@ -604,7 +590,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         productId_ = "";
@@ -616,18 +601,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1p3beta1.ProductSearchProto.internal_static_google_cloud_vision_v1p3beta1_ProductSearchResults_ProductInfo_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.ProductSearchResults.ProductInfo getDefaultInstanceForType() {
         return com.google.cloud.vision.v1p3beta1.ProductSearchResults.ProductInfo.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.ProductSearchResults.ProductInfo build() {
         com.google.cloud.vision.v1p3beta1.ProductSearchResults.ProductInfo result = buildPartial();
         if (!result.isInitialized()) {
@@ -636,7 +618,6 @@ public com.google.cloud.vision.v1p3beta1.ProductSearchResults.ProductInfo build(
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.ProductSearchResults.ProductInfo buildPartial() {
         com.google.cloud.vision.v1p3beta1.ProductSearchResults.ProductInfo result = new com.google.cloud.vision.v1p3beta1.ProductSearchResults.ProductInfo(this);
         result.productId_ = productId_;
@@ -646,39 +627,32 @@ public com.google.cloud.vision.v1p3beta1.ProductSearchResults.ProductInfo buildP
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1p3beta1.ProductSearchResults.ProductInfo) {
           return mergeFrom((com.google.cloud.vision.v1p3beta1.ProductSearchResults.ProductInfo)other);
@@ -706,12 +680,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.ProductSearchResults.
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -964,13 +936,11 @@ public Builder clearScore() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -992,12 +962,11 @@ public static com.google.cloud.vision.v1p3beta1.ProductSearchResults.ProductInfo
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public ProductInfo parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new ProductInfo(input, extensionRegistry);
+          return new ProductInfo(input, extensionRegistry);
       }
     };
 
@@ -1010,7 +979,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ProductSearchResults.ProductInfo getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1109,9 +1077,6 @@ private Result(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1123,6 +1088,13 @@ private Result(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               com.google.cloud.vision.v1p3beta1.Product.Builder subBuilder = null;
               if (product_ != null) {
@@ -1147,13 +1119,6 @@ private Result(
               image_ = s;
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1171,7 +1136,6 @@ private Result(
       return com.google.cloud.vision.v1p3beta1.ProductSearchProto.internal_static_google_cloud_vision_v1p3beta1_ProductSearchResults_Result_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchProto.internal_static_google_cloud_vision_v1p3beta1_ProductSearchResults_Result_fieldAccessorTable
@@ -1273,7 +1237,6 @@ public java.lang.String getImage() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1283,7 +1246,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (product_ != null) {
@@ -1298,7 +1260,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -1437,7 +1398,6 @@ public static com.google.cloud.vision.v1p3beta1.ProductSearchResults.Result pars
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -1445,7 +1405,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.ProductSearchResults.Result prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -1473,7 +1432,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1p3beta1.ProductSearchProto.internal_static_google_cloud_vision_v1p3beta1_ProductSearchResults_Result_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1p3beta1.ProductSearchProto.internal_static_google_cloud_vision_v1p3beta1_ProductSearchResults_Result_fieldAccessorTable
@@ -1496,7 +1454,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         if (productBuilder_ == null) {
@@ -1512,18 +1469,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1p3beta1.ProductSearchProto.internal_static_google_cloud_vision_v1p3beta1_ProductSearchResults_Result_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.ProductSearchResults.Result getDefaultInstanceForType() {
         return com.google.cloud.vision.v1p3beta1.ProductSearchResults.Result.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.ProductSearchResults.Result build() {
         com.google.cloud.vision.v1p3beta1.ProductSearchResults.Result result = buildPartial();
         if (!result.isInitialized()) {
@@ -1532,7 +1486,6 @@ public com.google.cloud.vision.v1p3beta1.ProductSearchResults.Result build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.ProductSearchResults.Result buildPartial() {
         com.google.cloud.vision.v1p3beta1.ProductSearchResults.Result result = new com.google.cloud.vision.v1p3beta1.ProductSearchResults.Result(this);
         if (productBuilder_ == null) {
@@ -1546,39 +1499,32 @@ public com.google.cloud.vision.v1p3beta1.ProductSearchResults.Result buildPartia
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1p3beta1.ProductSearchResults.Result) {
           return mergeFrom((com.google.cloud.vision.v1p3beta1.ProductSearchResults.Result)other);
@@ -1605,12 +1551,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.ProductSearchResults.
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1922,13 +1866,11 @@ public Builder setImageBytes(
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1950,12 +1892,11 @@ public static com.google.cloud.vision.v1p3beta1.ProductSearchResults.Result getD
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Result parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Result(input, extensionRegistry);
+          return new Result(input, extensionRegistry);
       }
     };
 
@@ -1968,7 +1909,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ProductSearchResults.Result getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1998,7 +1938,6 @@ public int getCategoryValue() {
    * .google.cloud.vision.v1p3beta1.ProductSearchCategory category = 1;
    */
   public com.google.cloud.vision.v1p3beta1.ProductSearchCategory getCategory() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p3beta1.ProductSearchCategory result = com.google.cloud.vision.v1p3beta1.ProductSearchCategory.valueOf(category_);
     return result == null ? com.google.cloud.vision.v1p3beta1.ProductSearchCategory.UNRECOGNIZED : result;
   }
@@ -2196,7 +2135,6 @@ public com.google.cloud.vision.v1p3beta1.ProductSearchResults.ResultOrBuilder ge
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -2206,7 +2144,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (category_ != com.google.cloud.vision.v1p3beta1.ProductSearchCategory.PRODUCT_SEARCH_CATEGORY_UNSPECIFIED.getNumber()) {
@@ -2227,7 +2164,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -2382,7 +2318,6 @@ public static com.google.cloud.vision.v1p3beta1.ProductSearchResults parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -2390,7 +2325,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.ProductSearchResults prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -2418,7 +2352,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ProductSearchProto.internal_static_google_cloud_vision_v1p3beta1_ProductSearchResults_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchProto.internal_static_google_cloud_vision_v1p3beta1_ProductSearchResults_fieldAccessorTable
@@ -2443,7 +2376,6 @@ private void maybeForceBuilderInitialization() {
         getResultsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       category_ = 0;
@@ -2471,18 +2403,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchProto.internal_static_google_cloud_vision_v1p3beta1_ProductSearchResults_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ProductSearchResults getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchResults.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ProductSearchResults build() {
       com.google.cloud.vision.v1p3beta1.ProductSearchResults result = buildPartial();
       if (!result.isInitialized()) {
@@ -2491,7 +2420,6 @@ public com.google.cloud.vision.v1p3beta1.ProductSearchResults build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ProductSearchResults buildPartial() {
       com.google.cloud.vision.v1p3beta1.ProductSearchResults result = new com.google.cloud.vision.v1p3beta1.ProductSearchResults(this);
       int from_bitField0_ = bitField0_;
@@ -2526,39 +2454,32 @@ public com.google.cloud.vision.v1p3beta1.ProductSearchResults buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.ProductSearchResults) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.ProductSearchResults)other);
@@ -2637,12 +2558,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.ProductSearchResults
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2696,7 +2615,6 @@ public Builder setCategoryValue(int value) {
      * .google.cloud.vision.v1p3beta1.ProductSearchCategory category = 1;
      */
     public com.google.cloud.vision.v1p3beta1.ProductSearchCategory getCategory() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p3beta1.ProductSearchCategory result = com.google.cloud.vision.v1p3beta1.ProductSearchCategory.valueOf(category_);
       return result == null ? com.google.cloud.vision.v1p3beta1.ProductSearchCategory.UNRECOGNIZED : result;
     }
@@ -3616,13 +3534,11 @@ public com.google.cloud.vision.v1p3beta1.ProductSearchResults.Result.Builder add
       }
       return resultsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -3644,12 +3560,11 @@ public static com.google.cloud.vision.v1p3beta1.ProductSearchResults getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ProductSearchResults parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ProductSearchResults(input, extensionRegistry);
+        return new ProductSearchResults(input, extensionRegistry);
     }
   };
 
@@ -3662,7 +3577,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.ProductSearchResults getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchServiceProto.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchServiceProto.java
index 02dd3e82fea8..b02b82c3e46c 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchServiceProto.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSearchServiceProto.java
@@ -182,7 +182,7 @@ public static void registerAllExtensions(
       "e/protobuf/field_mask.proto\032\037google/prot" +
       "obuf/timestamp.proto\032\027google/rpc/status." +
       "proto\"\315\001\n\007Product\022\014\n\004name\030\001 \001(\t\022\024\n\014displ" +
-      "ay_name\030\002 \001(\t\022\023\n\013description\030\003 \001(\t\022\030\n\020pr" +
+      "ay_name\030\002 \001(\t\022\023\n\013description\030\003 \001(\t\022\030\n\020pr",
       "oduct_category\030\004 \001(\t\022G\n\016product_labels\030\005" +
       " \003(\0132/.google.cloud.vision.v1p3beta1.Pro" +
       "duct.KeyValue\032&\n\010KeyValue\022\013\n\003key\030\001 \001(\t\022\r" +
@@ -192,7 +192,7 @@ public static void registerAllExtensions(
       "x_error\030\004 \001(\0132\022.google.rpc.Status\"p\n\016Ref" +
       "erenceImage\022\014\n\004name\030\001 \001(\t\022\013\n\003uri\030\002 \001(\t\022C" +
       "\n\016bounding_polys\030\003 \003(\0132+.google.cloud.vi" +
-      "sion.v1p3beta1.BoundingPoly\"s\n\024CreatePro" +
+      "sion.v1p3beta1.BoundingPoly\"s\n\024CreatePro",
       "ductRequest\022\016\n\006parent\030\001 \001(\t\0227\n\007product\030\002" +
       " \001(\0132&.google.cloud.vision.v1p3beta1.Pro" +
       "duct\022\022\n\nproduct_id\030\003 \001(\t\"L\n\023ListProducts" +
@@ -202,7 +202,7 @@ public static void registerAllExtensions(
       "vision.v1p3beta1.Product\022\027\n\017next_page_to" +
       "ken\030\002 \001(\t\"!\n\021GetProductRequest\022\014\n\004name\030\001" +
       " \001(\t\"\200\001\n\024UpdateProductRequest\0227\n\007product" +
-      "\030\001 \001(\0132&.google.cloud.vision.v1p3beta1.P" +
+      "\030\001 \001(\0132&.google.cloud.vision.v1p3beta1.P",
       "roduct\022/\n\013update_mask\030\002 \001(\0132\032.google.pro" +
       "tobuf.FieldMask\"$\n\024DeleteProductRequest\022" +
       "\014\n\004name\030\001 \001(\t\"\201\001\n\027CreateProductSetReques" +
@@ -212,7 +212,7 @@ public static void registerAllExtensions(
       "SetsRequest\022\016\n\006parent\030\001 \001(\t\022\021\n\tpage_size" +
       "\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\"s\n\027ListProduc" +
       "tSetsResponse\022?\n\014product_sets\030\001 \003(\0132).go" +
-      "ogle.cloud.vision.v1p3beta1.ProductSet\022\027" +
+      "ogle.cloud.vision.v1p3beta1.ProductSet\022\027",
       "\n\017next_page_token\030\002 \001(\t\"$\n\024GetProductSet" +
       "Request\022\014\n\004name\030\001 \001(\t\"\212\001\n\027UpdateProductS" +
       "etRequest\022>\n\013product_set\030\001 \001(\0132).google." +
@@ -222,7 +222,7 @@ public static void registerAllExtensions(
       "\001(\t\"\221\001\n\033CreateReferenceImageRequest\022\016\n\006p" +
       "arent\030\001 \001(\t\022F\n\017reference_image\030\002 \001(\0132-.g" +
       "oogle.cloud.vision.v1p3beta1.ReferenceIm" +
-      "age\022\032\n\022reference_image_id\030\003 \001(\t\"S\n\032ListR" +
+      "age\022\032\n\022reference_image_id\030\003 \001(\t\"S\n\032ListR",
       "eferenceImagesRequest\022\016\n\006parent\030\001 \001(\t\022\021\n" +
       "\tpage_size\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\"\222\001\n" +
       "\033ListReferenceImagesResponse\022G\n\020referenc" +
@@ -232,7 +232,7 @@ public static void registerAllExtensions(
       "eImageRequest\022\014\n\004name\030\001 \001(\t\"+\n\033DeleteRef" +
       "erenceImageRequest\022\014\n\004name\030\001 \001(\t\">\n\035AddP" +
       "roductToProductSetRequest\022\014\n\004name\030\001 \001(\t\022" +
-      "\017\n\007product\030\002 \001(\t\"C\n\"RemoveProductFromPro" +
+      "\017\n\007product\030\002 \001(\t\"C\n\"RemoveProductFromPro",
       "ductSetRequest\022\014\n\004name\030\001 \001(\t\022\017\n\007product\030" +
       "\002 \001(\t\"V\n\037ListProductsInProductSetRequest" +
       "\022\014\n\004name\030\001 \001(\t\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npag" +
@@ -242,7 +242,7 @@ public static void registerAllExtensions(
       "_token\030\002 \001(\t\"2\n\032ImportProductSetsGcsSour" +
       "ce\022\024\n\014csv_file_uri\030\001 \001(\t\"y\n\034ImportProduc" +
       "tSetsInputConfig\022O\n\ngcs_source\030\001 \001(\01329.g" +
-      "oogle.cloud.vision.v1p3beta1.ImportProdu" +
+      "oogle.cloud.vision.v1p3beta1.ImportProdu",
       "ctSetsGcsSourceH\000B\010\n\006source\"}\n\030ImportPro" +
       "ductSetsRequest\022\016\n\006parent\030\001 \001(\t\022Q\n\014input" +
       "_config\030\002 \001(\0132;.google.cloud.vision.v1p3" +
@@ -252,7 +252,7 @@ public static void registerAllExtensions(
       "a1.ReferenceImage\022$\n\010statuses\030\002 \003(\0132\022.go" +
       "ogle.rpc.Status\"\236\002\n\026BatchOperationMetada" +
       "ta\022J\n\005state\030\001 \001(\0162;.google.cloud.vision." +
-      "v1p3beta1.BatchOperationMetadata.State\022/" +
+      "v1p3beta1.BatchOperationMetadata.State\022/",
       "\n\013submit_time\030\002 \001(\0132\032.google.protobuf.Ti" +
       "mestamp\022,\n\010end_time\030\003 \001(\0132\032.google.proto" +
       "buf.Timestamp\"Y\n\005State\022\025\n\021STATE_UNSPECIF" +
@@ -262,7 +262,7 @@ public static void registerAllExtensions(
       "ision.v1p3beta1.CreateProductSetRequest\032" +
       ").google.cloud.vision.v1p3beta1.ProductS" +
       "et\"K\202\323\344\223\002E\"6/v1p3beta1/{parent=projects/" +
-      "*/locations/*}/productSets:\013product_set\022" +
+      "*/locations/*}/productSets:\013product_set\022",
       "\300\001\n\017ListProductSets\0225.google.cloud.visio" +
       "n.v1p3beta1.ListProductSetsRequest\0326.goo" +
       "gle.cloud.vision.v1p3beta1.ListProductSe" +
@@ -272,7 +272,7 @@ public static void registerAllExtensions(
       "eta1.GetProductSetRequest\032).google.cloud" +
       ".vision.v1p3beta1.ProductSet\">\202\323\344\223\0028\0226/v" +
       "1p3beta1/{name=projects/*/locations/*/pr" +
-      "oductSets/*}\022\316\001\n\020UpdateProductSet\0226.goog" +
+      "oductSets/*}\022\316\001\n\020UpdateProductSet\0226.goog",
       "le.cloud.vision.v1p3beta1.UpdateProductS" +
       "etRequest\032).google.cloud.vision.v1p3beta" +
       "1.ProductSet\"W\202\323\344\223\002Q2B/v1p3beta1/{produc" +
@@ -282,7 +282,7 @@ public static void registerAllExtensions(
       "eProductSetRequest\032\026.google.protobuf.Emp" +
       "ty\">\202\323\344\223\0028*6/v1p3beta1/{name=projects/*/" +
       "locations/*/productSets/*}\022\262\001\n\rCreatePro" +
-      "duct\0223.google.cloud.vision.v1p3beta1.Cre" +
+      "duct\0223.google.cloud.vision.v1p3beta1.Cre",
       "ateProductRequest\032&.google.cloud.vision." +
       "v1p3beta1.Product\"D\202\323\344\223\002>\"3/v1p3beta1/{p" +
       "arent=projects/*/locations/*}/products:\007" +
@@ -292,7 +292,7 @@ public static void registerAllExtensions(
       "sResponse\";\202\323\344\223\0025\0223/v1p3beta1/{parent=pr" +
       "ojects/*/locations/*}/products\022\243\001\n\nGetPr" +
       "oduct\0220.google.cloud.vision.v1p3beta1.Ge" +
-      "tProductRequest\032&.google.cloud.vision.v1" +
+      "tProductRequest\032&.google.cloud.vision.v1",
       "p3beta1.Product\";\202\323\344\223\0025\0223/v1p3beta1/{nam" +
       "e=projects/*/locations/*/products/*}\022\272\001\n" +
       "\rUpdateProduct\0223.google.cloud.vision.v1p" +
@@ -302,7 +302,7 @@ public static void registerAllExtensions(
       "ns/*/products/*}:\007product\022\231\001\n\rDeleteProd" +
       "uct\0223.google.cloud.vision.v1p3beta1.Dele" +
       "teProductRequest\032\026.google.protobuf.Empty" +
-      "\";\202\323\344\223\0025*3/v1p3beta1/{name=projects/*/lo" +
+      "\";\202\323\344\223\0025*3/v1p3beta1/{name=projects/*/lo",
       "cations/*/products/*}\022\341\001\n\024CreateReferenc" +
       "eImage\022:.google.cloud.vision.v1p3beta1.C" +
       "reateReferenceImageRequest\032-.google.clou" +
@@ -312,7 +312,7 @@ public static void registerAllExtensions(
       "nce_image\022\271\001\n\024DeleteReferenceImage\022:.goo" +
       "gle.cloud.vision.v1p3beta1.DeleteReferen" +
       "ceImageRequest\032\026.google.protobuf.Empty\"M" +
-      "\202\323\344\223\002G*E/v1p3beta1/{name=projects/*/loca" +
+      "\202\323\344\223\002G*E/v1p3beta1/{name=projects/*/loca",
       "tions/*/products/*/referenceImages/*}\022\333\001" +
       "\n\023ListReferenceImages\0229.google.cloud.vis" +
       "ion.v1p3beta1.ListReferenceImagesRequest" +
@@ -322,7 +322,7 @@ public static void registerAllExtensions(
       "/*}/referenceImages\022\312\001\n\021GetReferenceImag" +
       "e\0227.google.cloud.vision.v1p3beta1.GetRef" +
       "erenceImageRequest\032-.google.cloud.vision" +
-      ".v1p3beta1.ReferenceImage\"M\202\323\344\223\002G\022E/v1p3" +
+      ".v1p3beta1.ReferenceImage\"M\202\323\344\223\002G\022E/v1p3",
       "beta1/{name=projects/*/locations/*/produ" +
       "cts/*/referenceImages/*}\022\274\001\n\026AddProductT" +
       "oProductSet\022<.google.cloud.vision.v1p3be" +
@@ -332,7 +332,7 @@ public static void registerAllExtensions(
       "}:addProduct:\001*\022\311\001\n\033RemoveProductFromPro" +
       "ductSet\022A.google.cloud.vision.v1p3beta1." +
       "RemoveProductFromProductSetRequest\032\026.goo" +
-      "gle.protobuf.Empty\"O\202\323\344\223\002I\"D/v1p3beta1/{" +
+      "gle.protobuf.Empty\"O\202\323\344\223\002I\"D/v1p3beta1/{",
       "name=projects/*/locations/*/productSets/" +
       "*}:removeProduct:\001*\022\344\001\n\030ListProductsInPr" +
       "oductSet\022>.google.cloud.vision.v1p3beta1" +
@@ -342,7 +342,7 @@ public static void registerAllExtensions(
       "ame=projects/*/locations/*/productSets/*" +
       "}/products\022\265\001\n\021ImportProductSets\0227.googl" +
       "e.cloud.vision.v1p3beta1.ImportProductSe" +
-      "tsRequest\032\035.google.longrunning.Operation" +
+      "tsRequest\032\035.google.longrunning.Operation",
       "\"H\202\323\344\223\002B\"=/v1p3beta1/{parent=projects/*/" +
       "locations/*}/productSets:import:\001*B\210\001\n!c" +
       "om.google.cloud.vision.v1p3beta1B\031Produc" +
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSet.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSet.java
index 908dcdb664a8..cda46f1f73b7 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSet.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ProductSet.java
@@ -36,9 +36,6 @@ private ProductSet(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private ProductSet(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -88,13 +92,6 @@ private ProductSet(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -112,7 +109,6 @@ private ProductSet(
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ProductSet_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ProductSet_fieldAccessorTable
@@ -294,7 +290,6 @@ public com.google.rpc.StatusOrBuilder getIndexErrorOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -304,7 +299,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -322,7 +316,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -470,7 +463,6 @@ public static com.google.cloud.vision.v1p3beta1.ProductSet parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -478,7 +470,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.ProductSet prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -508,7 +499,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ProductSet_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ProductSet_fieldAccessorTable
@@ -531,7 +521,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -553,18 +542,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ProductSet_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ProductSet getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSet.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ProductSet build() {
       com.google.cloud.vision.v1p3beta1.ProductSet result = buildPartial();
       if (!result.isInitialized()) {
@@ -573,7 +559,6 @@ public com.google.cloud.vision.v1p3beta1.ProductSet build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ProductSet buildPartial() {
       com.google.cloud.vision.v1p3beta1.ProductSet result = new com.google.cloud.vision.v1p3beta1.ProductSet(this);
       result.name_ = name_;
@@ -592,39 +577,32 @@ public com.google.cloud.vision.v1p3beta1.ProductSet buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.ProductSet) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.ProductSet)other);
@@ -655,12 +633,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.ProductSet other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1227,13 +1203,11 @@ public com.google.rpc.StatusOrBuilder getIndexErrorOrBuilder() {
       }
       return indexErrorBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1255,12 +1229,11 @@ public static com.google.cloud.vision.v1p3beta1.ProductSet getDefaultInstance()
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ProductSet parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ProductSet(input, extensionRegistry);
+        return new ProductSet(input, extensionRegistry);
     }
   };
 
@@ -1273,7 +1246,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.ProductSet getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Property.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Property.java
index 6891df74cead..558d40c43393 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Property.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Property.java
@@ -35,9 +35,6 @@ private Property(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private Property(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private Property(
             uint64Value_ = input.readUInt64();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private Property(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_Property_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_Property_fieldAccessorTable
@@ -196,7 +192,6 @@ public long getUint64Value() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -206,7 +201,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -221,7 +215,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -352,7 +345,6 @@ public static com.google.cloud.vision.v1p3beta1.Property parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -360,7 +352,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.Property prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -388,7 +379,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_Property_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_Property_fieldAccessorTable
@@ -411,7 +401,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -423,18 +412,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_Property_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Property getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.Property.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Property build() {
       com.google.cloud.vision.v1p3beta1.Property result = buildPartial();
       if (!result.isInitialized()) {
@@ -443,7 +429,6 @@ public com.google.cloud.vision.v1p3beta1.Property build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Property buildPartial() {
       com.google.cloud.vision.v1p3beta1.Property result = new com.google.cloud.vision.v1p3beta1.Property(this);
       result.name_ = name_;
@@ -453,39 +438,32 @@ public com.google.cloud.vision.v1p3beta1.Property buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.Property) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.Property)other);
@@ -513,12 +491,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.Property other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -752,13 +728,11 @@ public Builder clearUint64Value() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -780,12 +754,11 @@ public static com.google.cloud.vision.v1p3beta1.Property getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Property parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Property(input, extensionRegistry);
+        return new Property(input, extensionRegistry);
     }
   };
 
@@ -798,7 +771,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.Property getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ReferenceImage.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ReferenceImage.java
index 9a06518319ee..335b12b83e6d 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ReferenceImage.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/ReferenceImage.java
@@ -36,9 +36,6 @@ private ReferenceImage(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private ReferenceImage(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -71,13 +75,6 @@ private ReferenceImage(
                 input.readMessage(com.google.cloud.vision.v1p3beta1.BoundingPoly.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -98,7 +95,6 @@ private ReferenceImage(
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ReferenceImage_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ReferenceImage_fieldAccessorTable
@@ -287,7 +283,6 @@ public com.google.cloud.vision.v1p3beta1.BoundingPolyOrBuilder getBoundingPolysO
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -297,7 +292,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -312,7 +306,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -444,7 +437,6 @@ public static com.google.cloud.vision.v1p3beta1.ReferenceImage parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -452,7 +444,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.ReferenceImage prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -481,7 +472,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ReferenceImage_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ReferenceImage_fieldAccessorTable
@@ -505,7 +495,6 @@ private void maybeForceBuilderInitialization() {
         getBoundingPolysFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -521,18 +510,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_ReferenceImage_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ReferenceImage getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.ReferenceImage.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ReferenceImage build() {
       com.google.cloud.vision.v1p3beta1.ReferenceImage result = buildPartial();
       if (!result.isInitialized()) {
@@ -541,7 +527,6 @@ public com.google.cloud.vision.v1p3beta1.ReferenceImage build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.ReferenceImage buildPartial() {
       com.google.cloud.vision.v1p3beta1.ReferenceImage result = new com.google.cloud.vision.v1p3beta1.ReferenceImage(this);
       int from_bitField0_ = bitField0_;
@@ -562,39 +547,32 @@ public com.google.cloud.vision.v1p3beta1.ReferenceImage buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.ReferenceImage) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.ReferenceImage)other);
@@ -645,12 +623,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.ReferenceImage other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1292,13 +1268,11 @@ public com.google.cloud.vision.v1p3beta1.BoundingPoly.Builder addBoundingPolysBu
       }
       return boundingPolysBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1320,12 +1294,11 @@ public static com.google.cloud.vision.v1p3beta1.ReferenceImage getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ReferenceImage parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ReferenceImage(input, extensionRegistry);
+        return new ReferenceImage(input, extensionRegistry);
     }
   };
 
@@ -1338,7 +1311,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.ReferenceImage getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/RemoveProductFromProductSetRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/RemoveProductFromProductSetRequest.java
index 0c45ba4603b1..adf6b89a6d07 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/RemoveProductFromProductSetRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/RemoveProductFromProductSetRequest.java
@@ -34,9 +34,6 @@ private RemoveProductFromProductSetRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private RemoveProductFromProductSetRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -60,13 +64,6 @@ private RemoveProductFromProductSetRequest(
             product_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private RemoveProductFromProductSetRequest(
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_RemoveProductFromProductSetRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_RemoveProductFromProductSetRequest_fieldAccessorTable
@@ -185,7 +181,6 @@ public java.lang.String getProduct() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -195,7 +190,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -207,7 +201,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -329,7 +322,6 @@ public static com.google.cloud.vision.v1p3beta1.RemoveProductFromProductSetReque
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -337,7 +329,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.RemoveProductFromProductSetRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -365,7 +356,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_RemoveProductFromProductSetRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_RemoveProductFromProductSetRequest_fieldAccessorTable
@@ -388,7 +378,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -398,18 +387,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_RemoveProductFromProductSetRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.RemoveProductFromProductSetRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.RemoveProductFromProductSetRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.RemoveProductFromProductSetRequest build() {
       com.google.cloud.vision.v1p3beta1.RemoveProductFromProductSetRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -418,7 +404,6 @@ public com.google.cloud.vision.v1p3beta1.RemoveProductFromProductSetRequest buil
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.RemoveProductFromProductSetRequest buildPartial() {
       com.google.cloud.vision.v1p3beta1.RemoveProductFromProductSetRequest result = new com.google.cloud.vision.v1p3beta1.RemoveProductFromProductSetRequest(this);
       result.name_ = name_;
@@ -427,39 +412,32 @@ public com.google.cloud.vision.v1p3beta1.RemoveProductFromProductSetRequest buil
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.RemoveProductFromProductSetRequest) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.RemoveProductFromProductSetRequest)other);
@@ -484,12 +462,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.RemoveProductFromProd
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -705,13 +681,11 @@ public Builder setProductBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -733,12 +707,11 @@ public static com.google.cloud.vision.v1p3beta1.RemoveProductFromProductSetReque
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public RemoveProductFromProductSetRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new RemoveProductFromProductSetRequest(input, extensionRegistry);
+        return new RemoveProductFromProductSetRequest(input, extensionRegistry);
     }
   };
 
@@ -751,7 +724,6 @@ public com.google.protobuf.Parser getParserF
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.RemoveProductFromProductSetRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/SafeSearchAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/SafeSearchAnnotation.java
index 06005ba4d45d..c0f96abd9a4d 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/SafeSearchAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/SafeSearchAnnotation.java
@@ -39,9 +39,6 @@ private SafeSearchAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private SafeSearchAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -83,13 +87,6 @@ private SafeSearchAnnotation(
             racy_ = rawValue;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -107,7 +104,6 @@ private SafeSearchAnnotation(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_SafeSearchAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_SafeSearchAnnotation_fieldAccessorTable
@@ -139,7 +135,6 @@ public int getAdultValue() {
    * .google.cloud.vision.v1p3beta1.Likelihood adult = 1;
    */
   public com.google.cloud.vision.v1p3beta1.Likelihood getAdult() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p3beta1.Likelihood result = com.google.cloud.vision.v1p3beta1.Likelihood.valueOf(adult_);
     return result == null ? com.google.cloud.vision.v1p3beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -168,7 +163,6 @@ public int getSpoofValue() {
    * .google.cloud.vision.v1p3beta1.Likelihood spoof = 2;
    */
   public com.google.cloud.vision.v1p3beta1.Likelihood getSpoof() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p3beta1.Likelihood result = com.google.cloud.vision.v1p3beta1.Likelihood.valueOf(spoof_);
     return result == null ? com.google.cloud.vision.v1p3beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -193,7 +187,6 @@ public int getMedicalValue() {
    * .google.cloud.vision.v1p3beta1.Likelihood medical = 3;
    */
   public com.google.cloud.vision.v1p3beta1.Likelihood getMedical() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p3beta1.Likelihood result = com.google.cloud.vision.v1p3beta1.Likelihood.valueOf(medical_);
     return result == null ? com.google.cloud.vision.v1p3beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -218,7 +211,6 @@ public int getViolenceValue() {
    * .google.cloud.vision.v1p3beta1.Likelihood violence = 4;
    */
   public com.google.cloud.vision.v1p3beta1.Likelihood getViolence() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p3beta1.Likelihood result = com.google.cloud.vision.v1p3beta1.Likelihood.valueOf(violence_);
     return result == null ? com.google.cloud.vision.v1p3beta1.Likelihood.UNRECOGNIZED : result;
   }
@@ -249,13 +241,11 @@ public int getRacyValue() {
    * .google.cloud.vision.v1p3beta1.Likelihood racy = 9;
    */
   public com.google.cloud.vision.v1p3beta1.Likelihood getRacy() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.vision.v1p3beta1.Likelihood result = com.google.cloud.vision.v1p3beta1.Likelihood.valueOf(racy_);
     return result == null ? com.google.cloud.vision.v1p3beta1.Likelihood.UNRECOGNIZED : result;
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -265,7 +255,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (adult_ != com.google.cloud.vision.v1p3beta1.Likelihood.UNKNOWN.getNumber()) {
@@ -286,7 +275,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -429,7 +417,6 @@ public static com.google.cloud.vision.v1p3beta1.SafeSearchAnnotation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -437,7 +424,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.SafeSearchAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -467,7 +453,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_SafeSearchAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_SafeSearchAnnotation_fieldAccessorTable
@@ -490,7 +475,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       adult_ = 0;
@@ -506,18 +490,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_SafeSearchAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.SafeSearchAnnotation getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.SafeSearchAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.SafeSearchAnnotation build() {
       com.google.cloud.vision.v1p3beta1.SafeSearchAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -526,7 +507,6 @@ public com.google.cloud.vision.v1p3beta1.SafeSearchAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.SafeSearchAnnotation buildPartial() {
       com.google.cloud.vision.v1p3beta1.SafeSearchAnnotation result = new com.google.cloud.vision.v1p3beta1.SafeSearchAnnotation(this);
       result.adult_ = adult_;
@@ -538,39 +518,32 @@ public com.google.cloud.vision.v1p3beta1.SafeSearchAnnotation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.SafeSearchAnnotation) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.SafeSearchAnnotation)other);
@@ -602,12 +575,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.SafeSearchAnnotation
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -663,7 +634,6 @@ public Builder setAdultValue(int value) {
      * .google.cloud.vision.v1p3beta1.Likelihood adult = 1;
      */
     public com.google.cloud.vision.v1p3beta1.Likelihood getAdult() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p3beta1.Likelihood result = com.google.cloud.vision.v1p3beta1.Likelihood.valueOf(adult_);
       return result == null ? com.google.cloud.vision.v1p3beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -738,7 +708,6 @@ public Builder setSpoofValue(int value) {
      * .google.cloud.vision.v1p3beta1.Likelihood spoof = 2;
      */
     public com.google.cloud.vision.v1p3beta1.Likelihood getSpoof() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p3beta1.Likelihood result = com.google.cloud.vision.v1p3beta1.Likelihood.valueOf(spoof_);
       return result == null ? com.google.cloud.vision.v1p3beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -807,7 +776,6 @@ public Builder setMedicalValue(int value) {
      * .google.cloud.vision.v1p3beta1.Likelihood medical = 3;
      */
     public com.google.cloud.vision.v1p3beta1.Likelihood getMedical() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p3beta1.Likelihood result = com.google.cloud.vision.v1p3beta1.Likelihood.valueOf(medical_);
       return result == null ? com.google.cloud.vision.v1p3beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -872,7 +840,6 @@ public Builder setViolenceValue(int value) {
      * .google.cloud.vision.v1p3beta1.Likelihood violence = 4;
      */
     public com.google.cloud.vision.v1p3beta1.Likelihood getViolence() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p3beta1.Likelihood result = com.google.cloud.vision.v1p3beta1.Likelihood.valueOf(violence_);
       return result == null ? com.google.cloud.vision.v1p3beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -946,7 +913,6 @@ public Builder setRacyValue(int value) {
      * .google.cloud.vision.v1p3beta1.Likelihood racy = 9;
      */
     public com.google.cloud.vision.v1p3beta1.Likelihood getRacy() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p3beta1.Likelihood result = com.google.cloud.vision.v1p3beta1.Likelihood.valueOf(racy_);
       return result == null ? com.google.cloud.vision.v1p3beta1.Likelihood.UNRECOGNIZED : result;
     }
@@ -985,13 +951,11 @@ public Builder clearRacy() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1013,12 +977,11 @@ public static com.google.cloud.vision.v1p3beta1.SafeSearchAnnotation getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public SafeSearchAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new SafeSearchAnnotation(input, extensionRegistry);
+        return new SafeSearchAnnotation(input, extensionRegistry);
     }
   };
 
@@ -1031,7 +994,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.SafeSearchAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Symbol.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Symbol.java
index a42b8ad394ab..7cd41c4f8707 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Symbol.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Symbol.java
@@ -34,9 +34,6 @@ private Symbol(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private Symbol(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p3beta1.TextAnnotation.TextProperty.Builder subBuilder = null;
             if (property_ != null) {
@@ -85,13 +89,6 @@ private Symbol(
             confidence_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -109,7 +106,6 @@ private Symbol(
     return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_Symbol_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_Symbol_fieldAccessorTable
@@ -281,7 +277,6 @@ public float getConfidence() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -291,7 +286,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (property_ != null) {
@@ -309,7 +303,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -461,7 +454,6 @@ public static com.google.cloud.vision.v1p3beta1.Symbol parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -469,7 +461,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.Symbol prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -497,7 +488,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_Symbol_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_Symbol_fieldAccessorTable
@@ -520,7 +510,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (propertyBuilder_ == null) {
@@ -542,18 +531,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_Symbol_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Symbol getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.Symbol.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Symbol build() {
       com.google.cloud.vision.v1p3beta1.Symbol result = buildPartial();
       if (!result.isInitialized()) {
@@ -562,7 +548,6 @@ public com.google.cloud.vision.v1p3beta1.Symbol build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Symbol buildPartial() {
       com.google.cloud.vision.v1p3beta1.Symbol result = new com.google.cloud.vision.v1p3beta1.Symbol(this);
       if (propertyBuilder_ == null) {
@@ -581,39 +566,32 @@ public com.google.cloud.vision.v1p3beta1.Symbol buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.Symbol) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.Symbol)other);
@@ -643,12 +621,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.Symbol other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1225,13 +1201,11 @@ public Builder clearConfidence() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1253,12 +1227,11 @@ public static com.google.cloud.vision.v1p3beta1.Symbol getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Symbol parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Symbol(input, extensionRegistry);
+        return new Symbol(input, extensionRegistry);
     }
   };
 
@@ -1271,7 +1244,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.Symbol getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/TextAnnotation.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/TextAnnotation.java
index 45a48af0634c..8aab5484c1d8 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/TextAnnotation.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/TextAnnotation.java
@@ -40,9 +40,6 @@ private TextAnnotation(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -54,6 +51,13 @@ private TextAnnotation(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               pages_ = new java.util.ArrayList();
@@ -69,13 +73,6 @@ private TextAnnotation(
             text_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private TextAnnotation(
     return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_TextAnnotation_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_TextAnnotation_fieldAccessorTable
@@ -170,9 +166,6 @@ private DetectedLanguage(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -184,6 +177,13 @@ private DetectedLanguage(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -195,13 +195,6 @@ private DetectedLanguage(
               confidence_ = input.readFloat();
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -219,7 +212,6 @@ private DetectedLanguage(
       return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_TextAnnotation_DetectedLanguage_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_TextAnnotation_DetectedLanguage_fieldAccessorTable
@@ -287,7 +279,6 @@ public float getConfidence() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -297,7 +288,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getLanguageCodeBytes().isEmpty()) {
@@ -309,7 +299,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -435,7 +424,6 @@ public static com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedLanguage
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -443,7 +431,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedLanguage prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -471,7 +458,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_TextAnnotation_DetectedLanguage_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_TextAnnotation_DetectedLanguage_fieldAccessorTable
@@ -494,7 +480,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         languageCode_ = "";
@@ -504,18 +489,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_TextAnnotation_DetectedLanguage_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedLanguage getDefaultInstanceForType() {
         return com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedLanguage.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedLanguage build() {
         com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedLanguage result = buildPartial();
         if (!result.isInitialized()) {
@@ -524,7 +506,6 @@ public com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedLanguage build()
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedLanguage buildPartial() {
         com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedLanguage result = new com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedLanguage(this);
         result.languageCode_ = languageCode_;
@@ -533,39 +514,32 @@ public com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedLanguage buildPa
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedLanguage) {
           return mergeFrom((com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedLanguage)other);
@@ -589,12 +563,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.TextAnnotation.Detect
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -749,13 +721,11 @@ public Builder clearConfidence() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -777,12 +747,11 @@ public static com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedLanguage
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public DetectedLanguage parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new DetectedLanguage(input, extensionRegistry);
+          return new DetectedLanguage(input, extensionRegistry);
       }
     };
 
@@ -795,7 +764,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedLanguage getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -863,9 +831,6 @@ private DetectedBreak(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -877,6 +842,13 @@ private DetectedBreak(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 8: {
               int rawValue = input.readEnum();
 
@@ -888,13 +860,6 @@ private DetectedBreak(
               isPrefix_ = input.readBool();
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -912,7 +877,6 @@ private DetectedBreak(
       return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_TextAnnotation_DetectedBreak_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_TextAnnotation_DetectedBreak_fieldAccessorTable
@@ -1128,7 +1092,6 @@ public int getTypeValue() {
      * .google.cloud.vision.v1p3beta1.TextAnnotation.DetectedBreak.BreakType type = 1;
      */
     public com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedBreak.BreakType getType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedBreak.BreakType result = com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedBreak.BreakType.valueOf(type_);
       return result == null ? com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedBreak.BreakType.UNRECOGNIZED : result;
     }
@@ -1147,7 +1110,6 @@ public boolean getIsPrefix() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1157,7 +1119,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (type_ != com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedBreak.BreakType.UNKNOWN.getNumber()) {
@@ -1169,7 +1130,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -1293,7 +1253,6 @@ public static com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedBreak par
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -1301,7 +1260,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedBreak prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -1329,7 +1287,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_TextAnnotation_DetectedBreak_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_TextAnnotation_DetectedBreak_fieldAccessorTable
@@ -1352,7 +1309,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         type_ = 0;
@@ -1362,18 +1318,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_TextAnnotation_DetectedBreak_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedBreak getDefaultInstanceForType() {
         return com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedBreak.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedBreak build() {
         com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedBreak result = buildPartial();
         if (!result.isInitialized()) {
@@ -1382,7 +1335,6 @@ public com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedBreak build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedBreak buildPartial() {
         com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedBreak result = new com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedBreak(this);
         result.type_ = type_;
@@ -1391,39 +1343,32 @@ public com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedBreak buildParti
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedBreak) {
           return mergeFrom((com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedBreak)other);
@@ -1446,12 +1391,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.TextAnnotation.Detect
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1501,7 +1444,6 @@ public Builder setTypeValue(int value) {
        * .google.cloud.vision.v1p3beta1.TextAnnotation.DetectedBreak.BreakType type = 1;
        */
       public com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedBreak.BreakType getType() {
-        @SuppressWarnings("deprecation")
         com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedBreak.BreakType result = com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedBreak.BreakType.valueOf(type_);
         return result == null ? com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedBreak.BreakType.UNRECOGNIZED : result;
       }
@@ -1572,13 +1514,11 @@ public Builder clearIsPrefix() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1600,12 +1540,11 @@ public static com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedBreak get
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public DetectedBreak parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new DetectedBreak(input, extensionRegistry);
+          return new DetectedBreak(input, extensionRegistry);
       }
     };
 
@@ -1618,7 +1557,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedBreak getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1728,9 +1666,6 @@ private TextProperty(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1742,6 +1677,13 @@ private TextProperty(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
                 detectedLanguages_ = new java.util.ArrayList();
@@ -1764,13 +1706,6 @@ private TextProperty(
 
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1791,7 +1726,6 @@ private TextProperty(
       return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_TextAnnotation_TextProperty_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_TextAnnotation_TextProperty_fieldAccessorTable
@@ -1889,7 +1823,6 @@ public com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedBreakOrBuilder g
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1899,7 +1832,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       for (int i = 0; i < detectedLanguages_.size(); i++) {
@@ -1911,7 +1843,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -2042,7 +1973,6 @@ public static com.google.cloud.vision.v1p3beta1.TextAnnotation.TextProperty pars
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -2050,7 +1980,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.TextAnnotation.TextProperty prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -2078,7 +2007,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_TextAnnotation_TextProperty_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_TextAnnotation_TextProperty_fieldAccessorTable
@@ -2102,7 +2030,6 @@ private void maybeForceBuilderInitialization() {
           getDetectedLanguagesFieldBuilder();
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         if (detectedLanguagesBuilder_ == null) {
@@ -2120,18 +2047,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_TextAnnotation_TextProperty_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.TextAnnotation.TextProperty getDefaultInstanceForType() {
         return com.google.cloud.vision.v1p3beta1.TextAnnotation.TextProperty.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.TextAnnotation.TextProperty build() {
         com.google.cloud.vision.v1p3beta1.TextAnnotation.TextProperty result = buildPartial();
         if (!result.isInitialized()) {
@@ -2140,7 +2064,6 @@ public com.google.cloud.vision.v1p3beta1.TextAnnotation.TextProperty build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.TextAnnotation.TextProperty buildPartial() {
         com.google.cloud.vision.v1p3beta1.TextAnnotation.TextProperty result = new com.google.cloud.vision.v1p3beta1.TextAnnotation.TextProperty(this);
         int from_bitField0_ = bitField0_;
@@ -2164,39 +2087,32 @@ public com.google.cloud.vision.v1p3beta1.TextAnnotation.TextProperty buildPartia
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1p3beta1.TextAnnotation.TextProperty) {
           return mergeFrom((com.google.cloud.vision.v1p3beta1.TextAnnotation.TextProperty)other);
@@ -2242,12 +2158,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.TextAnnotation.TextPr
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2731,13 +2645,11 @@ public com.google.cloud.vision.v1p3beta1.TextAnnotation.DetectedBreakOrBuilder g
         }
         return detectedBreakBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -2759,12 +2671,11 @@ public static com.google.cloud.vision.v1p3beta1.TextAnnotation.TextProperty getD
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public TextProperty parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new TextProperty(input, extensionRegistry);
+          return new TextProperty(input, extensionRegistry);
       }
     };
 
@@ -2777,7 +2688,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.TextAnnotation.TextProperty getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -2883,7 +2793,6 @@ public java.lang.String getText() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -2893,7 +2802,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < pages_.size(); i++) {
@@ -2905,7 +2813,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -3030,7 +2937,6 @@ public static com.google.cloud.vision.v1p3beta1.TextAnnotation parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -3038,7 +2944,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.TextAnnotation prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -3072,7 +2977,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_TextAnnotation_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_TextAnnotation_fieldAccessorTable
@@ -3096,7 +3000,6 @@ private void maybeForceBuilderInitialization() {
         getPagesFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (pagesBuilder_ == null) {
@@ -3110,18 +3013,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_TextAnnotation_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.TextAnnotation getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.TextAnnotation.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.TextAnnotation build() {
       com.google.cloud.vision.v1p3beta1.TextAnnotation result = buildPartial();
       if (!result.isInitialized()) {
@@ -3130,7 +3030,6 @@ public com.google.cloud.vision.v1p3beta1.TextAnnotation build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.TextAnnotation buildPartial() {
       com.google.cloud.vision.v1p3beta1.TextAnnotation result = new com.google.cloud.vision.v1p3beta1.TextAnnotation(this);
       int from_bitField0_ = bitField0_;
@@ -3150,39 +3049,32 @@ public com.google.cloud.vision.v1p3beta1.TextAnnotation buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.TextAnnotation) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.TextAnnotation)other);
@@ -3229,12 +3121,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.TextAnnotation other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3654,13 +3544,11 @@ public Builder setTextBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -3682,12 +3570,11 @@ public static com.google.cloud.vision.v1p3beta1.TextAnnotation getDefaultInstanc
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public TextAnnotation parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new TextAnnotation(input, extensionRegistry);
+        return new TextAnnotation(input, extensionRegistry);
     }
   };
 
@@ -3700,7 +3587,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.TextAnnotation getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/TextAnnotationProto.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/TextAnnotationProto.java
index 47d12d93f8e0..9718e5fc78d4 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/TextAnnotationProto.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/TextAnnotationProto.java
@@ -77,7 +77,7 @@ public static void registerAllExtensions(
       "\002 \001(\t\032=\n\020DetectedLanguage\022\025\n\rlanguage_co" +
       "de\030\001 \001(\t\022\022\n\nconfidence\030\002 \001(\002\032\334\001\n\rDetecte" +
       "dBreak\022S\n\004type\030\001 \001(\0162E.google.cloud.visi" +
-      "on.v1p3beta1.TextAnnotation.DetectedBrea" +
+      "on.v1p3beta1.TextAnnotation.DetectedBrea",
       "k.BreakType\022\021\n\tis_prefix\030\002 \001(\010\"c\n\tBreakT" +
       "ype\022\013\n\007UNKNOWN\020\000\022\t\n\005SPACE\020\001\022\016\n\nSURE_SPAC" +
       "E\020\002\022\022\n\016EOL_SURE_SPACE\020\003\022\n\n\006HYPHEN\020\004\022\016\n\nL" +
@@ -87,7 +87,7 @@ public static void registerAllExtensions(
       "\022S\n\016detected_break\030\002 \001(\0132;.google.cloud." +
       "vision.v1p3beta1.TextAnnotation.Detected" +
       "Break\"\275\001\n\004Page\022L\n\010property\030\001 \001(\0132:.googl" +
-      "e.cloud.vision.v1p3beta1.TextAnnotation." +
+      "e.cloud.vision.v1p3beta1.TextAnnotation.",
       "TextProperty\022\r\n\005width\030\002 \001(\005\022\016\n\006height\030\003 " +
       "\001(\005\0224\n\006blocks\030\004 \003(\0132$.google.cloud.visio" +
       "n.v1p3beta1.Block\022\022\n\nconfidence\030\005 \001(\002\"\202\003" +
@@ -97,7 +97,7 @@ public static void registerAllExtensions(
       "ud.vision.v1p3beta1.BoundingPoly\022<\n\npara" +
       "graphs\030\003 \003(\0132(.google.cloud.vision.v1p3b" +
       "eta1.Paragraph\022B\n\nblock_type\030\004 \001(\0162..goo" +
-      "gle.cloud.vision.v1p3beta1.Block.BlockTy" +
+      "gle.cloud.vision.v1p3beta1.Block.BlockTy",
       "pe\022\022\n\nconfidence\030\005 \001(\002\"R\n\tBlockType\022\013\n\007U" +
       "NKNOWN\020\000\022\010\n\004TEXT\020\001\022\t\n\005TABLE\020\002\022\013\n\007PICTURE" +
       "\020\003\022\t\n\005RULER\020\004\022\013\n\007BARCODE\020\005\"\344\001\n\tParagraph" +
@@ -107,7 +107,7 @@ public static void registerAllExtensions(
       "on.v1p3beta1.BoundingPoly\0222\n\005words\030\003 \003(\013" +
       "2#.google.cloud.vision.v1p3beta1.Word\022\022\n" +
       "\nconfidence\030\004 \001(\002\"\343\001\n\004Word\022L\n\010property\030\001" +
-      " \001(\0132:.google.cloud.vision.v1p3beta1.Tex" +
+      " \001(\0132:.google.cloud.vision.v1p3beta1.Tex",
       "tAnnotation.TextProperty\022A\n\014bounding_box" +
       "\030\002 \001(\0132+.google.cloud.vision.v1p3beta1.B" +
       "oundingPoly\0226\n\007symbols\030\003 \003(\0132%.google.cl" +
@@ -117,7 +117,7 @@ public static void registerAllExtensions(
       "ion.TextProperty\022A\n\014bounding_box\030\002 \001(\0132+" +
       ".google.cloud.vision.v1p3beta1.BoundingP" +
       "oly\022\014\n\004text\030\003 \001(\t\022\022\n\nconfidence\030\004 \001(\002B\202\001" +
-      "\n!com.google.cloud.vision.v1p3beta1B\023Tex" +
+      "\n!com.google.cloud.vision.v1p3beta1B\023Tex",
       "tAnnotationProtoP\001ZCgoogle.golang.org/ge" +
       "nproto/googleapis/cloud/vision/v1p3beta1" +
       ";vision\370\001\001b\006proto3"
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/UpdateProductRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/UpdateProductRequest.java
index cbd0cc4c50ab..4918a8d2cc1c 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/UpdateProductRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/UpdateProductRequest.java
@@ -32,9 +32,6 @@ private UpdateProductRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private UpdateProductRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p3beta1.Product.Builder subBuilder = null;
             if (product_ != null) {
@@ -72,13 +76,6 @@ private UpdateProductRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private UpdateProductRequest(
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_UpdateProductRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_UpdateProductRequest_fieldAccessorTable
@@ -186,7 +182,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -196,7 +191,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (product_ != null) {
@@ -208,7 +202,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -342,7 +335,6 @@ public static com.google.cloud.vision.v1p3beta1.UpdateProductRequest parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -350,7 +342,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.UpdateProductRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -378,7 +369,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_UpdateProductRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_UpdateProductRequest_fieldAccessorTable
@@ -401,7 +391,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (productBuilder_ == null) {
@@ -419,18 +408,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_UpdateProductRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.UpdateProductRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.UpdateProductRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.UpdateProductRequest build() {
       com.google.cloud.vision.v1p3beta1.UpdateProductRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -439,7 +425,6 @@ public com.google.cloud.vision.v1p3beta1.UpdateProductRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.UpdateProductRequest buildPartial() {
       com.google.cloud.vision.v1p3beta1.UpdateProductRequest result = new com.google.cloud.vision.v1p3beta1.UpdateProductRequest(this);
       if (productBuilder_ == null) {
@@ -456,39 +441,32 @@ public com.google.cloud.vision.v1p3beta1.UpdateProductRequest buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.UpdateProductRequest) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.UpdateProductRequest)other);
@@ -511,12 +489,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.UpdateProductRequest
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -885,13 +861,11 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
       }
       return updateMaskBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -913,12 +887,11 @@ public static com.google.cloud.vision.v1p3beta1.UpdateProductRequest getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateProductRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateProductRequest(input, extensionRegistry);
+        return new UpdateProductRequest(input, extensionRegistry);
     }
   };
 
@@ -931,7 +904,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.UpdateProductRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/UpdateProductSetRequest.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/UpdateProductSetRequest.java
index 4b066840245b..1cd88da2a9aa 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/UpdateProductSetRequest.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/UpdateProductSetRequest.java
@@ -32,9 +32,6 @@ private UpdateProductSetRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private UpdateProductSetRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p3beta1.ProductSet.Builder subBuilder = null;
             if (productSet_ != null) {
@@ -72,13 +76,6 @@ private UpdateProductSetRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private UpdateProductSetRequest(
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_UpdateProductSetRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_UpdateProductSetRequest_fieldAccessorTable
@@ -180,7 +176,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -190,7 +185,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (productSet_ != null) {
@@ -202,7 +196,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -336,7 +329,6 @@ public static com.google.cloud.vision.v1p3beta1.UpdateProductSetRequest parseFro
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -344,7 +336,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.UpdateProductSetRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -372,7 +363,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_UpdateProductSetRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_UpdateProductSetRequest_fieldAccessorTable
@@ -395,7 +385,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (productSetBuilder_ == null) {
@@ -413,18 +402,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ProductSearchServiceProto.internal_static_google_cloud_vision_v1p3beta1_UpdateProductSetRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.UpdateProductSetRequest getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.UpdateProductSetRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.UpdateProductSetRequest build() {
       com.google.cloud.vision.v1p3beta1.UpdateProductSetRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -433,7 +419,6 @@ public com.google.cloud.vision.v1p3beta1.UpdateProductSetRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.UpdateProductSetRequest buildPartial() {
       com.google.cloud.vision.v1p3beta1.UpdateProductSetRequest result = new com.google.cloud.vision.v1p3beta1.UpdateProductSetRequest(this);
       if (productSetBuilder_ == null) {
@@ -450,39 +435,32 @@ public com.google.cloud.vision.v1p3beta1.UpdateProductSetRequest buildPartial()
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.UpdateProductSetRequest) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.UpdateProductSetRequest)other);
@@ -505,12 +483,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.UpdateProductSetReque
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -861,13 +837,11 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
       }
       return updateMaskBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -889,12 +863,11 @@ public static com.google.cloud.vision.v1p3beta1.UpdateProductSetRequest getDefau
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateProductSetRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateProductSetRequest(input, extensionRegistry);
+        return new UpdateProductSetRequest(input, extensionRegistry);
     }
   };
 
@@ -907,7 +880,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.UpdateProductSetRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Vertex.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Vertex.java
index 4fcc3e70ebff..864ce41cf06d 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Vertex.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Vertex.java
@@ -35,9 +35,6 @@ private Vertex(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private Vertex(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
 
             x_ = input.readInt32();
@@ -59,13 +63,6 @@ private Vertex(
             y_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private Vertex(
     return com.google.cloud.vision.v1p3beta1.GeometryProto.internal_static_google_cloud_vision_v1p3beta1_Vertex_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.GeometryProto.internal_static_google_cloud_vision_v1p3beta1_Vertex_fieldAccessorTable
@@ -118,7 +114,6 @@ public int getY() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -128,7 +123,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (x_ != 0) {
@@ -140,7 +134,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -264,7 +257,6 @@ public static com.google.cloud.vision.v1p3beta1.Vertex parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -272,7 +264,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.Vertex prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -301,7 +292,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.GeometryProto.internal_static_google_cloud_vision_v1p3beta1_Vertex_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.GeometryProto.internal_static_google_cloud_vision_v1p3beta1_Vertex_fieldAccessorTable
@@ -324,7 +314,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       x_ = 0;
@@ -334,18 +323,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.GeometryProto.internal_static_google_cloud_vision_v1p3beta1_Vertex_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Vertex getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.Vertex.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Vertex build() {
       com.google.cloud.vision.v1p3beta1.Vertex result = buildPartial();
       if (!result.isInitialized()) {
@@ -354,7 +340,6 @@ public com.google.cloud.vision.v1p3beta1.Vertex build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Vertex buildPartial() {
       com.google.cloud.vision.v1p3beta1.Vertex result = new com.google.cloud.vision.v1p3beta1.Vertex(this);
       result.x_ = x_;
@@ -363,39 +348,32 @@ public com.google.cloud.vision.v1p3beta1.Vertex buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.Vertex) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.Vertex)other);
@@ -418,12 +396,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.Vertex other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -517,13 +493,11 @@ public Builder clearY() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -545,12 +519,11 @@ public static com.google.cloud.vision.v1p3beta1.Vertex getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Vertex parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Vertex(input, extensionRegistry);
+        return new Vertex(input, extensionRegistry);
     }
   };
 
@@ -563,7 +536,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.Vertex getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/WebDetection.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/WebDetection.java
index f82390c8a350..1204856bccf0 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/WebDetection.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/WebDetection.java
@@ -38,9 +38,6 @@ private WebDetection(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -52,6 +49,13 @@ private WebDetection(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               webEntities_ = new java.util.ArrayList();
@@ -106,13 +110,6 @@ private WebDetection(
                 input.readMessage(com.google.cloud.vision.v1p3beta1.WebDetection.WebLabel.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -148,7 +145,6 @@ private WebDetection(
     return com.google.cloud.vision.v1p3beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p3beta1_WebDetection_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p3beta1_WebDetection_fieldAccessorTable
@@ -238,9 +234,6 @@ private WebEntity(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -252,6 +245,13 @@ private WebEntity(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -269,13 +269,6 @@ private WebEntity(
               description_ = s;
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -293,7 +286,6 @@ private WebEntity(
       return com.google.cloud.vision.v1p3beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p3beta1_WebDetection_WebEntity_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p3beta1_WebDetection_WebEntity_fieldAccessorTable
@@ -400,7 +392,6 @@ public java.lang.String getDescription() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -410,7 +401,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getEntityIdBytes().isEmpty()) {
@@ -425,7 +415,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -558,7 +547,6 @@ public static com.google.cloud.vision.v1p3beta1.WebDetection.WebEntity parseFrom
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -566,7 +554,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.WebDetection.WebEntity prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -594,7 +581,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1p3beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p3beta1_WebDetection_WebEntity_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1p3beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p3beta1_WebDetection_WebEntity_fieldAccessorTable
@@ -617,7 +603,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         entityId_ = "";
@@ -629,18 +614,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1p3beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p3beta1_WebDetection_WebEntity_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.WebDetection.WebEntity getDefaultInstanceForType() {
         return com.google.cloud.vision.v1p3beta1.WebDetection.WebEntity.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.WebDetection.WebEntity build() {
         com.google.cloud.vision.v1p3beta1.WebDetection.WebEntity result = buildPartial();
         if (!result.isInitialized()) {
@@ -649,7 +631,6 @@ public com.google.cloud.vision.v1p3beta1.WebDetection.WebEntity build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.WebDetection.WebEntity buildPartial() {
         com.google.cloud.vision.v1p3beta1.WebDetection.WebEntity result = new com.google.cloud.vision.v1p3beta1.WebDetection.WebEntity(this);
         result.entityId_ = entityId_;
@@ -659,39 +640,32 @@ public com.google.cloud.vision.v1p3beta1.WebDetection.WebEntity buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1p3beta1.WebDetection.WebEntity) {
           return mergeFrom((com.google.cloud.vision.v1p3beta1.WebDetection.WebEntity)other);
@@ -719,12 +693,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.WebDetection.WebEntit
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -961,13 +933,11 @@ public Builder setDescriptionBytes(
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -989,12 +959,11 @@ public static com.google.cloud.vision.v1p3beta1.WebDetection.WebEntity getDefaul
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public WebEntity parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new WebEntity(input, extensionRegistry);
+          return new WebEntity(input, extensionRegistry);
       }
     };
 
@@ -1007,7 +976,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.WebDetection.WebEntity getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1076,9 +1044,6 @@ private WebImage(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1090,6 +1055,13 @@ private WebImage(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -1101,13 +1073,6 @@ private WebImage(
               score_ = input.readFloat();
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1125,7 +1090,6 @@ private WebImage(
       return com.google.cloud.vision.v1p3beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p3beta1_WebDetection_WebImage_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p3beta1_WebDetection_WebImage_fieldAccessorTable
@@ -1189,7 +1153,6 @@ public float getScore() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -1199,7 +1162,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getUrlBytes().isEmpty()) {
@@ -1211,7 +1173,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -1337,7 +1298,6 @@ public static com.google.cloud.vision.v1p3beta1.WebDetection.WebImage parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -1345,7 +1305,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.WebDetection.WebImage prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -1373,7 +1332,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1p3beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p3beta1_WebDetection_WebImage_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1p3beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p3beta1_WebDetection_WebImage_fieldAccessorTable
@@ -1396,7 +1354,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         url_ = "";
@@ -1406,18 +1363,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1p3beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p3beta1_WebDetection_WebImage_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.WebDetection.WebImage getDefaultInstanceForType() {
         return com.google.cloud.vision.v1p3beta1.WebDetection.WebImage.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.WebDetection.WebImage build() {
         com.google.cloud.vision.v1p3beta1.WebDetection.WebImage result = buildPartial();
         if (!result.isInitialized()) {
@@ -1426,7 +1380,6 @@ public com.google.cloud.vision.v1p3beta1.WebDetection.WebImage build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.WebDetection.WebImage buildPartial() {
         com.google.cloud.vision.v1p3beta1.WebDetection.WebImage result = new com.google.cloud.vision.v1p3beta1.WebDetection.WebImage(this);
         result.url_ = url_;
@@ -1435,39 +1388,32 @@ public com.google.cloud.vision.v1p3beta1.WebDetection.WebImage buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1p3beta1.WebDetection.WebImage) {
           return mergeFrom((com.google.cloud.vision.v1p3beta1.WebDetection.WebImage)other);
@@ -1491,12 +1437,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.WebDetection.WebImage
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1641,13 +1585,11 @@ public Builder clearScore() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -1669,12 +1611,11 @@ public static com.google.cloud.vision.v1p3beta1.WebDetection.WebImage getDefault
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public WebImage parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new WebImage(input, extensionRegistry);
+          return new WebImage(input, extensionRegistry);
       }
     };
 
@@ -1687,7 +1628,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.WebDetection.WebImage getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -1885,9 +1825,6 @@ private WebPage(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1899,6 +1836,13 @@ private WebPage(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -1934,13 +1878,6 @@ private WebPage(
                   input.readMessage(com.google.cloud.vision.v1p3beta1.WebDetection.WebImage.parser(), extensionRegistry));
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1964,7 +1901,6 @@ private WebPage(
       return com.google.cloud.vision.v1p3beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p3beta1_WebDetection_WebPage_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p3beta1_WebDetection_WebPage_fieldAccessorTable
@@ -2201,7 +2137,6 @@ public com.google.cloud.vision.v1p3beta1.WebDetection.WebImageOrBuilder getParti
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -2211,7 +2146,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getUrlBytes().isEmpty()) {
@@ -2232,7 +2166,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -2385,7 +2318,6 @@ public static com.google.cloud.vision.v1p3beta1.WebDetection.WebPage parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -2393,7 +2325,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.WebDetection.WebPage prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -2421,7 +2352,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1p3beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p3beta1_WebDetection_WebPage_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1p3beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p3beta1_WebDetection_WebPage_fieldAccessorTable
@@ -2446,7 +2376,6 @@ private void maybeForceBuilderInitialization() {
           getPartialMatchingImagesFieldBuilder();
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         url_ = "";
@@ -2470,18 +2399,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1p3beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p3beta1_WebDetection_WebPage_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.WebDetection.WebPage getDefaultInstanceForType() {
         return com.google.cloud.vision.v1p3beta1.WebDetection.WebPage.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.WebDetection.WebPage build() {
         com.google.cloud.vision.v1p3beta1.WebDetection.WebPage result = buildPartial();
         if (!result.isInitialized()) {
@@ -2490,7 +2416,6 @@ public com.google.cloud.vision.v1p3beta1.WebDetection.WebPage build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.WebDetection.WebPage buildPartial() {
         com.google.cloud.vision.v1p3beta1.WebDetection.WebPage result = new com.google.cloud.vision.v1p3beta1.WebDetection.WebPage(this);
         int from_bitField0_ = bitField0_;
@@ -2521,39 +2446,32 @@ public com.google.cloud.vision.v1p3beta1.WebDetection.WebPage buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1p3beta1.WebDetection.WebPage) {
           return mergeFrom((com.google.cloud.vision.v1p3beta1.WebDetection.WebPage)other);
@@ -2633,12 +2551,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.WebDetection.WebPage
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3569,13 +3485,11 @@ public com.google.cloud.vision.v1p3beta1.WebDetection.WebImage.Builder addPartia
         }
         return partialMatchingImagesBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -3597,12 +3511,11 @@ public static com.google.cloud.vision.v1p3beta1.WebDetection.WebPage getDefaultI
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public WebPage parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new WebPage(input, extensionRegistry);
+          return new WebPage(input, extensionRegistry);
       }
     };
 
@@ -3615,7 +3528,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.WebDetection.WebPage getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -3697,9 +3609,6 @@ private WebLabel(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3711,6 +3620,13 @@ private WebLabel(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               java.lang.String s = input.readStringRequireUtf8();
 
@@ -3723,13 +3639,6 @@ private WebLabel(
               languageCode_ = s;
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -3747,7 +3656,6 @@ private WebLabel(
       return com.google.cloud.vision.v1p3beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p3beta1_WebDetection_WebLabel_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p3beta1_WebDetection_WebLabel_fieldAccessorTable
@@ -3844,7 +3752,6 @@ public java.lang.String getLanguageCode() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -3854,7 +3761,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (!getLabelBytes().isEmpty()) {
@@ -3866,7 +3772,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -3988,7 +3893,6 @@ public static com.google.cloud.vision.v1p3beta1.WebDetection.WebLabel parseFrom(
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -3996,7 +3900,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.WebDetection.WebLabel prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -4024,7 +3927,6 @@ public static final class Builder extends
         return com.google.cloud.vision.v1p3beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p3beta1_WebDetection_WebLabel_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.vision.v1p3beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p3beta1_WebDetection_WebLabel_fieldAccessorTable
@@ -4047,7 +3949,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         label_ = "";
@@ -4057,18 +3958,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.vision.v1p3beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p3beta1_WebDetection_WebLabel_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.WebDetection.WebLabel getDefaultInstanceForType() {
         return com.google.cloud.vision.v1p3beta1.WebDetection.WebLabel.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.WebDetection.WebLabel build() {
         com.google.cloud.vision.v1p3beta1.WebDetection.WebLabel result = buildPartial();
         if (!result.isInitialized()) {
@@ -4077,7 +3975,6 @@ public com.google.cloud.vision.v1p3beta1.WebDetection.WebLabel build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.vision.v1p3beta1.WebDetection.WebLabel buildPartial() {
         com.google.cloud.vision.v1p3beta1.WebDetection.WebLabel result = new com.google.cloud.vision.v1p3beta1.WebDetection.WebLabel(this);
         result.label_ = label_;
@@ -4086,39 +3983,32 @@ public com.google.cloud.vision.v1p3beta1.WebDetection.WebLabel buildPartial() {
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.vision.v1p3beta1.WebDetection.WebLabel) {
           return mergeFrom((com.google.cloud.vision.v1p3beta1.WebDetection.WebLabel)other);
@@ -4143,12 +4033,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.WebDetection.WebLabel
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4354,13 +4242,11 @@ public Builder setLanguageCodeBytes(
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -4382,12 +4268,11 @@ public static com.google.cloud.vision.v1p3beta1.WebDetection.WebLabel getDefault
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public WebLabel parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new WebLabel(input, extensionRegistry);
+          return new WebLabel(input, extensionRegistry);
       }
     };
 
@@ -4400,7 +4285,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.WebDetection.WebLabel getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -4753,7 +4637,6 @@ public com.google.cloud.vision.v1p3beta1.WebDetection.WebLabelOrBuilder getBestG
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -4763,7 +4646,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < webEntities_.size(); i++) {
@@ -4787,7 +4669,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -4955,7 +4836,6 @@ public static com.google.cloud.vision.v1p3beta1.WebDetection parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -4963,7 +4843,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.WebDetection prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -4991,7 +4870,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p3beta1_WebDetection_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p3beta1_WebDetection_fieldAccessorTable
@@ -5020,7 +4898,6 @@ private void maybeForceBuilderInitialization() {
         getBestGuessLabelsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (webEntitiesBuilder_ == null) {
@@ -5062,18 +4939,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.WebDetectionProto.internal_static_google_cloud_vision_v1p3beta1_WebDetection_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.WebDetection getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.WebDetection.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.WebDetection build() {
       com.google.cloud.vision.v1p3beta1.WebDetection result = buildPartial();
       if (!result.isInitialized()) {
@@ -5082,7 +4956,6 @@ public com.google.cloud.vision.v1p3beta1.WebDetection build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.WebDetection buildPartial() {
       com.google.cloud.vision.v1p3beta1.WebDetection result = new com.google.cloud.vision.v1p3beta1.WebDetection(this);
       int from_bitField0_ = bitField0_;
@@ -5144,39 +5017,32 @@ public com.google.cloud.vision.v1p3beta1.WebDetection buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.WebDetection) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.WebDetection)other);
@@ -5349,12 +5215,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.WebDetection other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -7299,13 +7163,11 @@ public com.google.cloud.vision.v1p3beta1.WebDetection.WebLabel.Builder addBestGu
       }
       return bestGuessLabelsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -7327,12 +7189,11 @@ public static com.google.cloud.vision.v1p3beta1.WebDetection getDefaultInstance(
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public WebDetection parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WebDetection(input, extensionRegistry);
+        return new WebDetection(input, extensionRegistry);
     }
   };
 
@@ -7345,7 +7206,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.WebDetection getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/WebDetectionParams.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/WebDetectionParams.java
index 26f7a2edd9ff..49f1fe213046 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/WebDetectionParams.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/WebDetectionParams.java
@@ -33,9 +33,6 @@ private WebDetectionParams(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,11 +44,6 @@ private WebDetectionParams(
           case 0:
             done = true;
             break;
-          case 16: {
-
-            includeGeoResults_ = input.readBool();
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -59,6 +51,11 @@ private WebDetectionParams(
             }
             break;
           }
+          case 16: {
+
+            includeGeoResults_ = input.readBool();
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -76,7 +73,6 @@ private WebDetectionParams(
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_WebDetectionParams_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_WebDetectionParams_fieldAccessorTable
@@ -98,7 +94,6 @@ public boolean getIncludeGeoResults() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -108,7 +103,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (includeGeoResults_ != false) {
@@ -117,7 +111,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -234,7 +227,6 @@ public static com.google.cloud.vision.v1p3beta1.WebDetectionParams parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -242,7 +234,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.WebDetectionParams prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -270,7 +261,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_WebDetectionParams_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_WebDetectionParams_fieldAccessorTable
@@ -293,7 +283,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       includeGeoResults_ = false;
@@ -301,18 +290,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.ImageAnnotatorProto.internal_static_google_cloud_vision_v1p3beta1_WebDetectionParams_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.WebDetectionParams getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.WebDetectionParams.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.WebDetectionParams build() {
       com.google.cloud.vision.v1p3beta1.WebDetectionParams result = buildPartial();
       if (!result.isInitialized()) {
@@ -321,7 +307,6 @@ public com.google.cloud.vision.v1p3beta1.WebDetectionParams build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.WebDetectionParams buildPartial() {
       com.google.cloud.vision.v1p3beta1.WebDetectionParams result = new com.google.cloud.vision.v1p3beta1.WebDetectionParams(this);
       result.includeGeoResults_ = includeGeoResults_;
@@ -329,39 +314,32 @@ public com.google.cloud.vision.v1p3beta1.WebDetectionParams buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.WebDetectionParams) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.WebDetectionParams)other);
@@ -381,12 +359,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.WebDetectionParams ot
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -442,13 +418,11 @@ public Builder clearIncludeGeoResults() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -470,12 +444,11 @@ public static com.google.cloud.vision.v1p3beta1.WebDetectionParams getDefaultIns
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public WebDetectionParams parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new WebDetectionParams(input, extensionRegistry);
+        return new WebDetectionParams(input, extensionRegistry);
     }
   };
 
@@ -488,7 +461,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.WebDetectionParams getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/WebDetectionProto.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/WebDetectionProto.java
index b893fa2f97a3..0f3954f351d1 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/WebDetectionProto.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/WebDetectionProto.java
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "oogle.cloud.vision.v1p3beta1.WebDetectio" +
       "n.WebImage\022U\n\027partial_matching_images\030\003 " +
       "\003(\01324.google.cloud.vision.v1p3beta1.WebD" +
-      "etection.WebImage\022W\n\032pages_with_matching" +
+      "etection.WebImage\022W\n\032pages_with_matching",
       "_images\030\004 \003(\01323.google.cloud.vision.v1p3" +
       "beta1.WebDetection.WebPage\022U\n\027visually_s" +
       "imilar_images\030\006 \003(\01324.google.cloud.visio" +
@@ -67,7 +67,7 @@ public static void registerAllExtensions(
       "bEntity\022\021\n\tentity_id\030\001 \001(\t\022\r\n\005score\030\002 \001(" +
       "\002\022\023\n\013description\030\003 \001(\t\032&\n\010WebImage\022\013\n\003ur" +
       "l\030\001 \001(\t\022\r\n\005score\030\002 \001(\002\032\344\001\n\007WebPage\022\013\n\003ur" +
-      "l\030\001 \001(\t\022\r\n\005score\030\002 \001(\002\022\022\n\npage_title\030\003 \001" +
+      "l\030\001 \001(\t\022\r\n\005score\030\002 \001(\002\022\022\n\npage_title\030\003 \001",
       "(\t\022R\n\024full_matching_images\030\004 \003(\01324.googl" +
       "e.cloud.vision.v1p3beta1.WebDetection.We" +
       "bImage\022U\n\027partial_matching_images\030\005 \003(\0132" +
diff --git a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Word.java b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Word.java
index b017823e86bc..b529442dbf32 100644
--- a/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Word.java
+++ b/google-api-grpc/proto-google-cloud-vision-v1p3beta1/src/main/java/com/google/cloud/vision/v1p3beta1/Word.java
@@ -34,9 +34,6 @@ private Word(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private Word(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             com.google.cloud.vision.v1p3beta1.TextAnnotation.TextProperty.Builder subBuilder = null;
             if (property_ != null) {
@@ -88,13 +92,6 @@ private Word(
             confidence_ = input.readFloat();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -115,7 +112,6 @@ private Word(
     return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_Word_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_Word_fieldAccessorTable
@@ -306,7 +302,6 @@ public float getConfidence() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -316,7 +311,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (property_ != null) {
@@ -334,7 +328,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -489,7 +482,6 @@ public static com.google.cloud.vision.v1p3beta1.Word parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -497,7 +489,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.vision.v1p3beta1.Word prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -525,7 +516,6 @@ public static final class Builder extends
       return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_Word_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_Word_fieldAccessorTable
@@ -549,7 +539,6 @@ private void maybeForceBuilderInitialization() {
         getSymbolsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (propertyBuilder_ == null) {
@@ -575,18 +564,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.vision.v1p3beta1.TextAnnotationProto.internal_static_google_cloud_vision_v1p3beta1_Word_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Word getDefaultInstanceForType() {
       return com.google.cloud.vision.v1p3beta1.Word.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Word build() {
       com.google.cloud.vision.v1p3beta1.Word result = buildPartial();
       if (!result.isInitialized()) {
@@ -595,7 +581,6 @@ public com.google.cloud.vision.v1p3beta1.Word build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.vision.v1p3beta1.Word buildPartial() {
       com.google.cloud.vision.v1p3beta1.Word result = new com.google.cloud.vision.v1p3beta1.Word(this);
       int from_bitField0_ = bitField0_;
@@ -625,39 +610,32 @@ public com.google.cloud.vision.v1p3beta1.Word buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.vision.v1p3beta1.Word) {
         return mergeFrom((com.google.cloud.vision.v1p3beta1.Word)other);
@@ -709,12 +687,10 @@ public Builder mergeFrom(com.google.cloud.vision.v1p3beta1.Word other) {
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1533,13 +1509,11 @@ public Builder clearConfidence() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1561,12 +1535,11 @@ public static com.google.cloud.vision.v1p3beta1.Word getDefaultInstance() {
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Word parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Word(input, extensionRegistry);
+        return new Word(input, extensionRegistry);
     }
   };
 
@@ -1579,7 +1552,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.vision.v1p3beta1.Word getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CrawledUrl.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CrawledUrl.java
index 06a53981a8e6..4f7d5cd041a8 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CrawledUrl.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CrawledUrl.java
@@ -37,9 +37,6 @@ private CrawledUrl(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -51,6 +48,13 @@ private CrawledUrl(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -69,13 +73,6 @@ private CrawledUrl(
             body_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -93,7 +90,6 @@ private CrawledUrl(
     return com.google.cloud.websecurityscanner.v1alpha.CrawledUrlProto.internal_static_google_cloud_websecurityscanner_v1alpha_CrawledUrl_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.websecurityscanner.v1alpha.CrawledUrlProto.internal_static_google_cloud_websecurityscanner_v1alpha_CrawledUrl_fieldAccessorTable
@@ -236,7 +232,6 @@ public java.lang.String getBody() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -246,7 +241,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getHttpMethodBytes().isEmpty()) {
@@ -261,7 +255,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -390,7 +383,6 @@ public static com.google.cloud.websecurityscanner.v1alpha.CrawledUrl parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -398,7 +390,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.CrawledUrl prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -428,7 +419,6 @@ public static final class Builder extends
       return com.google.cloud.websecurityscanner.v1alpha.CrawledUrlProto.internal_static_google_cloud_websecurityscanner_v1alpha_CrawledUrl_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.websecurityscanner.v1alpha.CrawledUrlProto.internal_static_google_cloud_websecurityscanner_v1alpha_CrawledUrl_fieldAccessorTable
@@ -451,7 +441,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       httpMethod_ = "";
@@ -463,18 +452,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.websecurityscanner.v1alpha.CrawledUrlProto.internal_static_google_cloud_websecurityscanner_v1alpha_CrawledUrl_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.CrawledUrl getDefaultInstanceForType() {
       return com.google.cloud.websecurityscanner.v1alpha.CrawledUrl.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.CrawledUrl build() {
       com.google.cloud.websecurityscanner.v1alpha.CrawledUrl result = buildPartial();
       if (!result.isInitialized()) {
@@ -483,7 +469,6 @@ public com.google.cloud.websecurityscanner.v1alpha.CrawledUrl build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.CrawledUrl buildPartial() {
       com.google.cloud.websecurityscanner.v1alpha.CrawledUrl result = new com.google.cloud.websecurityscanner.v1alpha.CrawledUrl(this);
       result.httpMethod_ = httpMethod_;
@@ -493,39 +478,32 @@ public com.google.cloud.websecurityscanner.v1alpha.CrawledUrl buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.websecurityscanner.v1alpha.CrawledUrl) {
         return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.CrawledUrl)other);
@@ -554,12 +532,10 @@ public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.CrawledUrl
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -864,13 +840,11 @@ public Builder setBodyBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -892,12 +866,11 @@ public static com.google.cloud.websecurityscanner.v1alpha.CrawledUrl getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CrawledUrl parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CrawledUrl(input, extensionRegistry);
+        return new CrawledUrl(input, extensionRegistry);
     }
   };
 
@@ -910,7 +883,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.websecurityscanner.v1alpha.CrawledUrl getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CreateScanConfigRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CreateScanConfigRequest.java
index 77f836befbdc..5cf31ef9d6d1 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CreateScanConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/CreateScanConfigRequest.java
@@ -33,9 +33,6 @@ private CreateScanConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private CreateScanConfigRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private CreateScanConfigRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private CreateScanConfigRequest(
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_CreateScanConfigRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_CreateScanConfigRequest_fieldAccessorTable
@@ -181,7 +177,6 @@ public com.google.cloud.websecurityscanner.v1alpha.ScanConfigOrBuilder getScanCo
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -191,7 +186,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -203,7 +197,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -331,7 +324,6 @@ public static com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigReques
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -339,7 +331,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -367,7 +358,6 @@ public static final class Builder extends
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_CreateScanConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_CreateScanConfigRequest_fieldAccessorTable
@@ -390,7 +380,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -404,18 +393,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_CreateScanConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest getDefaultInstanceForType() {
       return com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest build() {
       com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -424,7 +410,6 @@ public com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest build
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest buildPartial() {
       com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest result = new com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest(this);
       result.parent_ = parent_;
@@ -437,39 +422,32 @@ public com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest build
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest) {
         return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest)other);
@@ -493,12 +471,10 @@ public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.CreateScanC
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -777,13 +753,11 @@ public com.google.cloud.websecurityscanner.v1alpha.ScanConfigOrBuilder getScanCo
       }
       return scanConfigBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -805,12 +779,11 @@ public static com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigReques
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public CreateScanConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new CreateScanConfigRequest(input, extensionRegistry);
+        return new CreateScanConfigRequest(input, extensionRegistry);
     }
   };
 
@@ -823,7 +796,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.websecurityscanner.v1alpha.CreateScanConfigRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/DeleteScanConfigRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/DeleteScanConfigRequest.java
index e1dc755bc1eb..bb3bad33b98e 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/DeleteScanConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/DeleteScanConfigRequest.java
@@ -33,9 +33,6 @@ private DeleteScanConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private DeleteScanConfigRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private DeleteScanConfigRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private DeleteScanConfigRequest(
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_DeleteScanConfigRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_DeleteScanConfigRequest_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigReques
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_DeleteScanConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_DeleteScanConfigRequest_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_DeleteScanConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest getDefaultInstanceForType() {
       return com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest build() {
       com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest build
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest buildPartial() {
       com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest result = new com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest(this);
       result.name_ = name_;
@@ -361,39 +346,32 @@ public com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest build
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest) {
         return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.DeleteScanC
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigReques
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public DeleteScanConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new DeleteScanConfigRequest(input, extensionRegistry);
+        return new DeleteScanConfigRequest(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.websecurityscanner.v1alpha.DeleteScanConfigRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/Finding.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/Finding.java
index c45ca7b46f15..8e06f773d98c 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/Finding.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/Finding.java
@@ -43,9 +43,6 @@ private Finding(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -57,6 +54,13 @@ private Finding(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -169,13 +173,6 @@ private Finding(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -193,7 +190,6 @@ private Finding(
     return com.google.cloud.websecurityscanner.v1alpha.FindingProto.internal_static_google_cloud_websecurityscanner_v1alpha_Finding_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.websecurityscanner.v1alpha.FindingProto.internal_static_google_cloud_websecurityscanner_v1alpha_Finding_fieldAccessorTable
@@ -518,7 +514,6 @@ public int getFindingTypeValue() {
    * .google.cloud.websecurityscanner.v1alpha.Finding.FindingType finding_type = 2;
    */
   public com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType getFindingType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType result = com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType.valueOf(findingType_);
     return result == null ? com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType.UNRECOGNIZED : result;
   }
@@ -1036,7 +1031,6 @@ public com.google.cloud.websecurityscanner.v1alpha.XssOrBuilder getXssOrBuilder(
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -1046,7 +1040,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -1094,7 +1087,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -1324,7 +1316,6 @@ public static com.google.cloud.websecurityscanner.v1alpha.Finding parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -1332,7 +1323,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.Finding prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -1361,7 +1351,6 @@ public static final class Builder extends
       return com.google.cloud.websecurityscanner.v1alpha.FindingProto.internal_static_google_cloud_websecurityscanner_v1alpha_Finding_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.websecurityscanner.v1alpha.FindingProto.internal_static_google_cloud_websecurityscanner_v1alpha_Finding_fieldAccessorTable
@@ -1384,7 +1373,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -1434,18 +1422,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.websecurityscanner.v1alpha.FindingProto.internal_static_google_cloud_websecurityscanner_v1alpha_Finding_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.Finding getDefaultInstanceForType() {
       return com.google.cloud.websecurityscanner.v1alpha.Finding.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.Finding build() {
       com.google.cloud.websecurityscanner.v1alpha.Finding result = buildPartial();
       if (!result.isInitialized()) {
@@ -1454,7 +1439,6 @@ public com.google.cloud.websecurityscanner.v1alpha.Finding build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.Finding buildPartial() {
       com.google.cloud.websecurityscanner.v1alpha.Finding result = new com.google.cloud.websecurityscanner.v1alpha.Finding(this);
       result.name_ = name_;
@@ -1491,39 +1475,32 @@ public com.google.cloud.websecurityscanner.v1alpha.Finding buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.websecurityscanner.v1alpha.Finding) {
         return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.Finding)other);
@@ -1591,12 +1568,10 @@ public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.Finding oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1753,7 +1728,6 @@ public Builder setFindingTypeValue(int value) {
      * .google.cloud.websecurityscanner.v1alpha.Finding.FindingType finding_type = 2;
      */
     public com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType getFindingType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType result = com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType.valueOf(findingType_);
       return result == null ? com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType.UNRECOGNIZED : result;
     }
@@ -3231,13 +3205,11 @@ public com.google.cloud.websecurityscanner.v1alpha.XssOrBuilder getXssOrBuilder(
       }
       return xssBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -3259,12 +3231,11 @@ public static com.google.cloud.websecurityscanner.v1alpha.Finding getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Finding parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Finding(input, extensionRegistry);
+        return new Finding(input, extensionRegistry);
     }
   };
 
@@ -3277,7 +3248,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.websecurityscanner.v1alpha.Finding getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingAddonProto.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingAddonProto.java
index 1252f031c817..4fba4427b390 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingAddonProto.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingAddonProto.java
@@ -52,7 +52,7 @@ public static void registerAllExtensions(
       "content_type\030\001 \001(\t\022\024\n\014resource_url\030\002 \001(\t" +
       "\"/\n\024VulnerableParameters\022\027\n\017parameter_na" +
       "mes\030\001 \003(\t\"2\n\003Xss\022\024\n\014stack_traces\030\001 \003(\t\022\025" +
-      "\n\rerror_message\030\002 \001(\tB\235\001\n+com.google.clo" +
+      "\n\rerror_message\030\002 \001(\tB\235\001\n+com.google.clo",
       "ud.websecurityscanner.v1alphaB\021FindingAd" +
       "donProtoP\001ZYgoogle.golang.org/genproto/g" +
       "oogleapis/cloud/websecurityscanner/v1alp" +
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingProto.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingProto.java
index 5e456375cbbe..90388205dd8a 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingProto.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingProto.java
@@ -37,7 +37,7 @@ public static void registerAllExtensions(
       "ogle.cloud.websecurityscanner.v1alpha.Fi" +
       "nding.FindingType\022\023\n\013http_method\030\003 \001(\t\022\022" +
       "\n\nfuzzed_url\030\004 \001(\t\022\014\n\004body\030\005 \001(\t\022\023\n\013desc" +
-      "ription\030\006 \001(\t\022\030\n\020reproduction_url\030\007 \001(\t\022" +
+      "ription\030\006 \001(\t\022\030\n\020reproduction_url\030\007 \001(\t\022",
       "\021\n\tframe_url\030\010 \001(\t\022\021\n\tfinal_url\030\t \001(\t\022\023\n" +
       "\013tracking_id\030\n \001(\t\022R\n\020outdated_library\030\013" +
       " \001(\01328.google.cloud.websecurityscanner.v" +
@@ -47,7 +47,7 @@ public static void registerAllExtensions(
       "able_parameters\030\r \001(\0132=.google.cloud.web" +
       "securityscanner.v1alpha.VulnerableParame" +
       "ters\0229\n\003xss\030\016 \001(\0132,.google.cloud.websecu" +
-      "rityscanner.v1alpha.Xss\"\241\001\n\013FindingType\022" +
+      "rityscanner.v1alpha.Xss\"\241\001\n\013FindingType\022",
       "\034\n\030FINDING_TYPE_UNSPECIFIED\020\000\022\021\n\rMIXED_C" +
       "ONTENT\020\001\022\024\n\020OUTDATED_LIBRARY\020\002\022\021\n\rROSETT" +
       "A_FLASH\020\005\022\020\n\014XSS_CALLBACK\020\003\022\r\n\tXSS_ERROR" +
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingTypeStats.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingTypeStats.java
index a8ed739f376d..c407ffe597eb 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingTypeStats.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingTypeStats.java
@@ -35,9 +35,6 @@ private FindingTypeStats(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private FindingTypeStats(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 8: {
             int rawValue = input.readEnum();
 
@@ -60,13 +64,6 @@ private FindingTypeStats(
             findingCount_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -84,7 +81,6 @@ private FindingTypeStats(
     return com.google.cloud.websecurityscanner.v1alpha.FindingTypeStatsProto.internal_static_google_cloud_websecurityscanner_v1alpha_FindingTypeStats_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.websecurityscanner.v1alpha.FindingTypeStatsProto.internal_static_google_cloud_websecurityscanner_v1alpha_FindingTypeStats_fieldAccessorTable
@@ -114,7 +110,6 @@ public int getFindingTypeValue() {
    * .google.cloud.websecurityscanner.v1alpha.Finding.FindingType finding_type = 1;
    */
   public com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType getFindingType() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType result = com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType.valueOf(findingType_);
     return result == null ? com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType.UNRECOGNIZED : result;
   }
@@ -134,7 +129,6 @@ public int getFindingCount() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -144,7 +138,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (findingType_ != com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType.FINDING_TYPE_UNSPECIFIED.getNumber()) {
@@ -156,7 +149,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -279,7 +271,6 @@ public static com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats parse
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -287,7 +278,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -316,7 +306,6 @@ public static final class Builder extends
       return com.google.cloud.websecurityscanner.v1alpha.FindingTypeStatsProto.internal_static_google_cloud_websecurityscanner_v1alpha_FindingTypeStats_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.websecurityscanner.v1alpha.FindingTypeStatsProto.internal_static_google_cloud_websecurityscanner_v1alpha_FindingTypeStats_fieldAccessorTable
@@ -339,7 +328,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       findingType_ = 0;
@@ -349,18 +337,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.websecurityscanner.v1alpha.FindingTypeStatsProto.internal_static_google_cloud_websecurityscanner_v1alpha_FindingTypeStats_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats getDefaultInstanceForType() {
       return com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats build() {
       com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats result = buildPartial();
       if (!result.isInitialized()) {
@@ -369,7 +354,6 @@ public com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats buildPartial() {
       com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats result = new com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats(this);
       result.findingType_ = findingType_;
@@ -378,39 +362,32 @@ public com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats buildPartial
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats) {
         return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats)other);
@@ -433,12 +410,10 @@ public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.FindingType
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -491,7 +466,6 @@ public Builder setFindingTypeValue(int value) {
      * .google.cloud.websecurityscanner.v1alpha.Finding.FindingType finding_type = 1;
      */
     public com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType getFindingType() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType result = com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType.valueOf(findingType_);
       return result == null ? com.google.cloud.websecurityscanner.v1alpha.Finding.FindingType.UNRECOGNIZED : result;
     }
@@ -567,13 +541,11 @@ public Builder clearFindingCount() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -595,12 +567,11 @@ public static com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats getDe
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public FindingTypeStats parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new FindingTypeStats(input, extensionRegistry);
+        return new FindingTypeStats(input, extensionRegistry);
     }
   };
 
@@ -613,7 +584,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingTypeStatsProto.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingTypeStatsProto.java
index d5309ac0ab9f..4300713df313 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingTypeStatsProto.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/FindingTypeStatsProto.java
@@ -37,7 +37,7 @@ public static void registerAllExtensions(
       "gle.cloud.websecurityscanner.v1alpha.Fin" +
       "ding.FindingType\022\025\n\rfinding_count\030\002 \001(\005B" +
       "\241\001\n+com.google.cloud.websecurityscanner." +
-      "v1alphaB\025FindingTypeStatsProtoP\001ZYgoogle" +
+      "v1alphaB\025FindingTypeStatsProtoP\001ZYgoogle",
       ".golang.org/genproto/googleapis/cloud/we" +
       "bsecurityscanner/v1alpha;websecurityscan" +
       "nerb\006proto3"
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetFindingRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetFindingRequest.java
index d172f4ae5f5a..a15edd2411f0 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetFindingRequest.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetFindingRequest.java
@@ -33,9 +33,6 @@ private GetFindingRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetFindingRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetFindingRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetFindingRequest(
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_GetFindingRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_GetFindingRequest_fieldAccessorTable
@@ -134,7 +130,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -144,7 +139,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -153,7 +147,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -268,7 +261,6 @@ public static com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest pars
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -276,7 +268,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -304,7 +295,6 @@ public static final class Builder extends
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_GetFindingRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_GetFindingRequest_fieldAccessorTable
@@ -327,7 +317,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -335,18 +324,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_GetFindingRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest getDefaultInstanceForType() {
       return com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest build() {
       com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -355,7 +341,6 @@ public com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest buildPartial() {
       com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest result = new com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest(this);
       result.name_ = name_;
@@ -363,39 +348,32 @@ public com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest buildPartia
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest) {
         return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest)other);
@@ -416,12 +394,10 @@ public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.GetFindingR
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -543,13 +519,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -571,12 +545,11 @@ public static com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest getD
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetFindingRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetFindingRequest(input, extensionRegistry);
+        return new GetFindingRequest(input, extensionRegistry);
     }
   };
 
@@ -589,7 +562,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.websecurityscanner.v1alpha.GetFindingRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanConfigRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanConfigRequest.java
index b22c18ab26bf..f846808dc531 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanConfigRequest.java
@@ -33,9 +33,6 @@ private GetScanConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetScanConfigRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetScanConfigRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetScanConfigRequest(
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_GetScanConfigRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_GetScanConfigRequest_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest p
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_GetScanConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_GetScanConfigRequest_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_GetScanConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest getDefaultInstanceForType() {
       return com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest build() {
       com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest buildPartial() {
       com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest result = new com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest(this);
       result.name_ = name_;
@@ -361,39 +346,32 @@ public com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest buildPar
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest) {
         return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.GetScanConf
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest g
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetScanConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetScanConfigRequest(input, extensionRegistry);
+        return new GetScanConfigRequest(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.websecurityscanner.v1alpha.GetScanConfigRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanRunRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanRunRequest.java
index dde364d8afd3..a4b3406b1013 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanRunRequest.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/GetScanRunRequest.java
@@ -33,9 +33,6 @@ private GetScanRunRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private GetScanRunRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private GetScanRunRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private GetScanRunRequest(
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_GetScanRunRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_GetScanRunRequest_fieldAccessorTable
@@ -134,7 +130,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -144,7 +139,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -153,7 +147,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -268,7 +261,6 @@ public static com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest pars
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -276,7 +268,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -304,7 +295,6 @@ public static final class Builder extends
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_GetScanRunRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_GetScanRunRequest_fieldAccessorTable
@@ -327,7 +317,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -335,18 +324,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_GetScanRunRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest getDefaultInstanceForType() {
       return com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest build() {
       com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -355,7 +341,6 @@ public com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest buildPartial() {
       com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest result = new com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest(this);
       result.name_ = name_;
@@ -363,39 +348,32 @@ public com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest buildPartia
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest) {
         return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest)other);
@@ -416,12 +394,10 @@ public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.GetScanRunR
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -543,13 +519,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -571,12 +545,11 @@ public static com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest getD
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public GetScanRunRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new GetScanRunRequest(input, extensionRegistry);
+        return new GetScanRunRequest(input, extensionRegistry);
     }
   };
 
@@ -589,7 +562,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.websecurityscanner.v1alpha.GetScanRunRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsRequest.java
index 9390905d7c07..9a4d1e0e1b65 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsRequest.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsRequest.java
@@ -35,9 +35,6 @@ private ListCrawledUrlsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListCrawledUrlsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ListCrawledUrlsRequest(
             pageSize_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListCrawledUrlsRequest(
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListCrawledUrlsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListCrawledUrlsRequest_fieldAccessorTable
@@ -208,7 +204,6 @@ public int getPageSize() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -218,7 +213,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -233,7 +227,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -363,7 +356,6 @@ public static com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -371,7 +363,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -399,7 +390,6 @@ public static final class Builder extends
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListCrawledUrlsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListCrawledUrlsRequest_fieldAccessorTable
@@ -422,7 +412,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -434,18 +423,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListCrawledUrlsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest getDefaultInstanceForType() {
       return com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest build() {
       com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -454,7 +440,6 @@ public com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest build(
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest buildPartial() {
       com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest result = new com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest(this);
       result.parent_ = parent_;
@@ -464,39 +449,32 @@ public com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest buildP
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest) {
         return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest)other);
@@ -524,12 +502,10 @@ public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ListCrawled
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -794,13 +770,11 @@ public Builder clearPageSize() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -822,12 +796,11 @@ public static com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListCrawledUrlsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListCrawledUrlsRequest(input, extensionRegistry);
+        return new ListCrawledUrlsRequest(input, extensionRegistry);
     }
   };
 
@@ -840,7 +813,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsResponse.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsResponse.java
index a8310c371e7c..d73f92542fb0 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsResponse.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListCrawledUrlsResponse.java
@@ -34,9 +34,6 @@ private ListCrawledUrlsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListCrawledUrlsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               crawledUrls_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListCrawledUrlsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListCrawledUrlsResponse(
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListCrawledUrlsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListCrawledUrlsResponse_fieldAccessorTable
@@ -199,7 +195,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -209,7 +204,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < crawledUrls_.size(); i++) {
@@ -221,7 +215,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -346,7 +339,6 @@ public static com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRespons
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -354,7 +346,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -382,7 +373,6 @@ public static final class Builder extends
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListCrawledUrlsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListCrawledUrlsResponse_fieldAccessorTable
@@ -406,7 +396,6 @@ private void maybeForceBuilderInitialization() {
         getCrawledUrlsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (crawledUrlsBuilder_ == null) {
@@ -420,18 +409,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListCrawledUrlsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse getDefaultInstanceForType() {
       return com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse build() {
       com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -440,7 +426,6 @@ public com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse build
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse buildPartial() {
       com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse result = new com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -460,39 +445,32 @@ public com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse build
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse) {
         return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse)other);
@@ -539,12 +517,10 @@ public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ListCrawled
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -969,13 +945,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -997,12 +971,11 @@ public static com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsRespons
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListCrawledUrlsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListCrawledUrlsResponse(input, extensionRegistry);
+        return new ListCrawledUrlsResponse(input, extensionRegistry);
     }
   };
 
@@ -1015,7 +988,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.websecurityscanner.v1alpha.ListCrawledUrlsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsRequest.java
index a91b7ba0a8b5..6bcd0a072ed3 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsRequest.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsRequest.java
@@ -33,9 +33,6 @@ private ListFindingTypeStatsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private ListFindingTypeStatsRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            parent_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private ListFindingTypeStatsRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            parent_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private ListFindingTypeStatsRequest(
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingTypeStatsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingTypeStatsRequest_fieldAccessorTable
@@ -134,7 +130,6 @@ public java.lang.String getParent() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -144,7 +139,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -153,7 +147,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -268,7 +261,6 @@ public static com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRe
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -276,7 +268,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -304,7 +295,6 @@ public static final class Builder extends
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingTypeStatsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingTypeStatsRequest_fieldAccessorTable
@@ -327,7 +317,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -335,18 +324,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingTypeStatsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest getDefaultInstanceForType() {
       return com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest build() {
       com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -355,7 +341,6 @@ public com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest b
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest buildPartial() {
       com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest result = new com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest(this);
       result.parent_ = parent_;
@@ -363,39 +348,32 @@ public com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest b
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest) {
         return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest)other);
@@ -416,12 +394,10 @@ public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ListFinding
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -543,13 +519,11 @@ public Builder setParentBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -571,12 +545,11 @@ public static com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRe
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListFindingTypeStatsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListFindingTypeStatsRequest(input, extensionRegistry);
+        return new ListFindingTypeStatsRequest(input, extensionRegistry);
     }
   };
 
@@ -589,7 +562,6 @@ public com.google.protobuf.Parser getParserForType(
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsResponse.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsResponse.java
index d44e8b674e6a..d84f8b5e2649 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsResponse.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingTypeStatsResponse.java
@@ -33,9 +33,6 @@ private ListFindingTypeStatsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private ListFindingTypeStatsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               findingTypeStats_ = new java.util.ArrayList();
@@ -56,13 +60,6 @@ private ListFindingTypeStatsResponse(
                 input.readMessage(com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats.parser(), extensionRegistry));
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private ListFindingTypeStatsResponse(
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingTypeStatsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingTypeStatsResponse_fieldAccessorTable
@@ -147,7 +143,6 @@ public com.google.cloud.websecurityscanner.v1alpha.FindingTypeStatsOrBuilder get
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -157,7 +152,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < findingTypeStats_.size(); i++) {
@@ -166,7 +160,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -284,7 +277,6 @@ public static com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRe
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -292,7 +284,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -320,7 +311,6 @@ public static final class Builder extends
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingTypeStatsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingTypeStatsResponse_fieldAccessorTable
@@ -344,7 +334,6 @@ private void maybeForceBuilderInitialization() {
         getFindingTypeStatsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (findingTypeStatsBuilder_ == null) {
@@ -356,18 +345,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingTypeStatsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse getDefaultInstanceForType() {
       return com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse build() {
       com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -376,7 +362,6 @@ public com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse buildPartial() {
       com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse result = new com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -393,39 +378,32 @@ public com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse) {
         return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse)other);
@@ -468,12 +446,10 @@ public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ListFinding
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -804,13 +780,11 @@ public com.google.cloud.websecurityscanner.v1alpha.FindingTypeStats.Builder addF
       }
       return findingTypeStatsBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -832,12 +806,11 @@ public static com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsRe
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListFindingTypeStatsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListFindingTypeStatsResponse(input, extensionRegistry);
+        return new ListFindingTypeStatsResponse(input, extensionRegistry);
     }
   };
 
@@ -850,7 +823,6 @@ public com.google.protobuf.Parser getParserForType
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.websecurityscanner.v1alpha.ListFindingTypeStatsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsRequest.java
index 8b8ea515a832..a2a7cf247978 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsRequest.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsRequest.java
@@ -36,9 +36,6 @@ private ListFindingsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -50,6 +47,13 @@ private ListFindingsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -73,13 +77,6 @@ private ListFindingsRequest(
             pageSize_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private ListFindingsRequest(
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingsRequest_fieldAccessorTable
@@ -263,7 +259,6 @@ public int getPageSize() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -273,7 +268,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -291,7 +285,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -428,7 +421,6 @@ public static com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest pa
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -436,7 +428,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -464,7 +455,6 @@ public static final class Builder extends
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingsRequest_fieldAccessorTable
@@ -487,7 +477,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -501,18 +490,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest getDefaultInstanceForType() {
       return com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest build() {
       com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -521,7 +507,6 @@ public com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest buildPartial() {
       com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest result = new com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest(this);
       result.parent_ = parent_;
@@ -532,39 +517,32 @@ public com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest buildPart
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest) {
         return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest)other);
@@ -596,12 +574,10 @@ public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ListFinding
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -970,13 +946,11 @@ public Builder clearPageSize() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -998,12 +972,11 @@ public static com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest ge
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListFindingsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListFindingsRequest(input, extensionRegistry);
+        return new ListFindingsRequest(input, extensionRegistry);
     }
   };
 
@@ -1016,7 +989,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.websecurityscanner.v1alpha.ListFindingsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsResponse.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsResponse.java
index c0125629fdaf..60f562b4f8fd 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsResponse.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListFindingsResponse.java
@@ -34,9 +34,6 @@ private ListFindingsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListFindingsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               findings_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListFindingsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListFindingsResponse(
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingsResponse_fieldAccessorTable
@@ -199,7 +195,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -209,7 +204,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < findings_.size(); i++) {
@@ -221,7 +215,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -346,7 +339,6 @@ public static com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse p
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -354,7 +346,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -382,7 +373,6 @@ public static final class Builder extends
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingsResponse_fieldAccessorTable
@@ -406,7 +396,6 @@ private void maybeForceBuilderInitialization() {
         getFindingsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (findingsBuilder_ == null) {
@@ -420,18 +409,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListFindingsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse getDefaultInstanceForType() {
       return com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse build() {
       com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -440,7 +426,6 @@ public com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse buildPartial() {
       com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse result = new com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -460,39 +445,32 @@ public com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse buildPar
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse) {
         return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse)other);
@@ -539,12 +517,10 @@ public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ListFinding
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -969,13 +945,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -997,12 +971,11 @@ public static com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse g
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListFindingsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListFindingsResponse(input, extensionRegistry);
+        return new ListFindingsResponse(input, extensionRegistry);
     }
   };
 
@@ -1015,7 +988,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.websecurityscanner.v1alpha.ListFindingsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsRequest.java
index cc1caa817b72..cef69e219eee 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsRequest.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsRequest.java
@@ -35,9 +35,6 @@ private ListScanConfigsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListScanConfigsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ListScanConfigsRequest(
             pageSize_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListScanConfigsRequest(
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanConfigsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanConfigsRequest_fieldAccessorTable
@@ -206,7 +202,6 @@ public int getPageSize() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -216,7 +211,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -231,7 +225,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -361,7 +354,6 @@ public static com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -369,7 +361,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -397,7 +388,6 @@ public static final class Builder extends
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanConfigsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanConfigsRequest_fieldAccessorTable
@@ -420,7 +410,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -432,18 +421,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanConfigsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest getDefaultInstanceForType() {
       return com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest build() {
       com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -452,7 +438,6 @@ public com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest build(
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest buildPartial() {
       com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest result = new com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest(this);
       result.parent_ = parent_;
@@ -462,39 +447,32 @@ public com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest buildP
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest) {
         return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest)other);
@@ -522,12 +500,10 @@ public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ListScanCon
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -787,13 +763,11 @@ public Builder clearPageSize() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -815,12 +789,11 @@ public static com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListScanConfigsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListScanConfigsRequest(input, extensionRegistry);
+        return new ListScanConfigsRequest(input, extensionRegistry);
     }
   };
 
@@ -833,7 +806,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsResponse.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsResponse.java
index 25118ad3fee3..6b118abd7525 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsResponse.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanConfigsResponse.java
@@ -34,9 +34,6 @@ private ListScanConfigsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListScanConfigsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               scanConfigs_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListScanConfigsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListScanConfigsResponse(
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanConfigsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanConfigsResponse_fieldAccessorTable
@@ -199,7 +195,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -209,7 +204,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < scanConfigs_.size(); i++) {
@@ -221,7 +215,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -346,7 +339,6 @@ public static com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRespons
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -354,7 +346,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -382,7 +373,6 @@ public static final class Builder extends
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanConfigsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanConfigsResponse_fieldAccessorTable
@@ -406,7 +396,6 @@ private void maybeForceBuilderInitialization() {
         getScanConfigsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (scanConfigsBuilder_ == null) {
@@ -420,18 +409,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanConfigsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse getDefaultInstanceForType() {
       return com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse build() {
       com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -440,7 +426,6 @@ public com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse build
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse buildPartial() {
       com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse result = new com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -460,39 +445,32 @@ public com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse build
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse) {
         return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse)other);
@@ -539,12 +517,10 @@ public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ListScanCon
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -969,13 +945,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -997,12 +971,11 @@ public static com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsRespons
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListScanConfigsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListScanConfigsResponse(input, extensionRegistry);
+        return new ListScanConfigsResponse(input, extensionRegistry);
     }
   };
 
@@ -1015,7 +988,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.websecurityscanner.v1alpha.ListScanConfigsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsRequest.java
index fdfb76341650..e7e454f615ba 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsRequest.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsRequest.java
@@ -35,9 +35,6 @@ private ListScanRunsRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ListScanRunsRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -66,13 +70,6 @@ private ListScanRunsRequest(
             pageSize_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListScanRunsRequest(
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanRunsRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanRunsRequest_fieldAccessorTable
@@ -206,7 +202,6 @@ public int getPageSize() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -216,7 +211,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getParentBytes().isEmpty()) {
@@ -231,7 +225,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -361,7 +354,6 @@ public static com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest pa
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -369,7 +361,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -397,7 +388,6 @@ public static final class Builder extends
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanRunsRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanRunsRequest_fieldAccessorTable
@@ -420,7 +410,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parent_ = "";
@@ -432,18 +421,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanRunsRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest getDefaultInstanceForType() {
       return com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest build() {
       com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -452,7 +438,6 @@ public com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest buildPartial() {
       com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest result = new com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest(this);
       result.parent_ = parent_;
@@ -462,39 +447,32 @@ public com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest buildPart
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest) {
         return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest)other);
@@ -522,12 +500,10 @@ public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ListScanRun
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -787,13 +763,11 @@ public Builder clearPageSize() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -815,12 +789,11 @@ public static com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest ge
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListScanRunsRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListScanRunsRequest(input, extensionRegistry);
+        return new ListScanRunsRequest(input, extensionRegistry);
     }
   };
 
@@ -833,7 +806,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.websecurityscanner.v1alpha.ListScanRunsRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsResponse.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsResponse.java
index 0a58a166a80b..8dd35d515f3b 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsResponse.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ListScanRunsResponse.java
@@ -34,9 +34,6 @@ private ListScanRunsResponse(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private ListScanRunsResponse(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
               scanRuns_ = new java.util.ArrayList();
@@ -63,13 +67,6 @@ private ListScanRunsResponse(
             nextPageToken_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private ListScanRunsResponse(
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanRunsResponse_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanRunsResponse_fieldAccessorTable
@@ -199,7 +195,6 @@ public java.lang.String getNextPageToken() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -209,7 +204,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < scanRuns_.size(); i++) {
@@ -221,7 +215,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -346,7 +339,6 @@ public static com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse p
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -354,7 +346,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -382,7 +373,6 @@ public static final class Builder extends
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanRunsResponse_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanRunsResponse_fieldAccessorTable
@@ -406,7 +396,6 @@ private void maybeForceBuilderInitialization() {
         getScanRunsFieldBuilder();
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (scanRunsBuilder_ == null) {
@@ -420,18 +409,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_ListScanRunsResponse_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse getDefaultInstanceForType() {
       return com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse build() {
       com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse result = buildPartial();
       if (!result.isInitialized()) {
@@ -440,7 +426,6 @@ public com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse buildPartial() {
       com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse result = new com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse(this);
       int from_bitField0_ = bitField0_;
@@ -460,39 +445,32 @@ public com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse buildPar
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse) {
         return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse)other);
@@ -539,12 +517,10 @@ public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ListScanRun
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -969,13 +945,11 @@ public Builder setNextPageTokenBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -997,12 +971,11 @@ public static com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse g
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ListScanRunsResponse parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ListScanRunsResponse(input, extensionRegistry);
+        return new ListScanRunsResponse(input, extensionRegistry);
     }
   };
 
@@ -1015,7 +988,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.websecurityscanner.v1alpha.ListScanRunsResponse getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/OutdatedLibrary.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/OutdatedLibrary.java
index 8d3b9e154890..eea02cc5325a 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/OutdatedLibrary.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/OutdatedLibrary.java
@@ -35,9 +35,6 @@ private OutdatedLibrary(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private OutdatedLibrary(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -70,13 +74,6 @@ private OutdatedLibrary(
             learnMoreUrls_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -97,7 +94,6 @@ private OutdatedLibrary(
     return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_OutdatedLibrary_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_OutdatedLibrary_fieldAccessorTable
@@ -236,7 +232,6 @@ public java.lang.String getLearnMoreUrls(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -246,7 +241,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getLibraryNameBytes().isEmpty()) {
@@ -261,7 +255,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -397,7 +390,6 @@ public static com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary parseF
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -405,7 +397,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -433,7 +424,6 @@ public static final class Builder extends
       return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_OutdatedLibrary_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_OutdatedLibrary_fieldAccessorTable
@@ -456,7 +446,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       libraryName_ = "";
@@ -468,18 +457,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_OutdatedLibrary_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary getDefaultInstanceForType() {
       return com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary build() {
       com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary result = buildPartial();
       if (!result.isInitialized()) {
@@ -488,7 +474,6 @@ public com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary buildPartial() {
       com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary result = new com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary(this);
       int from_bitField0_ = bitField0_;
@@ -505,39 +490,32 @@ public com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary buildPartial(
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary) {
         return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary)other);
@@ -572,12 +550,10 @@ public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.OutdatedLib
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -904,13 +880,11 @@ public Builder addLearnMoreUrlsBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -932,12 +906,11 @@ public static com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary getDef
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public OutdatedLibrary parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new OutdatedLibrary(input, extensionRegistry);
+        return new OutdatedLibrary(input, extensionRegistry);
     }
   };
 
@@ -950,7 +923,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.websecurityscanner.v1alpha.OutdatedLibrary getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfig.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfig.java
index ea72936c0e9a..ff9327af81cb 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfig.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfig.java
@@ -39,9 +39,6 @@ private ScanConfig(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private ScanConfig(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -143,13 +147,6 @@ private ScanConfig(
             input.popLimit(oldLimit);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -176,7 +173,6 @@ private ScanConfig(
     return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_fieldAccessorTable
@@ -558,9 +554,6 @@ private Authentication(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -572,6 +565,13 @@ private Authentication(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount.Builder subBuilder = null;
               if (authenticationCase_ == 1) {
@@ -600,13 +600,6 @@ private Authentication(
               authenticationCase_ = 2;
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -624,7 +617,6 @@ private Authentication(
       return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_fieldAccessorTable
@@ -711,9 +703,6 @@ private GoogleAccount(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -725,6 +714,13 @@ private GoogleAccount(
               case 0:
                 done = true;
                 break;
+              default: {
+                if (!parseUnknownFieldProto3(
+                    input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
               case 10: {
                 java.lang.String s = input.readStringRequireUtf8();
 
@@ -737,13 +733,6 @@ private GoogleAccount(
                 password_ = s;
                 break;
               }
-              default: {
-                if (!parseUnknownFieldProto3(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
             }
           }
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -761,7 +750,6 @@ private GoogleAccount(
         return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_GoogleAccount_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_GoogleAccount_fieldAccessorTable
@@ -862,7 +850,6 @@ public java.lang.String getPassword() {
       }
 
       private byte memoizedIsInitialized = -1;
-      @java.lang.Override
       public final boolean isInitialized() {
         byte isInitialized = memoizedIsInitialized;
         if (isInitialized == 1) return true;
@@ -872,7 +859,6 @@ public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public void writeTo(com.google.protobuf.CodedOutputStream output)
                           throws java.io.IOException {
         if (!getUsernameBytes().isEmpty()) {
@@ -884,7 +870,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         unknownFields.writeTo(output);
       }
 
-      @java.lang.Override
       public int getSerializedSize() {
         int size = memoizedSize;
         if (size != -1) return size;
@@ -1006,7 +991,6 @@ public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authenticat
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
-      @java.lang.Override
       public Builder newBuilderForType() { return newBuilder(); }
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
@@ -1014,7 +998,6 @@ public static Builder newBuilder() {
       public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
-      @java.lang.Override
       public Builder toBuilder() {
         return this == DEFAULT_INSTANCE
             ? new Builder() : new Builder().mergeFrom(this);
@@ -1042,7 +1025,6 @@ public static final class Builder extends
           return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_GoogleAccount_descriptor;
         }
 
-        @java.lang.Override
         protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
           return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_GoogleAccount_fieldAccessorTable
@@ -1065,7 +1047,6 @@ private void maybeForceBuilderInitialization() {
                   .alwaysUseFieldBuilders) {
           }
         }
-        @java.lang.Override
         public Builder clear() {
           super.clear();
           username_ = "";
@@ -1075,18 +1056,15 @@ public Builder clear() {
           return this;
         }
 
-        @java.lang.Override
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
           return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_GoogleAccount_descriptor;
         }
 
-        @java.lang.Override
         public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount getDefaultInstanceForType() {
           return com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount.getDefaultInstance();
         }
 
-        @java.lang.Override
         public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount build() {
           com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount result = buildPartial();
           if (!result.isInitialized()) {
@@ -1095,7 +1073,6 @@ public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.Goo
           return result;
         }
 
-        @java.lang.Override
         public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount buildPartial() {
           com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount result = new com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount(this);
           result.username_ = username_;
@@ -1104,39 +1081,32 @@ public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.Goo
           return result;
         }
 
-        @java.lang.Override
         public Builder clone() {
           return (Builder) super.clone();
         }
-        @java.lang.Override
         public Builder setField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.setField(field, value);
         }
-        @java.lang.Override
         public Builder clearField(
             com.google.protobuf.Descriptors.FieldDescriptor field) {
           return (Builder) super.clearField(field);
         }
-        @java.lang.Override
         public Builder clearOneof(
             com.google.protobuf.Descriptors.OneofDescriptor oneof) {
           return (Builder) super.clearOneof(oneof);
         }
-        @java.lang.Override
         public Builder setRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return (Builder) super.setRepeatedField(field, index, value);
         }
-        @java.lang.Override
         public Builder addRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.addRepeatedField(field, value);
         }
-        @java.lang.Override
         public Builder mergeFrom(com.google.protobuf.Message other) {
           if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount) {
             return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount)other);
@@ -1161,12 +1131,10 @@ public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.
           return this;
         }
 
-        @java.lang.Override
         public final boolean isInitialized() {
           return true;
         }
 
-        @java.lang.Override
         public Builder mergeFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1382,13 +1350,11 @@ public Builder setPasswordBytes(
           onChanged();
           return this;
         }
-        @java.lang.Override
         public final Builder setUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.setUnknownFieldsProto3(unknownFields);
         }
 
-        @java.lang.Override
         public final Builder mergeUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
@@ -1410,12 +1376,11 @@ public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authenticat
 
       private static final com.google.protobuf.Parser
           PARSER = new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
         public GoogleAccount parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new GoogleAccount(input, extensionRegistry);
+            return new GoogleAccount(input, extensionRegistry);
         }
       };
 
@@ -1428,7 +1393,6 @@ public com.google.protobuf.Parser getParserForType() {
         return PARSER;
       }
 
-      @java.lang.Override
       public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.GoogleAccount getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
@@ -1535,9 +1499,6 @@ private CustomAccount(
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
         this();
-        if (extensionRegistry == null) {
-          throw new java.lang.NullPointerException();
-        }
         int mutable_bitField0_ = 0;
         com.google.protobuf.UnknownFieldSet.Builder unknownFields =
             com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -1549,6 +1510,13 @@ private CustomAccount(
               case 0:
                 done = true;
                 break;
+              default: {
+                if (!parseUnknownFieldProto3(
+                    input, unknownFields, extensionRegistry, tag)) {
+                  done = true;
+                }
+                break;
+              }
               case 10: {
                 java.lang.String s = input.readStringRequireUtf8();
 
@@ -1567,13 +1535,6 @@ private CustomAccount(
                 loginUrl_ = s;
                 break;
               }
-              default: {
-                if (!parseUnknownFieldProto3(
-                    input, unknownFields, extensionRegistry, tag)) {
-                  done = true;
-                }
-                break;
-              }
             }
           }
         } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -1591,7 +1552,6 @@ private CustomAccount(
         return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_CustomAccount_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_CustomAccount_fieldAccessorTable
@@ -1736,7 +1696,6 @@ public java.lang.String getLoginUrl() {
       }
 
       private byte memoizedIsInitialized = -1;
-      @java.lang.Override
       public final boolean isInitialized() {
         byte isInitialized = memoizedIsInitialized;
         if (isInitialized == 1) return true;
@@ -1746,7 +1705,6 @@ public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public void writeTo(com.google.protobuf.CodedOutputStream output)
                           throws java.io.IOException {
         if (!getUsernameBytes().isEmpty()) {
@@ -1761,7 +1719,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
         unknownFields.writeTo(output);
       }
 
-      @java.lang.Override
       public int getSerializedSize() {
         int size = memoizedSize;
         if (size != -1) return size;
@@ -1890,7 +1847,6 @@ public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authenticat
             .parseWithIOException(PARSER, input, extensionRegistry);
       }
 
-      @java.lang.Override
       public Builder newBuilderForType() { return newBuilder(); }
       public static Builder newBuilder() {
         return DEFAULT_INSTANCE.toBuilder();
@@ -1898,7 +1854,6 @@ public static Builder newBuilder() {
       public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount prototype) {
         return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
       }
-      @java.lang.Override
       public Builder toBuilder() {
         return this == DEFAULT_INSTANCE
             ? new Builder() : new Builder().mergeFrom(this);
@@ -1926,7 +1881,6 @@ public static final class Builder extends
           return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_CustomAccount_descriptor;
         }
 
-        @java.lang.Override
         protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
             internalGetFieldAccessorTable() {
           return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_CustomAccount_fieldAccessorTable
@@ -1949,7 +1903,6 @@ private void maybeForceBuilderInitialization() {
                   .alwaysUseFieldBuilders) {
           }
         }
-        @java.lang.Override
         public Builder clear() {
           super.clear();
           username_ = "";
@@ -1961,18 +1914,15 @@ public Builder clear() {
           return this;
         }
 
-        @java.lang.Override
         public com.google.protobuf.Descriptors.Descriptor
             getDescriptorForType() {
           return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_CustomAccount_descriptor;
         }
 
-        @java.lang.Override
         public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount getDefaultInstanceForType() {
           return com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount.getDefaultInstance();
         }
 
-        @java.lang.Override
         public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount build() {
           com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount result = buildPartial();
           if (!result.isInitialized()) {
@@ -1981,7 +1931,6 @@ public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.Cus
           return result;
         }
 
-        @java.lang.Override
         public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount buildPartial() {
           com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount result = new com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount(this);
           result.username_ = username_;
@@ -1991,39 +1940,32 @@ public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.Cus
           return result;
         }
 
-        @java.lang.Override
         public Builder clone() {
           return (Builder) super.clone();
         }
-        @java.lang.Override
         public Builder setField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.setField(field, value);
         }
-        @java.lang.Override
         public Builder clearField(
             com.google.protobuf.Descriptors.FieldDescriptor field) {
           return (Builder) super.clearField(field);
         }
-        @java.lang.Override
         public Builder clearOneof(
             com.google.protobuf.Descriptors.OneofDescriptor oneof) {
           return (Builder) super.clearOneof(oneof);
         }
-        @java.lang.Override
         public Builder setRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             int index, java.lang.Object value) {
           return (Builder) super.setRepeatedField(field, index, value);
         }
-        @java.lang.Override
         public Builder addRepeatedField(
             com.google.protobuf.Descriptors.FieldDescriptor field,
             java.lang.Object value) {
           return (Builder) super.addRepeatedField(field, value);
         }
-        @java.lang.Override
         public Builder mergeFrom(com.google.protobuf.Message other) {
           if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount) {
             return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount)other);
@@ -2052,12 +1994,10 @@ public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.
           return this;
         }
 
-        @java.lang.Override
         public final boolean isInitialized() {
           return true;
         }
 
-        @java.lang.Override
         public Builder mergeFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -2367,13 +2307,11 @@ public Builder setLoginUrlBytes(
           onChanged();
           return this;
         }
-        @java.lang.Override
         public final Builder setUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.setUnknownFieldsProto3(unknownFields);
         }
 
-        @java.lang.Override
         public final Builder mergeUnknownFields(
             final com.google.protobuf.UnknownFieldSet unknownFields) {
           return super.mergeUnknownFields(unknownFields);
@@ -2395,12 +2333,11 @@ public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authenticat
 
       private static final com.google.protobuf.Parser
           PARSER = new com.google.protobuf.AbstractParser() {
-        @java.lang.Override
         public CustomAccount parsePartialFrom(
             com.google.protobuf.CodedInputStream input,
             com.google.protobuf.ExtensionRegistryLite extensionRegistry)
             throws com.google.protobuf.InvalidProtocolBufferException {
-          return new CustomAccount(input, extensionRegistry);
+            return new CustomAccount(input, extensionRegistry);
         }
       };
 
@@ -2413,7 +2350,6 @@ public com.google.protobuf.Parser getParserForType() {
         return PARSER;
       }
 
-      @java.lang.Override
       public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.CustomAccount getDefaultInstanceForType() {
         return DEFAULT_INSTANCE;
       }
@@ -2535,7 +2471,6 @@ public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.Cus
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -2545,7 +2480,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (authenticationCase_ == 1) {
@@ -2557,7 +2491,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -2700,7 +2633,6 @@ public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authenticat
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -2708,7 +2640,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -2736,7 +2667,6 @@ public static final class Builder extends
         return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_fieldAccessorTable
@@ -2759,7 +2689,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         authenticationCase_ = 0;
@@ -2767,18 +2696,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Authentication_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication getDefaultInstanceForType() {
         return com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication build() {
         com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication result = buildPartial();
         if (!result.isInitialized()) {
@@ -2787,7 +2713,6 @@ public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication bui
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication buildPartial() {
         com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication result = new com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication(this);
         if (authenticationCase_ == 1) {
@@ -2809,39 +2734,32 @@ public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication bui
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication) {
           return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication)other);
@@ -2871,12 +2789,10 @@ public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -3253,13 +3169,11 @@ public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication.Cus
         onChanged();;
         return customAccountBuilder_;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -3281,12 +3195,11 @@ public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authenticat
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Authentication parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Authentication(input, extensionRegistry);
+          return new Authentication(input, extensionRegistry);
       }
     };
 
@@ -3299,7 +3212,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Authentication getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -3384,9 +3296,6 @@ private Schedule(
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
       this();
-      if (extensionRegistry == null) {
-        throw new java.lang.NullPointerException();
-      }
       int mutable_bitField0_ = 0;
       com.google.protobuf.UnknownFieldSet.Builder unknownFields =
           com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -3398,6 +3307,13 @@ private Schedule(
             case 0:
               done = true;
               break;
+            default: {
+              if (!parseUnknownFieldProto3(
+                  input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
             case 10: {
               com.google.protobuf.Timestamp.Builder subBuilder = null;
               if (scheduleTime_ != null) {
@@ -3416,13 +3332,6 @@ private Schedule(
               intervalDurationDays_ = input.readInt32();
               break;
             }
-            default: {
-              if (!parseUnknownFieldProto3(
-                  input, unknownFields, extensionRegistry, tag)) {
-                done = true;
-              }
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -3440,7 +3349,6 @@ private Schedule(
       return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Schedule_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Schedule_fieldAccessorTable
@@ -3505,7 +3413,6 @@ public int getIntervalDurationDays() {
     }
 
     private byte memoizedIsInitialized = -1;
-    @java.lang.Override
     public final boolean isInitialized() {
       byte isInitialized = memoizedIsInitialized;
       if (isInitialized == 1) return true;
@@ -3515,7 +3422,6 @@ public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       if (scheduleTime_ != null) {
@@ -3527,7 +3433,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
       unknownFields.writeTo(output);
     }
 
-    @java.lang.Override
     public int getSerializedSize() {
       int size = memoizedSize;
       if (size != -1) return size;
@@ -3656,7 +3561,6 @@ public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule pa
           .parseWithIOException(PARSER, input, extensionRegistry);
     }
 
-    @java.lang.Override
     public Builder newBuilderForType() { return newBuilder(); }
     public static Builder newBuilder() {
       return DEFAULT_INSTANCE.toBuilder();
@@ -3664,7 +3568,6 @@ public static Builder newBuilder() {
     public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule prototype) {
       return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
     }
-    @java.lang.Override
     public Builder toBuilder() {
       return this == DEFAULT_INSTANCE
           ? new Builder() : new Builder().mergeFrom(this);
@@ -3692,7 +3595,6 @@ public static final class Builder extends
         return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Schedule_descriptor;
       }
 
-      @java.lang.Override
       protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
           internalGetFieldAccessorTable() {
         return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Schedule_fieldAccessorTable
@@ -3715,7 +3617,6 @@ private void maybeForceBuilderInitialization() {
                 .alwaysUseFieldBuilders) {
         }
       }
-      @java.lang.Override
       public Builder clear() {
         super.clear();
         if (scheduleTimeBuilder_ == null) {
@@ -3729,18 +3630,15 @@ public Builder clear() {
         return this;
       }
 
-      @java.lang.Override
       public com.google.protobuf.Descriptors.Descriptor
           getDescriptorForType() {
         return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_Schedule_descriptor;
       }
 
-      @java.lang.Override
       public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule getDefaultInstanceForType() {
         return com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule.getDefaultInstance();
       }
 
-      @java.lang.Override
       public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule build() {
         com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule result = buildPartial();
         if (!result.isInitialized()) {
@@ -3749,7 +3647,6 @@ public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule build() {
         return result;
       }
 
-      @java.lang.Override
       public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule buildPartial() {
         com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule result = new com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule(this);
         if (scheduleTimeBuilder_ == null) {
@@ -3762,39 +3659,32 @@ public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule buildPart
         return result;
       }
 
-      @java.lang.Override
       public Builder clone() {
         return (Builder) super.clone();
       }
-      @java.lang.Override
       public Builder setField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.setField(field, value);
       }
-      @java.lang.Override
       public Builder clearField(
           com.google.protobuf.Descriptors.FieldDescriptor field) {
         return (Builder) super.clearField(field);
       }
-      @java.lang.Override
       public Builder clearOneof(
           com.google.protobuf.Descriptors.OneofDescriptor oneof) {
         return (Builder) super.clearOneof(oneof);
       }
-      @java.lang.Override
       public Builder setRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           int index, java.lang.Object value) {
         return (Builder) super.setRepeatedField(field, index, value);
       }
-      @java.lang.Override
       public Builder addRepeatedField(
           com.google.protobuf.Descriptors.FieldDescriptor field,
           java.lang.Object value) {
         return (Builder) super.addRepeatedField(field, value);
       }
-      @java.lang.Override
       public Builder mergeFrom(com.google.protobuf.Message other) {
         if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule) {
           return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule)other);
@@ -3817,12 +3707,10 @@ public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ScanConfig.
         return this;
       }
 
-      @java.lang.Override
       public final boolean isInitialized() {
         return true;
       }
 
-      @java.lang.Override
       public Builder mergeFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -4061,13 +3949,11 @@ public Builder clearIntervalDurationDays() {
         onChanged();
         return this;
       }
-      @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.setUnknownFieldsProto3(unknownFields);
       }
 
-      @java.lang.Override
       public final Builder mergeUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
         return super.mergeUnknownFields(unknownFields);
@@ -4089,12 +3975,11 @@ public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule ge
 
     private static final com.google.protobuf.Parser
         PARSER = new com.google.protobuf.AbstractParser() {
-      @java.lang.Override
       public Schedule parsePartialFrom(
           com.google.protobuf.CodedInputStream input,
           com.google.protobuf.ExtensionRegistryLite extensionRegistry)
           throws com.google.protobuf.InvalidProtocolBufferException {
-        return new Schedule(input, extensionRegistry);
+          return new Schedule(input, extensionRegistry);
       }
     };
 
@@ -4107,7 +3992,6 @@ public com.google.protobuf.Parser getParserForType() {
       return PARSER;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Schedule getDefaultInstanceForType() {
       return DEFAULT_INSTANCE;
     }
@@ -4326,7 +4210,6 @@ public int getUserAgentValue() {
    * .google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent user_agent = 6;
    */
   public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent getUserAgent() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent result = com.google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent.valueOf(userAgent_);
     return result == null ? com.google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent.UNRECOGNIZED : result;
   }
@@ -4420,7 +4303,6 @@ public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.ScheduleOrBuilder
           new com.google.protobuf.Internal.ListAdapter.Converter<
               java.lang.Integer, com.google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform>() {
             public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform convert(java.lang.Integer from) {
-              @SuppressWarnings("deprecation")
               com.google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform result = com.google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform.valueOf(from);
               return result == null ? com.google.cloud.websecurityscanner.v1alpha.ScanConfig.TargetPlatform.UNRECOGNIZED : result;
             }
@@ -4485,7 +4367,6 @@ public int getTargetPlatformsValue(int index) {
   private int targetPlatformsMemoizedSerializedSize;
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -4495,7 +4376,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     getSerializedSize();
@@ -4533,7 +4413,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -4741,7 +4620,6 @@ public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -4749,7 +4627,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ScanConfig prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -4777,7 +4654,6 @@ public static final class Builder extends
       return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_fieldAccessorTable
@@ -4800,7 +4676,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -4832,18 +4707,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.websecurityscanner.v1alpha.ScanConfigProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanConfig_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ScanConfig getDefaultInstanceForType() {
       return com.google.cloud.websecurityscanner.v1alpha.ScanConfig.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ScanConfig build() {
       com.google.cloud.websecurityscanner.v1alpha.ScanConfig result = buildPartial();
       if (!result.isInitialized()) {
@@ -4852,7 +4724,6 @@ public com.google.cloud.websecurityscanner.v1alpha.ScanConfig build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ScanConfig buildPartial() {
       com.google.cloud.websecurityscanner.v1alpha.ScanConfig result = new com.google.cloud.websecurityscanner.v1alpha.ScanConfig(this);
       int from_bitField0_ = bitField0_;
@@ -4891,39 +4762,32 @@ public com.google.cloud.websecurityscanner.v1alpha.ScanConfig buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ScanConfig) {
         return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ScanConfig)other);
@@ -4990,12 +4854,10 @@ public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ScanConfig
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -5587,7 +5449,6 @@ public Builder setUserAgentValue(int value) {
      * .google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent user_agent = 6;
      */
     public com.google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent getUserAgent() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent result = com.google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent.valueOf(userAgent_);
       return result == null ? com.google.cloud.websecurityscanner.v1alpha.ScanConfig.UserAgent.UNRECOGNIZED : result;
     }
@@ -6090,13 +5951,11 @@ public Builder addAllTargetPlatformsValue(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -6118,12 +5977,11 @@ public static com.google.cloud.websecurityscanner.v1alpha.ScanConfig getDefaultI
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ScanConfig parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ScanConfig(input, extensionRegistry);
+        return new ScanConfig(input, extensionRegistry);
     }
   };
 
@@ -6136,7 +5994,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.websecurityscanner.v1alpha.ScanConfig getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfigProto.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfigProto.java
index 97cacbf2db6f..2bebbc2d7baf 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfigProto.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanConfigProto.java
@@ -57,7 +57,7 @@ public static void registerAllExtensions(
       "ing_urls\030\004 \003(\t\022Z\n\016authentication\030\005 \001(\0132B" +
       ".google.cloud.websecurityscanner.v1alpha" +
       ".ScanConfig.Authentication\022Q\n\nuser_agent" +
-      "\030\006 \001(\0162=.google.cloud.websecurityscanner" +
+      "\030\006 \001(\0162=.google.cloud.websecurityscanner",
       ".v1alpha.ScanConfig.UserAgent\022\032\n\022blackli" +
       "st_patterns\030\007 \003(\t\022N\n\010schedule\030\010 \001(\0132<.go" +
       "ogle.cloud.websecurityscanner.v1alpha.Sc" +
@@ -67,7 +67,7 @@ public static void registerAllExtensions(
       "entication\022j\n\016google_account\030\001 \001(\0132P.goo" +
       "gle.cloud.websecurityscanner.v1alpha.Sca" +
       "nConfig.Authentication.GoogleAccountH\000\022j" +
-      "\n\016custom_account\030\002 \001(\0132P.google.cloud.we" +
+      "\n\016custom_account\030\002 \001(\0132P.google.cloud.we",
       "bsecurityscanner.v1alpha.ScanConfig.Auth" +
       "entication.CustomAccountH\000\0323\n\rGoogleAcco" +
       "unt\022\020\n\010username\030\001 \001(\t\022\020\n\010password\030\002 \001(\t\032" +
@@ -77,7 +77,7 @@ public static void registerAllExtensions(
       " \001(\0132\032.google.protobuf.Timestamp\022\036\n\026inte" +
       "rval_duration_days\030\002 \001(\005\"`\n\tUserAgent\022\032\n" +
       "\026USER_AGENT_UNSPECIFIED\020\000\022\020\n\014CHROME_LINU" +
-      "X\020\001\022\022\n\016CHROME_ANDROID\020\002\022\021\n\rSAFARI_IPHONE" +
+      "X\020\001\022\022\n\016CHROME_ANDROID\020\002\022\021\n\rSAFARI_IPHONE",
       "\020\003\"N\n\016TargetPlatform\022\037\n\033TARGET_PLATFORM_" +
       "UNSPECIFIED\020\000\022\016\n\nAPP_ENGINE\020\001\022\013\n\007COMPUTE" +
       "\020\002B\233\001\n+com.google.cloud.websecurityscann" +
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRun.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRun.java
index 8d6c4e7ebc32..5b74198f2be4 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRun.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRun.java
@@ -39,9 +39,6 @@ private ScanRun(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -53,6 +50,13 @@ private ScanRun(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -117,13 +121,6 @@ private ScanRun(
             progressPercent_ = input.readInt32();
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -141,7 +138,6 @@ private ScanRun(
     return com.google.cloud.websecurityscanner.v1alpha.ScanRunProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanRun_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.websecurityscanner.v1alpha.ScanRunProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanRun_fieldAccessorTable
@@ -527,7 +523,6 @@ public int getExecutionStateValue() {
    * .google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState execution_state = 2;
    */
   public com.google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState getExecutionState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState result = com.google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState.valueOf(executionState_);
     return result == null ? com.google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState.UNRECOGNIZED : result;
   }
@@ -556,7 +551,6 @@ public int getResultStateValue() {
    * .google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState result_state = 3;
    */
   public com.google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState getResultState() {
-    @SuppressWarnings("deprecation")
     com.google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState result = com.google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState.valueOf(resultState_);
     return result == null ? com.google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState.UNRECOGNIZED : result;
   }
@@ -700,7 +694,6 @@ public int getProgressPercent() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -710,7 +703,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -743,7 +735,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -933,7 +924,6 @@ public static com.google.cloud.websecurityscanner.v1alpha.ScanRun parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -941,7 +931,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ScanRun prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -969,7 +958,6 @@ public static final class Builder extends
       return com.google.cloud.websecurityscanner.v1alpha.ScanRunProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanRun_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.websecurityscanner.v1alpha.ScanRunProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanRun_fieldAccessorTable
@@ -992,7 +980,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -1024,18 +1011,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.websecurityscanner.v1alpha.ScanRunProto.internal_static_google_cloud_websecurityscanner_v1alpha_ScanRun_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ScanRun getDefaultInstanceForType() {
       return com.google.cloud.websecurityscanner.v1alpha.ScanRun.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ScanRun build() {
       com.google.cloud.websecurityscanner.v1alpha.ScanRun result = buildPartial();
       if (!result.isInitialized()) {
@@ -1044,7 +1028,6 @@ public com.google.cloud.websecurityscanner.v1alpha.ScanRun build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ScanRun buildPartial() {
       com.google.cloud.websecurityscanner.v1alpha.ScanRun result = new com.google.cloud.websecurityscanner.v1alpha.ScanRun(this);
       result.name_ = name_;
@@ -1068,39 +1051,32 @@ public com.google.cloud.websecurityscanner.v1alpha.ScanRun buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ScanRun) {
         return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ScanRun)other);
@@ -1145,12 +1121,10 @@ public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ScanRun oth
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -1307,7 +1281,6 @@ public Builder setExecutionStateValue(int value) {
      * .google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState execution_state = 2;
      */
     public com.google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState getExecutionState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState result = com.google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState.valueOf(executionState_);
       return result == null ? com.google.cloud.websecurityscanner.v1alpha.ScanRun.ExecutionState.UNRECOGNIZED : result;
     }
@@ -1380,7 +1353,6 @@ public Builder setResultStateValue(int value) {
      * .google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState result_state = 3;
      */
     public com.google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState getResultState() {
-      @SuppressWarnings("deprecation")
       com.google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState result = com.google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState.valueOf(resultState_);
       return result == null ? com.google.cloud.websecurityscanner.v1alpha.ScanRun.ResultState.UNRECOGNIZED : result;
     }
@@ -1935,13 +1907,11 @@ public Builder clearProgressPercent() {
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -1963,12 +1933,11 @@ public static com.google.cloud.websecurityscanner.v1alpha.ScanRun getDefaultInst
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ScanRun parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ScanRun(input, extensionRegistry);
+        return new ScanRun(input, extensionRegistry);
     }
   };
 
@@ -1981,7 +1950,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.websecurityscanner.v1alpha.ScanRun getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRunProto.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRunProto.java
index b3fb403b5615..15867ad68338 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRunProto.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ScanRunProto.java
@@ -37,7 +37,7 @@ public static void registerAllExtensions(
       "anner.v1alpha.ScanRun.ExecutionState\022R\n\014" +
       "result_state\030\003 \001(\0162<.google.cloud.websec" +
       "urityscanner.v1alpha.ScanRun.ResultState" +
-      "\022.\n\nstart_time\030\004 \001(\0132\032.google.protobuf.T" +
+      "\022.\n\nstart_time\030\004 \001(\0132\032.google.protobuf.T",
       "imestamp\022,\n\010end_time\030\005 \001(\0132\032.google.prot" +
       "obuf.Timestamp\022\032\n\022urls_crawled_count\030\006 \001" +
       "(\003\022\031\n\021urls_tested_count\030\007 \001(\003\022\033\n\023has_vul" +
@@ -47,7 +47,7 @@ public static void registerAllExtensions(
       "\002\022\014\n\010FINISHED\020\003\"O\n\013ResultState\022\034\n\030RESULT" +
       "_STATE_UNSPECIFIED\020\000\022\013\n\007SUCCESS\020\001\022\t\n\005ERR" +
       "OR\020\002\022\n\n\006KILLED\020\003B\230\001\n+com.google.cloud.we" +
-      "bsecurityscanner.v1alphaB\014ScanRunProtoP\001" +
+      "bsecurityscanner.v1alphaB\014ScanRunProtoP\001",
       "ZYgoogle.golang.org/genproto/googleapis/" +
       "cloud/websecurityscanner/v1alpha;websecu" +
       "rityscannerb\006proto3"
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StartScanRunRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StartScanRunRequest.java
index aeb7d4acb655..81f4c11afc02 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StartScanRunRequest.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StartScanRunRequest.java
@@ -33,9 +33,6 @@ private StartScanRunRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private StartScanRunRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private StartScanRunRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private StartScanRunRequest(
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_StartScanRunRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_StartScanRunRequest_fieldAccessorTable
@@ -132,7 +128,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -142,7 +137,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -151,7 +145,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -266,7 +259,6 @@ public static com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest pa
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -274,7 +266,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -302,7 +293,6 @@ public static final class Builder extends
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_StartScanRunRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_StartScanRunRequest_fieldAccessorTable
@@ -325,7 +315,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -333,18 +322,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_StartScanRunRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest getDefaultInstanceForType() {
       return com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest build() {
       com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -353,7 +339,6 @@ public com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest buildPartial() {
       com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest result = new com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest(this);
       result.name_ = name_;
@@ -361,39 +346,32 @@ public com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest buildPart
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest) {
         return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest)other);
@@ -414,12 +392,10 @@ public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.StartScanRu
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -536,13 +512,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -564,12 +538,11 @@ public static com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest ge
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public StartScanRunRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StartScanRunRequest(input, extensionRegistry);
+        return new StartScanRunRequest(input, extensionRegistry);
     }
   };
 
@@ -582,7 +555,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.websecurityscanner.v1alpha.StartScanRunRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StopScanRunRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StopScanRunRequest.java
index 77d7f06d10a9..092d7d91cc56 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StopScanRunRequest.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/StopScanRunRequest.java
@@ -33,9 +33,6 @@ private StopScanRunRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,12 +44,6 @@ private StopScanRunRequest(
           case 0:
             done = true;
             break;
-          case 10: {
-            java.lang.String s = input.readStringRequireUtf8();
-
-            name_ = s;
-            break;
-          }
           default: {
             if (!parseUnknownFieldProto3(
                 input, unknownFields, extensionRegistry, tag)) {
@@ -60,6 +51,12 @@ private StopScanRunRequest(
             }
             break;
           }
+          case 10: {
+            java.lang.String s = input.readStringRequireUtf8();
+
+            name_ = s;
+            break;
+          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -77,7 +74,6 @@ private StopScanRunRequest(
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_StopScanRunRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_StopScanRunRequest_fieldAccessorTable
@@ -134,7 +130,6 @@ public java.lang.String getName() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -144,7 +139,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getNameBytes().isEmpty()) {
@@ -153,7 +147,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -268,7 +261,6 @@ public static com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest par
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -276,7 +268,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -304,7 +295,6 @@ public static final class Builder extends
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_StopScanRunRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_StopScanRunRequest_fieldAccessorTable
@@ -327,7 +317,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       name_ = "";
@@ -335,18 +324,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_StopScanRunRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest getDefaultInstanceForType() {
       return com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest build() {
       com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -355,7 +341,6 @@ public com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest buildPartial() {
       com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest result = new com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest(this);
       result.name_ = name_;
@@ -363,39 +348,32 @@ public com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest buildParti
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest) {
         return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest)other);
@@ -416,12 +394,10 @@ public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.StopScanRun
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -543,13 +519,11 @@ public Builder setNameBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -571,12 +545,11 @@ public static com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest get
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public StopScanRunRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new StopScanRunRequest(input, extensionRegistry);
+        return new StopScanRunRequest(input, extensionRegistry);
     }
   };
 
@@ -589,7 +562,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.websecurityscanner.v1alpha.StopScanRunRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/UpdateScanConfigRequest.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/UpdateScanConfigRequest.java
index 106775e56159..1a89abb09765 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/UpdateScanConfigRequest.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/UpdateScanConfigRequest.java
@@ -32,9 +32,6 @@ private UpdateScanConfigRequest(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -46,6 +43,13 @@ private UpdateScanConfigRequest(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 18: {
             com.google.cloud.websecurityscanner.v1alpha.ScanConfig.Builder subBuilder = null;
             if (scanConfig_ != null) {
@@ -72,13 +76,6 @@ private UpdateScanConfigRequest(
 
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -96,7 +93,6 @@ private UpdateScanConfigRequest(
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_UpdateScanConfigRequest_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_UpdateScanConfigRequest_fieldAccessorTable
@@ -189,7 +185,6 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -199,7 +194,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (scanConfig_ != null) {
@@ -211,7 +205,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -345,7 +338,6 @@ public static com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigReques
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -353,7 +345,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -381,7 +372,6 @@ public static final class Builder extends
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_UpdateScanConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_UpdateScanConfigRequest_fieldAccessorTable
@@ -404,7 +394,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       if (scanConfigBuilder_ == null) {
@@ -422,18 +411,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.websecurityscanner.v1alpha.WebSecurityScannerProto.internal_static_google_cloud_websecurityscanner_v1alpha_UpdateScanConfigRequest_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest getDefaultInstanceForType() {
       return com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest build() {
       com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest result = buildPartial();
       if (!result.isInitialized()) {
@@ -442,7 +428,6 @@ public com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest build
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest buildPartial() {
       com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest result = new com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest(this);
       if (scanConfigBuilder_ == null) {
@@ -459,39 +444,32 @@ public com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest build
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest) {
         return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest)other);
@@ -514,12 +492,10 @@ public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.UpdateScanC
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -897,13 +873,11 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() {
       }
       return updateMaskBuilder_;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -925,12 +899,11 @@ public static com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigReques
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public UpdateScanConfigRequest parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new UpdateScanConfigRequest(input, extensionRegistry);
+        return new UpdateScanConfigRequest(input, extensionRegistry);
     }
   };
 
@@ -943,7 +916,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.websecurityscanner.v1alpha.UpdateScanConfigRequest getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ViolatingResource.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ViolatingResource.java
index 02a0c77edb2c..46e50e89559c 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ViolatingResource.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/ViolatingResource.java
@@ -35,9 +35,6 @@ private ViolatingResource(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -49,6 +46,13 @@ private ViolatingResource(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
 
@@ -61,13 +65,6 @@ private ViolatingResource(
             resourceUrl_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -85,7 +82,6 @@ private ViolatingResource(
     return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_ViolatingResource_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_ViolatingResource_fieldAccessorTable
@@ -178,7 +174,6 @@ public java.lang.String getResourceUrl() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -188,7 +183,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     if (!getContentTypeBytes().isEmpty()) {
@@ -200,7 +194,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -322,7 +315,6 @@ public static com.google.cloud.websecurityscanner.v1alpha.ViolatingResource pars
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -330,7 +322,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.ViolatingResource prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -359,7 +350,6 @@ public static final class Builder extends
       return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_ViolatingResource_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_ViolatingResource_fieldAccessorTable
@@ -382,7 +372,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       contentType_ = "";
@@ -392,18 +381,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_ViolatingResource_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ViolatingResource getDefaultInstanceForType() {
       return com.google.cloud.websecurityscanner.v1alpha.ViolatingResource.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ViolatingResource build() {
       com.google.cloud.websecurityscanner.v1alpha.ViolatingResource result = buildPartial();
       if (!result.isInitialized()) {
@@ -412,7 +398,6 @@ public com.google.cloud.websecurityscanner.v1alpha.ViolatingResource build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.ViolatingResource buildPartial() {
       com.google.cloud.websecurityscanner.v1alpha.ViolatingResource result = new com.google.cloud.websecurityscanner.v1alpha.ViolatingResource(this);
       result.contentType_ = contentType_;
@@ -421,39 +406,32 @@ public com.google.cloud.websecurityscanner.v1alpha.ViolatingResource buildPartia
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.websecurityscanner.v1alpha.ViolatingResource) {
         return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.ViolatingResource)other);
@@ -478,12 +456,10 @@ public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.ViolatingRe
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -679,13 +655,11 @@ public Builder setResourceUrlBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -707,12 +681,11 @@ public static com.google.cloud.websecurityscanner.v1alpha.ViolatingResource getD
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public ViolatingResource parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new ViolatingResource(input, extensionRegistry);
+        return new ViolatingResource(input, extensionRegistry);
     }
   };
 
@@ -725,7 +698,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.websecurityscanner.v1alpha.ViolatingResource getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/VulnerableParameters.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/VulnerableParameters.java
index 52d0121c17d8..8a8e95fdbb03 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/VulnerableParameters.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/VulnerableParameters.java
@@ -33,9 +33,6 @@ private VulnerableParameters(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -47,6 +44,13 @@ private VulnerableParameters(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -56,13 +60,6 @@ private VulnerableParameters(
             parameterNames_.add(s);
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -83,7 +80,6 @@ private VulnerableParameters(
     return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_VulnerableParameters_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_VulnerableParameters_fieldAccessorTable
@@ -137,7 +133,6 @@ public java.lang.String getParameterNames(int index) {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -147,7 +142,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < parameterNames_.size(); i++) {
@@ -156,7 +150,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -278,7 +271,6 @@ public static com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters p
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -286,7 +278,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -314,7 +305,6 @@ public static final class Builder extends
       return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_VulnerableParameters_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_VulnerableParameters_fieldAccessorTable
@@ -337,7 +327,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       parameterNames_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -345,18 +334,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_VulnerableParameters_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters getDefaultInstanceForType() {
       return com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters build() {
       com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters result = buildPartial();
       if (!result.isInitialized()) {
@@ -365,7 +351,6 @@ public com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters build()
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters buildPartial() {
       com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters result = new com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters(this);
       int from_bitField0_ = bitField0_;
@@ -378,39 +363,32 @@ public com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters buildPar
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters) {
         return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters)other);
@@ -437,12 +415,10 @@ public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.VulnerableP
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -591,13 +567,11 @@ public Builder addParameterNamesBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -619,12 +593,11 @@ public static com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters g
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public VulnerableParameters parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new VulnerableParameters(input, extensionRegistry);
+        return new VulnerableParameters(input, extensionRegistry);
     }
   };
 
@@ -637,7 +610,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.websecurityscanner.v1alpha.VulnerableParameters getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerProto.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerProto.java
index 643d134bdf38..86748c2e64db 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerProto.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerProto.java
@@ -122,7 +122,7 @@ public static void registerAllExtensions(
       "finding.proto\032@google/cloud/websecuritys" +
       "canner/v1alpha/finding_type_stats.proto\032" +
       "9google/cloud/websecurityscanner/v1alpha" +
-      "/scan_config.proto\0326google/cloud/websecu" +
+      "/scan_config.proto\0326google/cloud/websecu",
       "rityscanner/v1alpha/scan_run.proto\032\033goog" +
       "le/protobuf/empty.proto\032 google/protobuf" +
       "/field_mask.proto\"s\n\027CreateScanConfigReq" +
@@ -132,7 +132,7 @@ public static void registerAllExtensions(
       "t\022\014\n\004name\030\001 \001(\t\"$\n\024GetScanConfigRequest\022" +
       "\014\n\004name\030\001 \001(\t\"O\n\026ListScanConfigsRequest\022" +
       "\016\n\006parent\030\001 \001(\t\022\022\n\npage_token\030\002 \001(\t\022\021\n\tp" +
-      "age_size\030\003 \001(\005\"\224\001\n\027UpdateScanConfigReque" +
+      "age_size\030\003 \001(\005\"\224\001\n\027UpdateScanConfigReque",
       "st\022H\n\013scan_config\030\002 \001(\01323.google.cloud.w" +
       "ebsecurityscanner.v1alpha.ScanConfig\022/\n\013" +
       "update_mask\030\003 \001(\0132\032.google.protobuf.Fiel" +
@@ -142,7 +142,7 @@ public static void registerAllExtensions(
       "_token\030\002 \001(\t\"#\n\023StartScanRunRequest\022\014\n\004n" +
       "ame\030\001 \001(\t\"!\n\021GetScanRunRequest\022\014\n\004name\030\001" +
       " \001(\t\"L\n\023ListScanRunsRequest\022\016\n\006parent\030\001 " +
-      "\001(\t\022\022\n\npage_token\030\002 \001(\t\022\021\n\tpage_size\030\003 \001" +
+      "\001(\t\022\022\n\npage_token\030\002 \001(\t\022\021\n\tpage_size\030\003 \001",
       "(\005\"t\n\024ListScanRunsResponse\022C\n\tscan_runs\030" +
       "\001 \003(\01320.google.cloud.websecurityscanner." +
       "v1alpha.ScanRun\022\027\n\017next_page_token\030\002 \001(\t" +
@@ -152,7 +152,7 @@ public static void registerAllExtensions(
       "\027ListCrawledUrlsResponse\022I\n\014crawled_urls" +
       "\030\001 \003(\01323.google.cloud.websecurityscanner" +
       ".v1alpha.CrawledUrl\022\027\n\017next_page_token\030\002" +
-      " \001(\t\"!\n\021GetFindingRequest\022\014\n\004name\030\001 \001(\t\"" +
+      " \001(\t\"!\n\021GetFindingRequest\022\014\n\004name\030\001 \001(\t\"",
       "\\\n\023ListFindingsRequest\022\016\n\006parent\030\001 \001(\t\022\016" +
       "\n\006filter\030\002 \001(\t\022\022\n\npage_token\030\003 \001(\t\022\021\n\tpa" +
       "ge_size\030\004 \001(\005\"s\n\024ListFindingsResponse\022B\n" +
@@ -162,7 +162,7 @@ public static void registerAllExtensions(
       "t\022\016\n\006parent\030\001 \001(\t\"u\n\034ListFindingTypeStat" +
       "sResponse\022U\n\022finding_type_stats\030\001 \003(\01329." +
       "google.cloud.websecurityscanner.v1alpha." +
-      "FindingTypeStats2\320\024\n\022WebSecurityScanner\022" +
+      "FindingTypeStats2\320\024\n\022WebSecurityScanner\022",
       "\310\001\n\020CreateScanConfig\022@.google.cloud.webs" +
       "ecurityscanner.v1alpha.CreateScanConfigR" +
       "equest\0323.google.cloud.websecurityscanner" +
@@ -172,7 +172,7 @@ public static void registerAllExtensions(
       "ebsecurityscanner.v1alpha.DeleteScanConf" +
       "igRequest\032\026.google.protobuf.Empty\"0\202\323\344\223\002" +
       "**(/v1alpha/{name=projects/*/scanConfigs" +
-      "/*}\022\265\001\n\rGetScanConfig\022=.google.cloud.web" +
+      "/*}\022\265\001\n\rGetScanConfig\022=.google.cloud.web",
       "securityscanner.v1alpha.GetScanConfigReq" +
       "uest\0323.google.cloud.websecurityscanner.v" +
       "1alpha.ScanConfig\"0\202\323\344\223\002*\022(/v1alpha/{nam" +
@@ -182,7 +182,7 @@ public static void registerAllExtensions(
       "e.cloud.websecurityscanner.v1alpha.ListS" +
       "canConfigsResponse\"0\202\323\344\223\002*\022(/v1alpha/{pa" +
       "rent=projects/*}/scanConfigs\022\324\001\n\020UpdateS" +
-      "canConfig\022@.google.cloud.websecurityscan" +
+      "canConfig\022@.google.cloud.websecurityscan",
       "ner.v1alpha.UpdateScanConfigRequest\0323.go" +
       "ogle.cloud.websecurityscanner.v1alpha.Sc" +
       "anConfig\"I\202\323\344\223\002C24/v1alpha/{scan_config." +
@@ -192,7 +192,7 @@ public static void registerAllExtensions(
       "st\0320.google.cloud.websecurityscanner.v1a" +
       "lpha.ScanRun\"9\202\323\344\223\0023\"./v1alpha/{name=pro" +
       "jects/*/scanConfigs/*}:start:\001*\022\267\001\n\nGetS" +
-      "canRun\022:.google.cloud.websecurityscanner" +
+      "canRun\022:.google.cloud.websecurityscanner",
       ".v1alpha.GetScanRunRequest\0320.google.clou" +
       "d.websecurityscanner.v1alpha.ScanRun\";\202\323" +
       "\344\223\0025\0223/v1alpha/{name=projects/*/scanConf" +
@@ -202,7 +202,7 @@ public static void registerAllExtensions(
       "ityscanner.v1alpha.ListScanRunsResponse\"" +
       ";\202\323\344\223\0025\0223/v1alpha/{parent=projects/*/sca" +
       "nConfigs/*}/scanRuns\022\301\001\n\013StopScanRun\022;.g" +
-      "oogle.cloud.websecurityscanner.v1alpha.S" +
+      "oogle.cloud.websecurityscanner.v1alpha.S",
       "topScanRunRequest\0320.google.cloud.websecu" +
       "rityscanner.v1alpha.ScanRun\"C\202\323\344\223\002=\"8/v1" +
       "alpha/{name=projects/*/scanConfigs/*/sca" +
@@ -212,7 +212,7 @@ public static void registerAllExtensions(
       "securityscanner.v1alpha.ListCrawledUrlsR" +
       "esponse\"I\202\323\344\223\002C\022A/v1alpha/{parent=projec" +
       "ts/*/scanConfigs/*/scanRuns/*}/crawledUr" +
-      "ls\022\302\001\n\nGetFinding\022:.google.cloud.websecu" +
+      "ls\022\302\001\n\nGetFinding\022:.google.cloud.websecu",
       "rityscanner.v1alpha.GetFindingRequest\0320." +
       "google.cloud.websecurityscanner.v1alpha." +
       "Finding\"F\202\323\344\223\002@\022>/v1alpha/{name=projects" +
@@ -222,7 +222,7 @@ public static void registerAllExtensions(
       ".google.cloud.websecurityscanner.v1alpha" +
       ".ListFindingsResponse\"F\202\323\344\223\002@\022>/v1alpha/" +
       "{parent=projects/*/scanConfigs/*/scanRun" +
-      "s/*}/findings\022\363\001\n\024ListFindingTypeStats\022D" +
+      "s/*}/findings\022\363\001\n\024ListFindingTypeStats\022D",
       ".google.cloud.websecurityscanner.v1alpha" +
       ".ListFindingTypeStatsRequest\032E.google.cl" +
       "oud.websecurityscanner.v1alpha.ListFindi" +
diff --git a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/Xss.java b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/Xss.java
index 16a7f7e6f624..624872197119 100644
--- a/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/Xss.java
+++ b/google-api-grpc/proto-google-cloud-websecurityscanner-v1alpha/src/main/java/com/google/cloud/websecurityscanner/v1alpha/Xss.java
@@ -34,9 +34,6 @@ private Xss(
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     this();
-    if (extensionRegistry == null) {
-      throw new java.lang.NullPointerException();
-    }
     int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
@@ -48,6 +45,13 @@ private Xss(
           case 0:
             done = true;
             break;
+          default: {
+            if (!parseUnknownFieldProto3(
+                input, unknownFields, extensionRegistry, tag)) {
+              done = true;
+            }
+            break;
+          }
           case 10: {
             java.lang.String s = input.readStringRequireUtf8();
             if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -63,13 +67,6 @@ private Xss(
             errorMessage_ = s;
             break;
           }
-          default: {
-            if (!parseUnknownFieldProto3(
-                input, unknownFields, extensionRegistry, tag)) {
-              done = true;
-            }
-            break;
-          }
         }
       }
     } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -90,7 +87,6 @@ private Xss(
     return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_Xss_descriptor;
   }
 
-  @java.lang.Override
   protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internalGetFieldAccessorTable() {
     return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_Xss_fieldAccessorTable
@@ -187,7 +183,6 @@ public java.lang.String getErrorMessage() {
   }
 
   private byte memoizedIsInitialized = -1;
-  @java.lang.Override
   public final boolean isInitialized() {
     byte isInitialized = memoizedIsInitialized;
     if (isInitialized == 1) return true;
@@ -197,7 +192,6 @@ public final boolean isInitialized() {
     return true;
   }
 
-  @java.lang.Override
   public void writeTo(com.google.protobuf.CodedOutputStream output)
                       throws java.io.IOException {
     for (int i = 0; i < stackTraces_.size(); i++) {
@@ -209,7 +203,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output)
     unknownFields.writeTo(output);
   }
 
-  @java.lang.Override
   public int getSerializedSize() {
     int size = memoizedSize;
     if (size != -1) return size;
@@ -338,7 +331,6 @@ public static com.google.cloud.websecurityscanner.v1alpha.Xss parseFrom(
         .parseWithIOException(PARSER, input, extensionRegistry);
   }
 
-  @java.lang.Override
   public Builder newBuilderForType() { return newBuilder(); }
   public static Builder newBuilder() {
     return DEFAULT_INSTANCE.toBuilder();
@@ -346,7 +338,6 @@ public static Builder newBuilder() {
   public static Builder newBuilder(com.google.cloud.websecurityscanner.v1alpha.Xss prototype) {
     return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
   }
-  @java.lang.Override
   public Builder toBuilder() {
     return this == DEFAULT_INSTANCE
         ? new Builder() : new Builder().mergeFrom(this);
@@ -374,7 +365,6 @@ public static final class Builder extends
       return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_Xss_descriptor;
     }
 
-    @java.lang.Override
     protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
         internalGetFieldAccessorTable() {
       return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_Xss_fieldAccessorTable
@@ -397,7 +387,6 @@ private void maybeForceBuilderInitialization() {
               .alwaysUseFieldBuilders) {
       }
     }
-    @java.lang.Override
     public Builder clear() {
       super.clear();
       stackTraces_ = com.google.protobuf.LazyStringArrayList.EMPTY;
@@ -407,18 +396,15 @@ public Builder clear() {
       return this;
     }
 
-    @java.lang.Override
     public com.google.protobuf.Descriptors.Descriptor
         getDescriptorForType() {
       return com.google.cloud.websecurityscanner.v1alpha.FindingAddonProto.internal_static_google_cloud_websecurityscanner_v1alpha_Xss_descriptor;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.Xss getDefaultInstanceForType() {
       return com.google.cloud.websecurityscanner.v1alpha.Xss.getDefaultInstance();
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.Xss build() {
       com.google.cloud.websecurityscanner.v1alpha.Xss result = buildPartial();
       if (!result.isInitialized()) {
@@ -427,7 +413,6 @@ public com.google.cloud.websecurityscanner.v1alpha.Xss build() {
       return result;
     }
 
-    @java.lang.Override
     public com.google.cloud.websecurityscanner.v1alpha.Xss buildPartial() {
       com.google.cloud.websecurityscanner.v1alpha.Xss result = new com.google.cloud.websecurityscanner.v1alpha.Xss(this);
       int from_bitField0_ = bitField0_;
@@ -443,39 +428,32 @@ public com.google.cloud.websecurityscanner.v1alpha.Xss buildPartial() {
       return result;
     }
 
-    @java.lang.Override
     public Builder clone() {
       return (Builder) super.clone();
     }
-    @java.lang.Override
     public Builder setField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.setField(field, value);
     }
-    @java.lang.Override
     public Builder clearField(
         com.google.protobuf.Descriptors.FieldDescriptor field) {
       return (Builder) super.clearField(field);
     }
-    @java.lang.Override
     public Builder clearOneof(
         com.google.protobuf.Descriptors.OneofDescriptor oneof) {
       return (Builder) super.clearOneof(oneof);
     }
-    @java.lang.Override
     public Builder setRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         int index, java.lang.Object value) {
       return (Builder) super.setRepeatedField(field, index, value);
     }
-    @java.lang.Override
     public Builder addRepeatedField(
         com.google.protobuf.Descriptors.FieldDescriptor field,
         java.lang.Object value) {
       return (Builder) super.addRepeatedField(field, value);
     }
-    @java.lang.Override
     public Builder mergeFrom(com.google.protobuf.Message other) {
       if (other instanceof com.google.cloud.websecurityscanner.v1alpha.Xss) {
         return mergeFrom((com.google.cloud.websecurityscanner.v1alpha.Xss)other);
@@ -506,12 +484,10 @@ public Builder mergeFrom(com.google.cloud.websecurityscanner.v1alpha.Xss other)
       return this;
     }
 
-    @java.lang.Override
     public final boolean isInitialized() {
       return true;
     }
 
-    @java.lang.Override
     public Builder mergeFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
@@ -749,13 +725,11 @@ public Builder setErrorMessageBytes(
       onChanged();
       return this;
     }
-    @java.lang.Override
     public final Builder setUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFieldsProto3(unknownFields);
     }
 
-    @java.lang.Override
     public final Builder mergeUnknownFields(
         final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.mergeUnknownFields(unknownFields);
@@ -777,12 +751,11 @@ public static com.google.cloud.websecurityscanner.v1alpha.Xss getDefaultInstance
 
   private static final com.google.protobuf.Parser
       PARSER = new com.google.protobuf.AbstractParser() {
-    @java.lang.Override
     public Xss parsePartialFrom(
         com.google.protobuf.CodedInputStream input,
         com.google.protobuf.ExtensionRegistryLite extensionRegistry)
         throws com.google.protobuf.InvalidProtocolBufferException {
-      return new Xss(input, extensionRegistry);
+        return new Xss(input, extensionRegistry);
     }
   };
 
@@ -795,7 +768,6 @@ public com.google.protobuf.Parser getParserForType() {
     return PARSER;
   }
 
-  @java.lang.Override
   public com.google.cloud.websecurityscanner.v1alpha.Xss getDefaultInstanceForType() {
     return DEFAULT_INSTANCE;
   }
diff --git a/google-cloud-clients/google-cloud-asset/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceClient.java b/google-cloud-clients/google-cloud-asset/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceClient.java
index 8c5a7a8fecc1..f07fa8298d50 100644
--- a/google-cloud-clients/google-cloud-asset/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceClient.java
+++ b/google-cloud-clients/google-cloud-asset/src/main/java/com/google/cloud/asset/v1beta1/AssetServiceClient.java
@@ -170,7 +170,7 @@ public final OperationsClient getOperationsClient() {
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Exports assets with time and resource types to a given Google Cloud Storage location. The
-   * output format is newline delimited JSON. This API implements the
+   * output format is newline-delimited JSON. This API implements the
    * [google.longrunning.Operation][google.longrunning.Operation] API allowing users to keep track
    * of the export.
    *
@@ -201,7 +201,7 @@ public final OperationFuture exportAs
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Exports assets with time and resource types to a given Google Cloud Storage location. The
-   * output format is newline delimited JSON. This API implements the
+   * output format is newline-delimited JSON. This API implements the
    * [google.longrunning.Operation][google.longrunning.Operation] API allowing users to keep track
    * of the export.
    *
@@ -230,7 +230,7 @@ public final OperationFuture exportAs
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Exports assets with time and resource types to a given Google Cloud Storage location. The
-   * output format is newline delimited JSON. This API implements the
+   * output format is newline-delimited JSON. This API implements the
    * [google.longrunning.Operation][google.longrunning.Operation] API allowing users to keep track
    * of the export.
    *
diff --git a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/package-info.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/package-info.java
index 96ce3125c956..6f5c00a68594 100644
--- a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/package-info.java
+++ b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/package-info.java
@@ -15,7 +15,7 @@
  */
 
 /**
- * A client to Google Cloud Speech API.
+ * A client to Cloud Speech API.
  *
  * 
The interfaces provided are listed below, along with usage samples.
  *
diff --git a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/GrpcSpeechCallableFactory.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/GrpcSpeechCallableFactory.java
index d3fdff0d4232..6eb703e40838 100644
--- a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/GrpcSpeechCallableFactory.java
+++ b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/GrpcSpeechCallableFactory.java
@@ -37,7 +37,7 @@
 
 // AUTO-GENERATED DOCUMENTATION AND CLASS
 /**
- * gRPC callable factory implementation for Google Cloud Speech API.
+ * gRPC callable factory implementation for Cloud Speech API.
  *
  * 
This class is for advanced usage.
  */
diff --git a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/GrpcSpeechStub.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/GrpcSpeechStub.java
index a64a11308004..84359877b744 100644
--- a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/GrpcSpeechStub.java
+++ b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/GrpcSpeechStub.java
@@ -41,7 +41,7 @@
 
 // AUTO-GENERATED DOCUMENTATION AND CLASS
 /**
- * gRPC stub implementation for Google Cloud Speech API.
+ * gRPC stub implementation for Cloud Speech API.
  *
  * 
This class is for advanced usage and reflects the underlying API directly.
  */
diff --git a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/SpeechStub.java b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/SpeechStub.java
index 93969d0dd311..deab1b76e3a9 100644
--- a/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/SpeechStub.java
+++ b/google-cloud-clients/google-cloud-speech/src/main/java/com/google/cloud/speech/v1/stub/SpeechStub.java
@@ -33,7 +33,7 @@
 
 // AUTO-GENERATED DOCUMENTATION AND CLASS
 /**
- * Base stub class for Google Cloud Speech API.
+ * Base stub class for Cloud Speech API.
  *
  * 
This class is for advanced usage and reflects the underlying API directly.
  */